[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:43 UTC 2013
The following commit has been merged in the master branch:
commit c641c21fa284121dcf317a9df0fa29262fd20a7b
Author: David Prévot <taffit at debian.org>
Date: Fri Feb 15 22:38:57 2013 -0400
Update manuals and images from the wiki
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
index b2df8d3..d46a571 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-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-02-15 22:23-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"
@@ -9574,7 +9574,7 @@ msgid ""
"As in many free software projects, translations of this document are kept in "
"PO files. More information about the process can be found in "
"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
+"manual-translations</computeroutput>. The Git repository (see below) "
"contains this file too. Take a look there and at the <ulink url=\"http://"
"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
"specific conventions</ulink> if you want to help translating this document."
@@ -9582,9 +9582,9 @@ msgstr ""
"Som i mange andre frie programmer håndteres oversættelser af dette dokument "
"i PO-filer. Yderligere information om processen kan findes i "
"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. Subversionarkivet (se nedenfor) "
-"indeholder også denne fil. Tag et kig der og på <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Contribute/Translation/Conventions#\">sprogspecifikke "
+"manual-translations</computeroutput>. Gitarkivet (se nedenfor) indeholder "
+"også denne fil. Tag et kig der og på <ulink url=\"http://wiki.debian.org/"
+"DebianEdu/Contribute/Translation/Conventions#\">sprogspecifikke "
"konventioner</ulink> hvis du ønsker at hjælpe med at oversætte dette "
"dokument."
@@ -9592,38 +9592,37 @@ msgstr ""
msgid ""
"To commit your translations you need to be a member of the Alioth project "
"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
+"check out some files from from Git (which can be done anonymously) and "
+"create patches. Please file a bug against the debian-edu-doc package and "
"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
"\">instructions on how to submit bugs</ulink> here."
msgstr ""
"For at indsende dine oversættelser skal du være medlem af Alioth-projektet "
"<computeroutput>debian-edu</computeroutput>. For at oversættte skal du bare "
-"kigge på nogle filer fra Subversion (som kan gøres anonymt) og oprette "
-"rettelser. Send venligst en fejlrapport mod pakken debian-edu-doc og vedhæft "
-"PO-filen til <ulink url=\"http://bugs.debian.org/debian-edu-doc"
-"\">fejlrapporten</ulink>. Du kan se nogle <ulink url=\"http://bugs.debian.org"
-"\">instruktioner om hvordan fejl skal indsendes</ulink> her."
+"kigge på nogle filer fra Git (som kan gøres anonymt) og oprette rettelser. "
+"Send venligst en fejlrapport mod pakken debian-edu-doc og vedhæft PO-filen "
+"til <ulink url=\"http://bugs.debian.org/debian-edu-doc\">fejlrapporten</"
+"ulink>. Du kan se nogle <ulink url=\"http://bugs.debian.org\">instruktioner "
+"om hvordan fejl skal indsendes</ulink> her."
#. type: Content of: <article><section><section><para>
msgid ""
"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
"anonymously with the following command (you need to have the "
-"<computeroutput>subversion</computeroutput> package installed for this to "
-"work):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
msgstr ""
"Du kan anonymt kigge på kilden for <computeroutput>debian-edu-doc</"
"computeroutput> med den følgende kommando (du skal have pakken "
-"<computeroutput>subversion</computeroutput> installeret for at dette virker):"
+"<computeroutput>git</computeroutput> installeret for at dette virker):"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9639,11 +9638,11 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the bugreport."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
msgstr ""
-"Når du enten indsender filen direkte til Subversion (hvis du har rettigheder "
-"til dette) eller sender filen til fejlrapporten."
+"Når du enten indsender filen direkte til Git (hvis du har rettigheder til "
+"dette) eller sender filen til fejlrapporten."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9654,8 +9653,8 @@ msgstr ""
"mappen <computeroutput>debian-edu-doc</computeroutput>:"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9680,30 +9679,27 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Basic information about Alioth (the host where our Subversion repository is "
-"located) and Subversion is available at <ulink url=\"http://wiki.debian.org/"
-"Alioth/Svn\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
msgstr ""
-"Grundlæggende information om Alioth (værten hvor Subversionarkivet er "
-"placeret) og Subversion er tilgængelig på <ulink url=\"http://wiki.debian."
-"org/Alioth/Svn\"/>."
+"Grundlæggende information om Alioth (værten hvor Gitarkivet er placeret) og "
+"Git er tilgængelig på <ulink url=\"http://wiki.debian.org/Alioth/Git\"/>."
#. type: Content of: <article><section><section><para>
msgid ""
-"If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
-"\">Version Control with Subversion</ulink>; it has a chapter on the <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Also you might want to look at the "
-"<computeroutput>kdesvn</computeroutput> package if you prefer a GUI client "
-"for Subversion instead of using the commandline client."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
msgstr ""
-"Hvis du ikke har prøvet Subversion før, så kig i <ulink url=\"http://svnbook."
-"org\">Version Control with Subversion</ulink>; bogen har et kapitel om "
-"<ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">det "
-"grundlæggende arbejdsforløb i Subversion</ulink>. Du kan eventuelt også "
-"kigge på pakken <computeroutput>kdesvn</computeroutput>, hvis du foretrækker "
-"en grafisk brugerfladeklient for Subversion i stedet for at bruge "
-"kommandolinjeklienten."
+"Hvis du ikke har prøvet Git før, så kig i <ulink url=\"http://git-scm.com/"
+"book\">Pro Git</ulink>; bogen har et kapitel om <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">registrering af "
+"ændringer i arkivet</ulink>. Du kan eventuelt også kigge på pakken "
+"<computeroutput>gitk</computeroutput>, som tilbyder en grafisk brugerflade "
+"for Git."
#. type: Content of: <article><section><section><para>
msgid "Please report any problems."
@@ -10998,6 +10994,96 @@ msgstr ""
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "As in many free software projects, translations of this document are kept "
+#~ "in PO files. More information about the process can be found in "
+#~ "<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
+#~ "manual-translations</computeroutput>. The Subversion repository (see "
+#~ "below) contains this file too. Take a look there and at the <ulink url="
+#~ "\"http://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#"
+#~ "\">language specific conventions</ulink> if you want to help translating "
+#~ "this document."
+#~ msgstr ""
+#~ "Som i mange andre frie programmer håndteres oversættelser af dette "
+#~ "dokument i PO-filer. Yderligere information om processen kan findes i "
+#~ "<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
+#~ "manual-translations</computeroutput>. Subversionarkivet (se nedenfor) "
+#~ "indeholder også denne fil. Tag et kig der og på <ulink url=\"http://wiki."
+#~ "debian.org/DebianEdu/Contribute/Translation/Conventions#"
+#~ "\">sprogspecifikke konventioner</ulink> hvis du ønsker at hjælpe med at "
+#~ "oversætte dette dokument."
+
+#~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. To translate, you just need "
+#~ "to check out some files from from Subversion (which can be done "
+#~ "anonymously) and create patches. Please file a bug against the debian-edu-"
+#~ "doc package and attach the PO file to the <ulink url=\"http://bugs.debian."
+#~ "org/debian-edu-doc\">bugreport</ulink>. You can find some <ulink url="
+#~ "\"http://bugs.debian.org\">instructions on how to submit bugs</ulink> "
+#~ "here."
+#~ msgstr ""
+#~ "For at indsende dine oversættelser skal du være medlem af Alioth-"
+#~ "projektet <computeroutput>debian-edu</computeroutput>. For at oversættte "
+#~ "skal du bare kigge på nogle filer fra Subversion (som kan gøres anonymt) "
+#~ "og oprette rettelser. Send venligst en fejlrapport mod pakken debian-edu-"
+#~ "doc og vedhæft PO-filen til <ulink url=\"http://bugs.debian.org/debian-"
+#~ "edu-doc\">fejlrapporten</ulink>. Du kan se nogle <ulink url=\"http://bugs."
+#~ "debian.org\">instruktioner om hvordan fejl skal indsendes</ulink> her."
+
+#~ msgid ""
+#~ "You can check out the <computeroutput>debian-edu-doc</computeroutput> "
+#~ "source anonymously with the following command (you need to have the "
+#~ "<computeroutput>subversion</computeroutput> package installed for this to "
+#~ "work):"
+#~ msgstr ""
+#~ "Du kan anonymt kigge på kilden for <computeroutput>debian-edu-doc</"
+#~ "computeroutput> med den følgende kommando (du skal have pakken "
+#~ "<computeroutput>subversion</computeroutput> installeret for at dette "
+#~ "virker):"
+
+#~ msgid ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+
+#~ msgid ""
+#~ "Then you either commit the file directly to Subversion (if you have the "
+#~ "rights to do so) or send the file to the bugreport."
+#~ msgstr ""
+#~ "Når du enten indsender filen direkte til Subversion (hvis du har "
+#~ "rettigheder til dette) eller sender filen til fejlrapporten."
+
+#~ msgid "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>svn up</computeroutput>"
+
+#~ msgid ""
+#~ "Basic information about Alioth (the host where our Subversion repository "
+#~ "is located) and Subversion is available at <ulink url=\"http://wiki."
+#~ "debian.org/Alioth/Svn\"/>."
+#~ msgstr ""
+#~ "Grundlæggende information om Alioth (værten hvor Subversionarkivet er "
+#~ "placeret) og Subversion er tilgængelig på <ulink url=\"http://wiki.debian."
+#~ "org/Alioth/Svn\"/>."
+
+#~ msgid ""
+#~ "If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
+#~ "\">Version Control with Subversion</ulink>; it has a chapter on the "
+#~ "<ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic "
+#~ "workflow with Subversion</ulink>. Also you might want to look at the "
+#~ "<computeroutput>kdesvn</computeroutput> package if you prefer a GUI "
+#~ "client for Subversion instead of using the commandline client."
+#~ msgstr ""
+#~ "Hvis du ikke har prøvet Subversion før, så kig i <ulink url=\"http://"
+#~ "svnbook.org\">Version Control with Subversion</ulink>; bogen har et "
+#~ "kapitel om <ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html"
+#~ "\">det grundlæggende arbejdsforløb i Subversion</ulink>. Du kan eventuelt "
+#~ "også kigge på pakken <computeroutput>kdesvn</computeroutput>, hvis du "
+#~ "foretrækker en grafisk brugerfladeklient for Subversion i stedet for at "
+#~ "bruge kommandolinjeklienten."
+
+#~ msgid ""
#~ "Create a user with membership in the \"admins\" group (if not already "
#~ "existing)"
#~ msgstr ""
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
index b82343f..0577795 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-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-02-15 22:23-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"
@@ -9818,7 +9818,7 @@ msgid ""
"As in many free software projects, translations of this document are kept in "
"PO files. More information about the process can be found in "
"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
+"manual-translations</computeroutput>. The Git repository (see below) "
"contains this file too. Take a look there and at the <ulink url=\"http://"
"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
"specific conventions</ulink> if you want to help translating this document."
@@ -9826,49 +9826,47 @@ msgstr ""
"Wie bei vielen anderen Software-Projekten werden Übersetzungen dieses "
"Dokuments mit PO-Dateien organisiert. Mehr Information über den Prozess "
"finden Sie in <computeroutput>usr/share/doc/debian-edu-doc/README.debian-edu-"
-"squeeze-manual-translations</computeroutput>. Das Subversion-Repository "
-"(siehe unten) enthält diese Datei ebenfalls. Werfen Sie einen Blick hinein "
-"und schauen Sie sich ebenso die <ulink url=\"http://wiki.debian.org/"
-"DebianEdu/Contribute/Translation/Conventions#\"> sprachabhängigen "
-"Konventionen</ulink> an, wenn Sie bei der Übersetzung mithelfen wollen."
+"squeeze-manual-translations</computeroutput>. Das Git-Repository (siehe "
+"unten) enthält diese Datei ebenfalls. Werfen Sie einen Blick hinein und "
+"schauen Sie sich ebenso die <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Contribute/Translation/Conventions#\"> sprachabhängigen Konventionen</ulink> "
+"an, wenn Sie bei der Übersetzung mithelfen wollen."
#. type: Content of: <article><section><section><para>
msgid ""
"To commit your translations you need to be a member of the Alioth project "
"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
+"check out some files from from Git (which can be done anonymously) and "
+"create patches. Please file a bug against the debian-edu-doc package and "
"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
"\">instructions on how to submit bugs</ulink> here."
msgstr ""
"Um Ihre Übersetzungen übermitteln zu können, müssen Sie ein Mitglied des "
"Alioth-Projektes <computeroutput>debian-edu</computeroutput> sein. Um nur zu "
-"übersetzen, müssen die Dateien einfach (anonym) aus Subversion "
-"heruntergeladen und bearbeitet werden. Anschließend melden Sie einen Fehler "
-"zum Paket »debian-edu-doc« und hängen die PO-Datei an den <ulink url="
-"\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink> an. Hier sind "
-"weitere Informationen zum <ulink url=\"http://bugs.debian.org\">Melden eines "
-"Fehlers</ulink>."
+"übersetzen, müssen die Dateien einfach (anonym) aus Git heruntergeladen und "
+"bearbeitet werden. Anschließend melden Sie einen Fehler zum Paket »debian-"
+"edu-doc« und hängen die PO-Datei an den <ulink url=\"http://bugs.debian.org/"
+"debian-edu-doc\">bugreport</ulink> an. Hier sind weitere Informationen zum "
+"<ulink url=\"http://bugs.debian.org\">Melden eines Fehlers</ulink>."
#. type: Content of: <article><section><section><para>
msgid ""
"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
"anonymously with the following command (you need to have the "
-"<computeroutput>subversion</computeroutput> package installed for this to "
-"work):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
msgstr ""
"Um die <computeroutput>debian-edu-doc</computeroutput> Quellen anonym "
"auszuchecken, können Sie den folgenden Befehl benutzen (dazu muss das Paket "
-"<computeroutput>subversion</computeroutput> installiert sein):"
+"<computeroutput>git</computeroutput> installiert sein):"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9884,12 +9882,12 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the bugreport."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
msgstr ""
-"Dann können Sie die Änderung entweder direkt in Subversion einpflegen (wenn "
-"Sie die entsprechenden Rechte dafür haben) oder die Datei an die "
-"Fehlermeldung anhängen."
+"Dann können Sie die Änderung entweder direkt in Git einpflegen (wenn Sie die "
+"entsprechenden Rechte dafür haben) oder die Datei an die Fehlermeldung "
+"anhängen."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9901,8 +9899,8 @@ msgstr ""
"computeroutput>:"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9927,29 +9925,27 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Basic information about Alioth (the host where our Subversion repository is "
-"located) and Subversion is available at <ulink url=\"http://wiki.debian.org/"
-"Alioth/Svn\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
msgstr ""
-"Information über Alioth (auf dem sich das Subversion-Repository befindet) "
-"und Subversion ist unter <ulink url=\"http://wiki.debian.org/Alioth/Svn\"/> "
-"verfügbar."
+"Information über Alioth (auf dem sich das Git-Repository befindet) und Git "
+"ist unter <ulink url=\"http://wiki.debian.org/Alioth/Git\"/> verfügbar."
#. type: Content of: <article><section><section><para>
msgid ""
-"If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
-"\">Version Control with Subversion</ulink>; it has a chapter on the <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Also you might want to look at the "
-"<computeroutput>kdesvn</computeroutput> package if you prefer a GUI client "
-"for Subversion instead of using the commandline client."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
msgstr ""
-"Wenn Subversion für Sie neu ist, schauen Sie sich das <ulink url=\"http://"
-"svnbook.org\">SVN-Book</ulink> an. Es hat ein Kapitel über den <ulink url="
-"\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">grundlegenden Ablauf von "
-"SVN</ulink>. Wenn Sie eine graphische Benutzeroberfläche satt der "
-"Befehlszeile für Subversion verwenden möchten, können Sie das "
-"<computeroutput>kdesvn</computeroutput>-Paket verwenden."
+"Wenn Git für Sie neu ist, dann schauen Sie sich das Buch <ulink url=\"http://"
+"git-scm.com/book\">Pro Git</ulink> an; es hat ein Kapitel über <ulink url="
+"\"http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository"
+"\">das Aufzeichnen von Änderungen im Repository</ulink>. Sie könnten sich "
+"auch das Paket <computeroutput>gitk</computeroutput> ansehen, das eine "
+"graphische Benutzeroberfläche für Git bereitstellt."
#. type: Content of: <article><section><section><para>
msgid "Please report any problems."
@@ -11251,3 +11247,94 @@ msgstr ""
"Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+
+#~ msgid ""
+#~ "As in many free software projects, translations of this document are kept "
+#~ "in PO files. More information about the process can be found in "
+#~ "<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
+#~ "manual-translations</computeroutput>. The Subversion repository (see "
+#~ "below) contains this file too. Take a look there and at the <ulink url="
+#~ "\"http://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#"
+#~ "\">language specific conventions</ulink> if you want to help translating "
+#~ "this document."
+#~ msgstr ""
+#~ "Wie bei vielen anderen Software-Projekten werden Übersetzungen dieses "
+#~ "Dokuments mit PO-Dateien organisiert. Mehr Information über den Prozess "
+#~ "finden Sie in <computeroutput>usr/share/doc/debian-edu-doc/README.debian-"
+#~ "edu-squeeze-manual-translations</computeroutput>. Das Subversion-"
+#~ "Repository (siehe unten) enthält diese Datei ebenfalls. Werfen Sie einen "
+#~ "Blick hinein und schauen Sie sich ebenso die <ulink url=\"http://wiki."
+#~ "debian.org/DebianEdu/Contribute/Translation/Conventions#\"> "
+#~ "sprachabhängigen Konventionen</ulink> an, wenn Sie bei der Übersetzung "
+#~ "mithelfen wollen."
+
+#~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. To translate, you just need "
+#~ "to check out some files from from Subversion (which can be done "
+#~ "anonymously) and create patches. Please file a bug against the debian-edu-"
+#~ "doc package and attach the PO file to the <ulink url=\"http://bugs.debian."
+#~ "org/debian-edu-doc\">bugreport</ulink>. You can find some <ulink url="
+#~ "\"http://bugs.debian.org\">instructions on how to submit bugs</ulink> "
+#~ "here."
+#~ msgstr ""
+#~ "Um Ihre Übersetzungen übermitteln zu können, müssen Sie ein Mitglied des "
+#~ "Alioth-Projektes <computeroutput>debian-edu</computeroutput> sein. Um nur "
+#~ "zu übersetzen, müssen die Dateien einfach (anonym) aus Subversion "
+#~ "heruntergeladen und bearbeitet werden. Anschließend melden Sie einen "
+#~ "Fehler zum Paket »debian-edu-doc« und hängen die PO-Datei an den <ulink "
+#~ "url=\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink> an. Hier "
+#~ "sind weitere Informationen zum <ulink url=\"http://bugs.debian.org"
+#~ "\">Melden eines Fehlers</ulink>."
+
+#~ msgid ""
+#~ "You can check out the <computeroutput>debian-edu-doc</computeroutput> "
+#~ "source anonymously with the following command (you need to have the "
+#~ "<computeroutput>subversion</computeroutput> package installed for this to "
+#~ "work):"
+#~ msgstr ""
+#~ "Um die <computeroutput>debian-edu-doc</computeroutput> Quellen anonym "
+#~ "auszuchecken, können Sie den folgenden Befehl benutzen (dazu muss das "
+#~ "Paket <computeroutput>subversion</computeroutput> installiert sein):"
+
+#~ msgid ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+
+#~ msgid ""
+#~ "Then you either commit the file directly to Subversion (if you have the "
+#~ "rights to do so) or send the file to the bugreport."
+#~ msgstr ""
+#~ "Dann können Sie die Änderung entweder direkt in Subversion einpflegen "
+#~ "(wenn Sie die entsprechenden Rechte dafür haben) oder die Datei an die "
+#~ "Fehlermeldung anhängen."
+
+#~ msgid "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>svn up</computeroutput>"
+
+#~ msgid ""
+#~ "Basic information about Alioth (the host where our Subversion repository "
+#~ "is located) and Subversion is available at <ulink url=\"http://wiki."
+#~ "debian.org/Alioth/Svn\"/>."
+#~ msgstr ""
+#~ "Information über Alioth (auf dem sich das Subversion-Repository befindet) "
+#~ "und Subversion ist unter <ulink url=\"http://wiki.debian.org/Alioth/Svn\"/"
+#~ "> verfügbar."
+
+#~ msgid ""
+#~ "If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
+#~ "\">Version Control with Subversion</ulink>; it has a chapter on the "
+#~ "<ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic "
+#~ "workflow with Subversion</ulink>. Also you might want to look at the "
+#~ "<computeroutput>kdesvn</computeroutput> package if you prefer a GUI "
+#~ "client for Subversion instead of using the commandline client."
+#~ msgstr ""
+#~ "Wenn Subversion für Sie neu ist, schauen Sie sich das <ulink url=\"http://"
+#~ "svnbook.org\">SVN-Book</ulink> an. Es hat ein Kapitel über den <ulink url="
+#~ "\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">grundlegenden Ablauf "
+#~ "von SVN</ulink>. Wenn Sie eine graphische Benutzeroberfläche satt der "
+#~ "Befehlszeile für Subversion verwenden möchten, können Sie das "
+#~ "<computeroutput>kdesvn</computeroutput>-Paket verwenden."
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
index 0e8641c..ba2ed70 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-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-02-15 22:23-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"
@@ -9391,7 +9391,7 @@ msgid ""
"As in many free software projects, translations of this document are kept in "
"PO files. More information about the process can be found in "
"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
+"manual-translations</computeroutput>. The Git repository (see below) "
"contains this file too. Take a look there and at the <ulink url=\"http://"
"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
"specific conventions</ulink> if you want to help translating this document."
@@ -9402,8 +9402,8 @@ msgstr ""
msgid ""
"To commit your translations you need to be a member of the Alioth project "
"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
+"check out some files from from Git (which can be done anonymously) and "
+"create patches. Please file a bug against the debian-edu-doc package and "
"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
"\">instructions on how to submit bugs</ulink> here."
@@ -9417,8 +9417,7 @@ msgstr ""
msgid ""
"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
"anonymously with the following command (you need to have the "
-"<computeroutput>subversion</computeroutput> package installed for this to "
-"work):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
msgstr ""
"El fuente del paquete <computeroutput>debian-edu-doc</computeroutput>incluye "
"esta imagen como un archivo <computeroutput>dia</computeroutput>."
@@ -9426,8 +9425,8 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::/skolelinux-cd/squeeze-alpha/"
"debian-edu-6.0.0+edua1-DVD.iso</computeroutput>"
@@ -9442,8 +9441,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the bugreport."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -9453,8 +9452,8 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9473,25 +9472,24 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Basic information about Alioth (the host where our Subversion repository is "
-"located) and Subversion is available at <ulink url=\"http://wiki.debian.org/"
-"Alioth/Svn\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
msgstr ""
#. type: Content of: <article><section><section><para>
#, fuzzy
msgid ""
-"If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
-"\">Version Control with Subversion</ulink>; it has a chapter on the <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Also you might want to look at the "
-"<computeroutput>kdesvn</computeroutput> package if you prefer a GUI client "
-"for Subversion instead of using the commandline client."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
msgstr ""
"¡Si quiere empezar a traducir puede! Lea /usr/share/doc/debian-edu-doc/"
"README.release-manual-translations con información sobre como crear un "
"archivo po para su idioma, y como actualizarlo desde <ulink url=\"http://"
-"wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?action=format&"
+"wiki.skolelinux.no/DebianEdu/Documentation/Lenny/AllInOne?action=format&"
"mimetype=xml/docbook\">los fuentes</ulink>."
#. type: Content of: <article><section><section><para>
@@ -10688,6 +10686,58 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#, fuzzy
+#~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. To translate, you just need "
+#~ "to check out some files from from Subversion (which can be done "
+#~ "anonymously) and create patches. Please file a bug against the debian-edu-"
+#~ "doc package and attach the PO file to the <ulink url=\"http://bugs.debian."
+#~ "org/debian-edu-doc\">bugreport</ulink>. You can find some <ulink url="
+#~ "\"http://bugs.debian.org\">instructions on how to submit bugs</ulink> "
+#~ "here."
+#~ msgstr ""
+#~ ". Para trabajar sobre ellas sólo necesita descargarlas anónimamente desde "
+#~ "svn, cree parches y envíelas a <ulink url=\"mailto:debian-edu at l.d.o"
+#~ "\">debian-edu at l.d.o</ulink> o ponga un bug al paquete debian-edu-doc."
+
+#, fuzzy
+#~ msgid ""
+#~ "You can check out the <computeroutput>debian-edu-doc</computeroutput> "
+#~ "source anonymously with the following command (you need to have the "
+#~ "<computeroutput>subversion</computeroutput> package installed for this to "
+#~ "work):"
+#~ msgstr ""
+#~ "El fuente del paquete <computeroutput>debian-edu-doc</"
+#~ "computeroutput>incluye esta imagen como un archivo <computeroutput>dia</"
+#~ "computeroutput>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync ftp.skolelinux.org::/skolelinux-cd/squeeze-alpha/"
+#~ "debian-edu-6.0.0+edua1-DVD.iso</computeroutput>"
+
+#~ msgid "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>svn up</computeroutput>"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
+#~ "\">Version Control with Subversion</ulink>; it has a chapter on the "
+#~ "<ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic "
+#~ "workflow with Subversion</ulink>. Also you might want to look at the "
+#~ "<computeroutput>kdesvn</computeroutput> package if you prefer a GUI "
+#~ "client for Subversion instead of using the commandline client."
+#~ msgstr ""
+#~ "¡Si quiere empezar a traducir puede! Lea /usr/share/doc/debian-edu-doc/"
+#~ "README.release-manual-translations con información sobre como crear un "
+#~ "archivo po para su idioma, y como actualizarlo desde <ulink url=\"http://"
+#~ "wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?"
+#~ "action=format&mimetype=xml/docbook\">los fuentes</ulink>."
+
+#, fuzzy
#~| msgid ""
#~| "1. Create a user with membership in the \"admins\" group (if not already "
#~| "existing)"
@@ -13602,7 +13652,6 @@ msgstr ""
#~ " mozilla-firefox-locale-it\n"
#~ " mozilla-firefox-locale-el\n"
#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
-#~ ""
#, fuzzy
#~ msgid ""
@@ -13870,7 +13919,6 @@ msgstr ""
#~ "Errors were encountered while processing: \n"
#~ " slapd\n"
#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
-#~ ""
#, fuzzy
#~ msgid "E: Sub-process /usr/bin/dpkg returned an error code (1)}}}"
@@ -13878,7 +13926,6 @@ msgstr ""
#~ "Errors were encountered while processing: \n"
#~ " slapd\n"
#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
-#~ ""
#~ msgid "<phrase>attachment:network-arch.png</phrase>"
#~ msgstr "<phrase>attachment:network-arch.png</phrase>"
@@ -13985,9 +14032,7 @@ msgstr ""
#~ "Funciona tanto con konqueror como con firefox"
#, fuzzy
-#~ msgid ""
-#~ "apt-get remove flashplayer-mozilla\n"
-#~ ""
+#~ msgid "apt-get remove flashplayer-mozilla\n"
#~ msgstr "apt-get remove courier-ldap"
#, fuzzy
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
index 7257218..740c4d4 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-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-02-15 22:23-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"
@@ -9862,7 +9862,7 @@ msgid ""
"As in many free software projects, translations of this document are kept in "
"PO files. More information about the process can be found in "
"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
+"manual-translations</computeroutput>. The Git repository (see below) "
"contains this file too. Take a look there and at the <ulink url=\"http://"
"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
"specific conventions</ulink> if you want to help translating this document."
@@ -9870,25 +9870,25 @@ msgstr ""
"Les traductions de ce document sont conservées dans des fichiers PO comme "
"pour de nombreux projets de logiciels libres, lisez <computeroutput>/usr/"
"share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-translations</"
-"computeroutput> pour plus d'informations à ce propos. Le dépôt Subversion "
-"(voir ci-dessous) contient également ce fichier. Jetez y un œil, ainsi qu'à "
-"la page traitant des <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Contribute/Translation/Conventions#\">conventions spécifiques à une langue</"
-"ulink> si vous voulez aider à traduire ce document."
+"computeroutput> pour plus d'informations à ce propos. Le dépôt Git (voir ci-"
+"dessous) contient également ce fichier. Jetez y un œil, ainsi qu'à la page "
+"traitant des <ulink url=\"http://wiki.debian.org/DebianEdu/Contribute/"
+"Translation/Conventions#\">conventions spécifiques à une langue</ulink> si "
+"vous voulez aider à traduire ce document."
#. type: Content of: <article><section><section><para>
msgid ""
"To commit your translations you need to be a member of the Alioth project "
"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
+"check out some files from from Git (which can be done anonymously) and "
+"create patches. Please file a bug against the debian-edu-doc package and "
"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
"\">instructions on how to submit bugs</ulink> here."
msgstr ""
"Pour enregistrer vos traductions, vous devez être membre du projet Alioth "
"<computeroutput>debian-edu</computeroutput>. Pour traduire, vous n'avez qu'à "
-"importer quelques fichiers depuis le dépôt Subversion (ce qui peut être fait "
+"importer quelques fichiers depuis le dépôt Git (ce qui peut être fait "
"anonymement), et créer des rustines (patches). Remplissez un <ulink url="
"\"http://bugs.debian.org/debian-edu-doc\">rapport de bogue</ulink> sur le "
"paquet debian-edu-doc et joignez le fichier PO. Vous trouverez <ulink url="
@@ -9899,21 +9899,19 @@ msgstr ""
msgid ""
"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
"anonymously with the following command (you need to have the "
-"<computeroutput>subversion</computeroutput> package installed for this to "
-"work):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
msgstr ""
"Vous pouvez télécharger le source du paquet <computeroutput>debian-edu-doc</"
"computeroutput> anonymement à l'aide de la commande suivante (vous devez "
-"avoir installé le paquet <computeroutput>subversion</computeroutput> pour "
-"cela) :"
+"avoir installé le paquet <computeroutput>git</computeroutput> pour cela) :"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9930,12 +9928,12 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the bugreport."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
msgstr ""
-"Ensuite, soit vous enregistrez directement le fichier dans le dépôt "
-"Subversion (si vous possédez les droits nécessaires), soit vous joignez le "
-"fichier au rapport de bogue."
+"Ensuite, soit vous enregistrez directement le fichier dans le dépôt Git (si "
+"vous possédez les droits nécessaires), soit vous joignez le fichier au "
+"rapport de bogue."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9946,8 +9944,8 @@ msgstr ""
"suivante dans le répertoire <computeroutput>debian-edu-doc</computeroutput> :"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9971,30 +9969,28 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Basic information about Alioth (the host where our Subversion repository is "
-"located) and Subversion is available at <ulink url=\"http://wiki.debian.org/"
-"Alioth/Svn\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
msgstr ""
"Des informations de base à propos de Alioth (la machine hébergeant notre "
-"dépôt Subversion) et de Subversion sont disponibles à <ulink url=\"http://"
-"wiki.debian.org/Alioth/Svn\"/>."
+"dépôt Git) et de Git sont disponibles à <ulink url=\"http://wiki.debian.org/"
+"Alioth/Git\"/>."
#. type: Content of: <article><section><section><para>
msgid ""
-"If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
-"\">Version Control with Subversion</ulink>; it has a chapter on the <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Also you might want to look at the "
-"<computeroutput>kdesvn</computeroutput> package if you prefer a GUI client "
-"for Subversion instead of using the commandline client."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
msgstr ""
-"Si vous ne connaissez pas Subversion, consultez le livre <ulink url=\"http://"
-"svnbook.org\">Gestion de versions avec Subversion</ulink>. Il contient un "
-"chapitre concernant le <ulink url=\"http://svnbook.red-bean.com/nightly/fr/"
-"svn.tour.cycle.html\">cycle de travail de base</ulink>. Vous voudrez peut "
-"être également utiliser le paquet <computeroutput>kdesvn</computeroutput> si "
-"vous préférez utiliser un client graphique pour Subversion au lieu de la "
-"ligne de commande."
+"Si vous ne connaissez pas Git, consultez le livre <ulink url=\"http://git-"
+"scm.com/book\">Pro Git</ulink>. Il contient un chapitre concernant l'<ulink "
+"url=\"http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-"
+"Repository\">enregistrement de modifications dans le dépôt</ulink>. Vous "
+"voudrez peut être également utiliser le paquet <computeroutput>gitk</"
+"computeroutput> qui fournit un client graphique pour Git."
#. type: Content of: <article><section><section><para>
msgid "Please report any problems."
@@ -11318,6 +11314,98 @@ msgstr ""
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
#~ msgid ""
+#~ "As in many free software projects, translations of this document are kept "
+#~ "in PO files. More information about the process can be found in "
+#~ "<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
+#~ "manual-translations</computeroutput>. The Subversion repository (see "
+#~ "below) contains this file too. Take a look there and at the <ulink url="
+#~ "\"http://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#"
+#~ "\">language specific conventions</ulink> if you want to help translating "
+#~ "this document."
+#~ msgstr ""
+#~ "Les traductions de ce document sont conservées dans des fichiers PO comme "
+#~ "pour de nombreux projets de logiciels libres, lisez <computeroutput>/usr/"
+#~ "share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-translations</"
+#~ "computeroutput> pour plus d'informations à ce propos. Le dépôt Subversion "
+#~ "(voir ci-dessous) contient également ce fichier. Jetez y un œil, ainsi "
+#~ "qu'à la page traitant des <ulink url=\"http://wiki.debian.org/DebianEdu/"
+#~ "Contribute/Translation/Conventions#\">conventions spécifiques à une "
+#~ "langue</ulink> si vous voulez aider à traduire ce document."
+
+#~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. To translate, you just need "
+#~ "to check out some files from from Subversion (which can be done "
+#~ "anonymously) and create patches. Please file a bug against the debian-edu-"
+#~ "doc package and attach the PO file to the <ulink url=\"http://bugs.debian."
+#~ "org/debian-edu-doc\">bugreport</ulink>. You can find some <ulink url="
+#~ "\"http://bugs.debian.org\">instructions on how to submit bugs</ulink> "
+#~ "here."
+#~ msgstr ""
+#~ "Pour enregistrer vos traductions, vous devez être membre du projet Alioth "
+#~ "<computeroutput>debian-edu</computeroutput>. Pour traduire, vous n'avez "
+#~ "qu'à importer quelques fichiers depuis le dépôt Subversion (ce qui peut "
+#~ "être fait anonymement), et créer des rustines (patches). Remplissez un "
+#~ "<ulink url=\"http://bugs.debian.org/debian-edu-doc\">rapport de bogue</"
+#~ "ulink> sur le paquet debian-edu-doc et joignez le fichier PO. Vous "
+#~ "trouverez <ulink url=\"http://bugs.debian.org\">ici</ulink> des "
+#~ "explications sur comment soumettre des rapports de bogues."
+
+#~ msgid ""
+#~ "You can check out the <computeroutput>debian-edu-doc</computeroutput> "
+#~ "source anonymously with the following command (you need to have the "
+#~ "<computeroutput>subversion</computeroutput> package installed for this to "
+#~ "work):"
+#~ msgstr ""
+#~ "Vous pouvez télécharger le source du paquet <computeroutput>debian-edu-"
+#~ "doc</computeroutput> anonymement à l'aide de la commande suivante (vous "
+#~ "devez avoir installé le paquet <computeroutput>subversion</"
+#~ "computeroutput> pour cela) :"
+
+#~ msgid ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+
+#~ msgid ""
+#~ "Then you either commit the file directly to Subversion (if you have the "
+#~ "rights to do so) or send the file to the bugreport."
+#~ msgstr ""
+#~ "Ensuite, soit vous enregistrez directement le fichier dans le dépôt "
+#~ "Subversion (si vous possédez les droits nécessaires), soit vous joignez "
+#~ "le fichier au rapport de bogue."
+
+#~ msgid "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>svn up</computeroutput>"
+
+#~ msgid ""
+#~ "Basic information about Alioth (the host where our Subversion repository "
+#~ "is located) and Subversion is available at <ulink url=\"http://wiki."
+#~ "debian.org/Alioth/Svn\"/>."
+#~ msgstr ""
+#~ "Des informations de base à propos de Alioth (la machine hébergeant notre "
+#~ "dépôt Subversion) et de Subversion sont disponibles à <ulink url=\"http://"
+#~ "wiki.debian.org/Alioth/Svn\"/>."
+
+#~ msgid ""
+#~ "If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
+#~ "\">Version Control with Subversion</ulink>; it has a chapter on the "
+#~ "<ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic "
+#~ "workflow with Subversion</ulink>. Also you might want to look at the "
+#~ "<computeroutput>kdesvn</computeroutput> package if you prefer a GUI "
+#~ "client for Subversion instead of using the commandline client."
+#~ msgstr ""
+#~ "Si vous ne connaissez pas Subversion, consultez le livre <ulink url="
+#~ "\"http://svnbook.org\">Gestion de versions avec Subversion</ulink>. Il "
+#~ "contient un chapitre concernant le <ulink url=\"http://svnbook.red-bean."
+#~ "com/nightly/fr/svn.tour.cycle.html\">cycle de travail de base</ulink>. "
+#~ "Vous voudrez peut être également utiliser le paquet "
+#~ "<computeroutput>kdesvn</computeroutput> si vous préférez utiliser un "
+#~ "client graphique pour Subversion au lieu de la ligne de commande."
+
+#~ msgid ""
#~ "Create a user with membership in the \"admins\" group (if not already "
#~ "existing)"
#~ msgstr ""
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
index e359e23..90eb081 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-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-02-15 22:23-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"
@@ -9623,7 +9623,7 @@ msgid ""
"As in many free software projects, translations of this document are kept in "
"PO files. More information about the process can be found in "
"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
+"manual-translations</computeroutput>. The Git repository (see below) "
"contains this file too. Take a look there and at the <ulink url=\"http://"
"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
"specific conventions</ulink> if you want to help translating this document."
@@ -9632,24 +9632,24 @@ msgstr ""
"progetti di software libero, Maggiori informazioni sul processo di "
"traduzione possono essere trovate in <computeroutput>usr/share/doc/debian-"
"edu-doc/README.debian-edu-squeeze-manual-translations</computeroutput>. "
-"Anche il Subversion repository (vedi sotto) contiene questo file. Se vuoi "
-"aiutare a tradurre questo documento dai uno sguardo <ulink url=\"http://wiki."
-"debian.org/DebianEdu/Contribute/Translation/Conventions#\">per specifiche "
+"Anche il Git repository (vedi sotto) contiene questo file. Se vuoi aiutare a "
+"tradurre questo documento dai uno sguardo <ulink url=\"http://wiki.debian."
+"org/DebianEdu/Contribute/Translation/Conventions#\">per specifiche "
"convenzioni di linguaggio</ulink>."
#. type: Content of: <article><section><section><para>
msgid ""
"To commit your translations you need to be a member of the Alioth project "
"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
+"check out some files from from Git (which can be done anonymously) and "
+"create patches. Please file a bug against the debian-edu-doc package and "
"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
"\">instructions on how to submit bugs</ulink> here."
msgstr ""
"Per inviare la vostra traduzione occorre essere membro del progetto Alioth "
"<computeroutput>debian-edu</computeroutput>. Per tradurre occorre verificare "
-"la presenza di alcuni file attraverso Subversion (dove ci si può collegare "
+"la presenza di alcuni file attraverso Git (dove ci si può collegare "
"anonimamente) per creare patch. Si prega di inviare un bug relativo al "
"pacchetto debian-edu-doc e allegare il file PO a <ulink url=\"http://bugs."
"debian.org/debian-edu-doc\">bugreport</ulink>. Si possono trovare istruzioni "
@@ -9660,20 +9660,19 @@ msgstr ""
msgid ""
"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
"anonymously with the following command (you need to have the "
-"<computeroutput>subversion</computeroutput> package installed for this to "
-"work):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
msgstr ""
"Puoi esaminare la sorgente di <computeroutput>debian-edu-doc</"
"computeroutput> da anonimo con il comando seguente (occorre avere il "
-"pacchetto <computeroutput>subversion</computeroutput> istallato):"
+"pacchetto <computeroutput>git</computeroutput> istallato):"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9689,11 +9688,11 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the bugreport."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
msgstr ""
-"In seguito occorre inviare il file direttamente al Subversion (se si ha i "
-"permessi per fare questo) o mandare il file attraverso bugreport."
+"In seguito occorre inviare il file direttamente al Git (se si ha i permessi "
+"per fare questo) o mandare il file attraverso bugreport."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9704,8 +9703,8 @@ msgstr ""
"all'interno della directory <computeroutput>debian-edu-doc</computeroutput>:"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9729,29 +9728,28 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Basic information about Alioth (the host where our Subversion repository is "
-"located) and Subversion is available at <ulink url=\"http://wiki.debian.org/"
-"Alioth/Svn\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
msgstr ""
-"Informazioni di base su Alioth (l'host dove è localizzato il nostro "
-"Subversion repository) e il Subversion è disponibile a <ulink url=\"http://"
-"wiki.debian.org/Alioth/Svn\"/>."
+"Informazioni di base su Alioth (l'host dove è localizzato il nostro Git "
+"repository) e il Git è disponibile a <ulink url=\"http://wiki.debian.org/"
+"Alioth/Git\"/>."
#. type: Content of: <article><section><section><para>
msgid ""
-"If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
-"\">Version Control with Subversion</ulink>; it has a chapter on the <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Also you might want to look at the "
-"<computeroutput>kdesvn</computeroutput> package if you prefer a GUI client "
-"for Subversion instead of using the commandline client."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
msgstr ""
-"Se sei nuovo con Subversion, dai uno sguardo a <ulink url=\"http://svnbook."
-"org\">Version Control with Subversion</ulink>, che ha un capitolo su <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Potresti anche guardare il pacchetto "
-"<computeroutput>kdesvn</computeroutput> se si preferisce un'interfaccia GUI "
-"per Subversion client al posto dell'uso della linea di comando."
+"Se non hai mai usato Git, dai uno sguardo al libro <ulink url=\"http://git-"
+"scm.com/book\">Pro Git</ulink> che ha un capitolo su <ulink url=\"http://git-"
+"scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">come "
+"registrare i cambiamenti nel repository</ulink>. Se preferisci "
+"un'interfaccia grafica per Git invece di usare la linea di comando, puoi "
+"provare il pacchetto <computeroutput>gitk</computeroutput>."
#. type: Content of: <article><section><section><para>
msgid "Please report any problems."
@@ -11053,6 +11051,95 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "As in many free software projects, translations of this document are kept "
+#~ "in PO files. More information about the process can be found in "
+#~ "<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
+#~ "manual-translations</computeroutput>. The Subversion repository (see "
+#~ "below) contains this file too. Take a look there and at the <ulink url="
+#~ "\"http://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#"
+#~ "\">language specific conventions</ulink> if you want to help translating "
+#~ "this document."
+#~ msgstr ""
+#~ "Le traduzioni di questo documento sono in file PO come la maggioranza dei "
+#~ "progetti di software libero, Maggiori informazioni sul processo di "
+#~ "traduzione possono essere trovate in <computeroutput>usr/share/doc/debian-"
+#~ "edu-doc/README.debian-edu-squeeze-manual-translations</computeroutput>. "
+#~ "Anche il Subversion repository (vedi sotto) contiene questo file. Se vuoi "
+#~ "aiutare a tradurre questo documento dai uno sguardo <ulink url=\"http://"
+#~ "wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">per "
+#~ "specifiche convenzioni di linguaggio</ulink>."
+
+#~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. To translate, you just need "
+#~ "to check out some files from from Subversion (which can be done "
+#~ "anonymously) and create patches. Please file a bug against the debian-edu-"
+#~ "doc package and attach the PO file to the <ulink url=\"http://bugs.debian."
+#~ "org/debian-edu-doc\">bugreport</ulink>. You can find some <ulink url="
+#~ "\"http://bugs.debian.org\">instructions on how to submit bugs</ulink> "
+#~ "here."
+#~ msgstr ""
+#~ "Per inviare la vostra traduzione occorre essere membro del progetto "
+#~ "Alioth <computeroutput>debian-edu</computeroutput>. Per tradurre occorre "
+#~ "verificare la presenza di alcuni file attraverso Subversion (dove ci si "
+#~ "può collegare anonimamente) per creare patch. Si prega di inviare un bug "
+#~ "relativo al pacchetto debian-edu-doc e allegare il file PO a <ulink url="
+#~ "\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink>. Si possono "
+#~ "trovare istruzioni <ulink url=\"http://bugs.debian.org\">su come si "
+#~ "sottopongoni i bug</ulink> qui."
+
+#~ msgid ""
+#~ "You can check out the <computeroutput>debian-edu-doc</computeroutput> "
+#~ "source anonymously with the following command (you need to have the "
+#~ "<computeroutput>subversion</computeroutput> package installed for this to "
+#~ "work):"
+#~ msgstr ""
+#~ "Puoi esaminare la sorgente di <computeroutput>debian-edu-doc</"
+#~ "computeroutput> da anonimo con il comando seguente (occorre avere il "
+#~ "pacchetto <computeroutput>subversion</computeroutput> istallato):"
+
+#~ msgid ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+
+#~ msgid ""
+#~ "Then you either commit the file directly to Subversion (if you have the "
+#~ "rights to do so) or send the file to the bugreport."
+#~ msgstr ""
+#~ "In seguito occorre inviare il file direttamente al Subversion (se si ha i "
+#~ "permessi per fare questo) o mandare il file attraverso bugreport."
+
+#~ msgid "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>svn up</computeroutput>"
+
+#~ msgid ""
+#~ "Basic information about Alioth (the host where our Subversion repository "
+#~ "is located) and Subversion is available at <ulink url=\"http://wiki."
+#~ "debian.org/Alioth/Svn\"/>."
+#~ msgstr ""
+#~ "Informazioni di base su Alioth (l'host dove è localizzato il nostro "
+#~ "Subversion repository) e il Subversion è disponibile a <ulink url="
+#~ "\"http://wiki.debian.org/Alioth/Svn\"/>."
+
+#~ msgid ""
+#~ "If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
+#~ "\">Version Control with Subversion</ulink>; it has a chapter on the "
+#~ "<ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic "
+#~ "workflow with Subversion</ulink>. Also you might want to look at the "
+#~ "<computeroutput>kdesvn</computeroutput> package if you prefer a GUI "
+#~ "client for Subversion instead of using the commandline client."
+#~ msgstr ""
+#~ "Se sei nuovo con Subversion, dai uno sguardo a <ulink url=\"http://"
+#~ "svnbook.org\">Version Control with Subversion</ulink>, che ha un capitolo "
+#~ "su <ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic "
+#~ "workflow with Subversion</ulink>. Potresti anche guardare il pacchetto "
+#~ "<computeroutput>kdesvn</computeroutput> se si preferisce un'interfaccia "
+#~ "GUI per Subversion client al posto dell'uso della linea di comando."
+
+#~ msgid ""
#~ "Create a user with membership in the \"admins\" group (if not already "
#~ "existing)"
#~ msgstr ""
@@ -13060,8 +13147,7 @@ msgstr ""
#~| msgid ""
#~| "ldapvi --host ldap -ZZ --bind simple --tls allow -D 'cn=admin,ou=People,"
#~| "dc=skole,dc=skolelinux,dc=no'"
-#~ msgid ""
-#~ "ldapvi -ZD 'uid=super-admin,ou=People,dc=skole,dc=skolelinux,dc=no'"
+#~ msgid "ldapvi -ZD 'uid=super-admin,ou=People,dc=skole,dc=skolelinux,dc=no'"
#~ msgstr ""
#~ "ldapvi --host ldap -ZZ --bind simple --tls allow -D 'cn=admin,ou=People,"
#~ "dc=skole,dc=skolelinux,dc=no'"
@@ -14777,13 +14863,11 @@ msgstr ""
#~ msgid ""
#~ "tjener:~# cd /etc/squid/\n"
#~ " tjener:/etc/squid# mv squid.conf etch-squid.conf\n"
-#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid."
-#~ "conf"
+#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid.conf"
#~ msgstr ""
#~ "tjener:~# cd /etc/squid/\n"
#~ " tjener:/etc/squid# mv squid.conf etch-squid.conf\n"
-#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid."
-#~ "conf"
+#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid.conf"
#~ msgid ""
#~ "To have the default Debian Edu configuration run <computeroutput>cfengine-"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
index 40a1560..3fb9353 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-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-02-15 22:23-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"
@@ -5299,8 +5299,7 @@ msgstr ""
#. type: CDATA
#, fuzzy, no-wrap
msgid "etckeeper vcs log"
-msgstr ""
-"debian-edu-etc-svk commit /etc/resolv.conf \n"
+msgstr "debian-edu-etc-svk commit /etc/resolv.conf \n"
#. type: Content of: <article><section><section><section><para>
msgid "See which files are currently not tracked and which are not up-to-date:"
@@ -5309,8 +5308,7 @@ msgstr ""
#. type: CDATA
#, fuzzy, no-wrap
msgid "etckeeper vcs status"
-msgstr ""
-"debian-edu-etc-svk commit /etc/resolv.conf \n"
+msgstr "debian-edu-etc-svk commit /etc/resolv.conf \n"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -5320,8 +5318,7 @@ msgstr "For å melde inn en fil manuelt, fordi du ikke vil vente en time:"
#. type: CDATA
#, fuzzy, no-wrap
msgid "etckeeper vcs commit -a /etc/resolv.conf"
-msgstr ""
-"debian-edu-etc-svk commit /etc/resolv.conf \n"
+msgstr "debian-edu-etc-svk commit /etc/resolv.conf \n"
#. type: Content of: <article><section><section><title>
msgid "Resizing Partitions"
@@ -7516,8 +7513,7 @@ msgstr ""
#. type: CDATA
#, fuzzy, no-wrap
msgid "X -query ltspserverXX"
-msgstr ""
-"X -query ltspserverXX\n"
+msgstr "X -query ltspserverXX\n"
#. type: Content of: <article><section><section><para>
#, fuzzy
@@ -7528,8 +7524,7 @@ msgstr "Hvis du er i tynnklientnettet, kjøre denne kommandoen:"
#. type: CDATA
#, fuzzy, no-wrap
msgid "X -query 192.168.0.254"
-msgstr ""
-"X -query 192.168.0.254\n"
+msgstr "X -query 192.168.0.254\n"
#. type: Content of: <article><section><section><para>
#, fuzzy
@@ -7558,8 +7553,7 @@ msgstr ""
#. type: CDATA
#, fuzzy, no-wrap
msgid "* # any host can get a login window"
-msgstr ""
-"* # any host can get a login window\n"
+msgstr "* # any host can get a login window\n"
#. type: Content of: <article><section><section><para>
#, fuzzy
@@ -7579,8 +7573,7 @@ msgstr "Slå så på xdmcp i kdm med kommandoen:"
#. type: CDATA
#, fuzzy, no-wrap
msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
-msgstr ""
-"sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true\n"
+msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true\n"
#. type: Content of: <article><section><section><para>
#, fuzzy
@@ -7591,8 +7584,7 @@ msgstr "Til slutt restartes kdm ved å kjøre:"
#. type: CDATA
#, fuzzy, no-wrap
msgid "sudo invoke-rc.d kdm restart"
-msgstr ""
-"sudo invoke-rc.d kdm restart\n"
+msgstr "sudo invoke-rc.d kdm restart\n"
#. type: Content of: <article><section><section><para>
#, fuzzy
@@ -10307,7 +10299,7 @@ msgid ""
"As in many free software projects, translations of this document are kept in "
"PO files. More information about the process can be found in "
"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
+"manual-translations</computeroutput>. The Git repository (see below) "
"contains this file too. Take a look there and at the <ulink url=\"http://"
"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
"specific conventions</ulink> if you want to help translating this document."
@@ -10322,8 +10314,8 @@ msgstr ""
msgid ""
"To commit your translations you need to be a member of the Alioth project "
"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
+"check out some files from from Git (which can be done anonymously) and "
+"create patches. Please file a bug against the debian-edu-doc package and "
"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
"\">instructions on how to submit bugs</ulink> here."
@@ -10339,25 +10331,23 @@ msgstr ""
#| msgid ""
#| "You can checkout the <computeroutput>debian-edu-doc</computeroutput> "
#| "source anonymously with the following command (you need to have the "
-#| "<computeroutput>subversion</computeroutput> package installed for this to "
-#| "work):"
+#| "<computeroutput>git</computeroutput> package installed for this to work):"
msgid ""
"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
"anonymously with the following command (you need to have the "
-"<computeroutput>subversion</computeroutput> package installed for this to "
-"work):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
msgstr ""
"Du kan hente ut kilden for <computeroutput>debian-edu-doc</computeroutput> "
-"anonymt med denne kommandoen (du må ha pakken <computeroutput>subversion</"
+"anonymt med denne kommandoen (du må ha pakken <computeroutput>git</"
"computeroutput> installert for at dette skal fungere):"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
#. type: Content of: <article><section><section><para>
#, fuzzy
@@ -10375,8 +10365,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
#, fuzzy
msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the bugreport."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
msgstr ""
"Så kan du enten melde filen inn direkte til svn (hvis du har rettigheter til "
"det) eller sender filen til e-postlisten."
@@ -10390,8 +10380,8 @@ msgstr ""
"inne i mappen <computeroutput>debian-edu-doc</computeroutput>:"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr "<computeroutput>git pull</computeroutput>"
#. type: Content of: <article><section><section><para>
#, fuzzy
@@ -10417,24 +10407,23 @@ msgstr ""
#| msgid ""
#| "Basic information about Alioth (the host where our SVN repository is "
#| "located) and SVN is available at <ulink url=\"http://wiki.debian.org/"
-#| "Alioth/Svn\"/>."
+#| "Alioth/Git\"/>."
msgid ""
-"Basic information about Alioth (the host where our Subversion repository is "
-"located) and Subversion is available at <ulink url=\"http://wiki.debian.org/"
-"Alioth/Svn\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
msgstr ""
"Elementær informasjon om Alioth (verten for vårt SVN-pakkelager) og SVN er "
-"tilgjengelig på <ulink url=\"http://wiki.debian.org/Alioth/Svn\"/>."
+"tilgjengelig på <ulink url=\"http://wiki.debian.org/Alioth/Git\"/>."
#. type: Content of: <article><section><section><para>
#, fuzzy
msgid ""
-"If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
-"\">Version Control with Subversion</ulink>; it has a chapter on the <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Also you might want to look at the "
-"<computeroutput>kdesvn</computeroutput> package if you prefer a GUI client "
-"for Subversion instead of using the commandline client."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
msgstr ""
"Les /usr/share/doc/debian-edu-doc/README.release-manual-translations for å "
"finne informasjon om hvordan lage en ny .po-fil for ditt språk hvis det ikke "
@@ -11790,6 +11779,101 @@ msgstr ""
"skolelinux.no/info/cdbygging/news.html</ulink>."
#, fuzzy
+#~ msgid ""
+#~ "As in many free software projects, translations of this document are kept "
+#~ "in PO files. More information about the process can be found in "
+#~ "<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
+#~ "manual-translations</computeroutput>. The Subversion repository (see "
+#~ "below) contains this file too. Take a look there and at the <ulink url="
+#~ "\"http://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#"
+#~ "\">language specific conventions</ulink> if you want to help translating "
+#~ "this document."
+#~ msgstr ""
+#~ "Oversettelser av dette dokumentet er plassert i .po-filer som i mange "
+#~ "friprogramvareprosjekter, les <computeroutput>usr/share/doc/debian-edu-"
+#~ "doc/README.release-manual-translations</computeroutput> for mer "
+#~ "informasjon om dette. Du må også lese dette hvis du vil starte å "
+#~ "oversette dette dokumentet."
+
+#, fuzzy
+#~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. To translate, you just need "
+#~ "to check out some files from from Subversion (which can be done "
+#~ "anonymously) and create patches. Please file a bug against the debian-edu-"
+#~ "doc package and attach the PO file to the <ulink url=\"http://bugs.debian."
+#~ "org/debian-edu-doc\">bugreport</ulink>. You can find some <ulink url="
+#~ "\"http://bugs.debian.org\">instructions on how to submit bugs</ulink> "
+#~ "here."
+#~ msgstr ""
+#~ "For å melde inn oversettelser, så må du være medlem av alioth-prosjektet "
+#~ "<computeroutput>debian-edu</computeroutput>. For å oversette, trenger du "
+#~ "bare å hente ut noen filer fra svn (som kan gjøres anonymt), lage patcher "
+#~ "og sende disse til [<ulink url='mailto:debian-edu at lists.debian."
+#~ "org'>debian-edu at lists.debian.org</ulink>]."
+
+#, fuzzy
+#~| msgid ""
+#~| "You can checkout the <computeroutput>debian-edu-doc</computeroutput> "
+#~| "source anonymously with the following command (you need to have the "
+#~| "<computeroutput>subversion</computeroutput> package installed for this "
+#~| "to work):"
+#~ msgid ""
+#~ "You can check out the <computeroutput>debian-edu-doc</computeroutput> "
+#~ "source anonymously with the following command (you need to have the "
+#~ "<computeroutput>subversion</computeroutput> package installed for this to "
+#~ "work):"
+#~ msgstr ""
+#~ "Du kan hente ut kilden for <computeroutput>debian-edu-doc</"
+#~ "computeroutput> anonymt med denne kommandoen (du må ha pakken "
+#~ "<computeroutput>subversion</computeroutput> installert for at dette skal "
+#~ "fungere):"
+
+#~ msgid ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#~ "debian-edu-doc</computeroutput>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Then you either commit the file directly to Subversion (if you have the "
+#~ "rights to do so) or send the file to the bugreport."
+#~ msgstr ""
+#~ "Så kan du enten melde filen inn direkte til svn (hvis du har rettigheter "
+#~ "til det) eller sender filen til e-postlisten."
+
+#~ msgid "<computeroutput>svn up</computeroutput>"
+#~ msgstr "<computeroutput>svn up</computeroutput>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Basic information about Alioth (the host where our SVN repository is "
+#~| "located) and SVN is available at <ulink url=\"http://wiki.debian.org/"
+#~| "Alioth/Svn\"/>."
+#~ msgid ""
+#~ "Basic information about Alioth (the host where our Subversion repository "
+#~ "is located) and Subversion is available at <ulink url=\"http://wiki."
+#~ "debian.org/Alioth/Svn\"/>."
+#~ msgstr ""
+#~ "Elementær informasjon om Alioth (verten for vårt SVN-pakkelager) og SVN "
+#~ "er tilgjengelig på <ulink url=\"http://wiki.debian.org/Alioth/Svn\"/>."
+
+#, fuzzy
+#~ msgid ""
+#~ "If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
+#~ "\">Version Control with Subversion</ulink>; it has a chapter on the "
+#~ "<ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic "
+#~ "workflow with Subversion</ulink>. Also you might want to look at the "
+#~ "<computeroutput>kdesvn</computeroutput> package if you prefer a GUI "
+#~ "client for Subversion instead of using the commandline client."
+#~ msgstr ""
+#~ "Les /usr/share/doc/debian-edu-doc/README.release-manual-translations for "
+#~ "å finne informasjon om hvordan lage en ny .po-fil for ditt språk hvis det "
+#~ "ikke finnes noen ennå, og hvordan oppdatere oversettelser."
+
+#, fuzzy
#~| msgid ""
#~| "1. Create a user with membership in the \"admins\" group (if not already "
#~| "existing)"
@@ -11930,7 +12014,6 @@ msgstr ""
#~ "aptitude upgrade\n"
#~ "aptitude dist-upgrade\n"
#~ "exit\n"
-#~ ""
#, fuzzy
#~| msgid ""
@@ -13578,8 +13661,7 @@ msgstr ""
#~ msgstr "endring av sambaoppsett"
#, fuzzy
-#~ msgid ""
-#~ "ldapvi -ZD 'uid=super-admin,ou=People,dc=skole,dc=skolelinux,dc=no'"
+#~ msgid "ldapvi -ZD 'uid=super-admin,ou=People,dc=skole,dc=skolelinux,dc=no'"
#~ msgstr ""
#~ "tjener:~# ldapmodify -xZWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,"
#~ "dc=no' \\\n"
@@ -13670,7 +13752,6 @@ msgstr ""
#~ "subnet 10.0.2.0 netmask 255.255.254.0 {\n"
#~ " range 10.0.2.100 10.0.3.242;\n"
#~ " }\n"
-#~ ""
#~ msgid "you have to add this under \"range\":"
#~ msgstr "du må legge til dette under \"range\":"
@@ -13688,7 +13769,6 @@ msgstr ""
#~ "option root-path \"/opt/ltsp/i386\";\n"
#~ "option log-servers ltspserver01;\n"
#~ "use-host-decl-names on;\n"
-#~ ""
#~ msgid ""
#~ "Next-server should be the IP-address or hostname of the server you chose "
@@ -14113,7 +14193,6 @@ msgstr ""
#~ "La til bruker: Demo Bruker\n"
#~ "Brukernavn: dembru\n"
#~ "passord: noehemmelig\n"
-#~ ""
#~ msgid ""
#~ "You may miss the option to set a password, that has been set "
@@ -14571,13 +14650,10 @@ msgstr ""
#~ " debian-edu-etc-svk status\n"
#~ " debian-edu-etc-svk commit\n"
#~ " debian-edu-etc-svk ignore\n"
-#~ ""
#, fuzzy
#~ msgid "etcinsvk diff -r6 | less"
-#~ msgstr ""
-#~ "debian-edu-etc-svk diff -r6 | less \n"
-#~ ""
+#~ msgstr "debian-edu-etc-svk diff -r6 | less \n"
#~ msgid "To see the list of changes done in /etc/, use this command:"
#~ msgstr ""
@@ -14586,9 +14662,7 @@ msgstr ""
#, fuzzy
#~ msgid "etcinsvk log | less"
-#~ msgstr ""
-#~ "debian-edu-etc-svk log | less \n"
-#~ ""
+#~ msgstr "debian-edu-etc-svk log | less \n"
#, fuzzy
#~ msgid ""
@@ -14600,9 +14674,7 @@ msgstr ""
#, fuzzy
#~ msgid "etcinsvk diff -rN | less"
-#~ msgstr ""
-#~ "debian-edu-etc-svk diff -rN | less \n"
-#~ ""
+#~ msgstr "debian-edu-etc-svk diff -rN | less \n"
#~ msgid ""
#~ "To see the changes done to a specific file between specific revisions, "
@@ -14613,9 +14685,7 @@ msgstr ""
#, fuzzy
#~ msgid "etcinsvk diff -r46 -r64 /etc/resolv.conf | less"
-#~ msgstr ""
-#~ "debian-edu-etc-svk diff -r46 -r64 /etc/resolv.conf | less \n"
-#~ ""
+#~ msgstr "debian-edu-etc-svk diff -r46 -r64 /etc/resolv.conf | less \n"
#~ msgid ""
#~ "To revert a change, use the diff command to look at the change, and edit "
@@ -14631,7 +14701,6 @@ msgstr ""
#~ msgstr ""
#~ "( cd /etc && debian-edu-etc-svk diff -r6 /etc/resolv.conf | patch -p1 -"
#~ "R )\n"
-#~ ""
#, fuzzy
#~ msgid ""
@@ -14648,9 +14717,7 @@ msgstr ""
#, fuzzy
#~ msgid "etcinsvk ignore /etc/path/to/file/to/be/ignored"
-#~ msgstr ""
-#~ "debian-edu-etc-svk ignore /etc/path/to/file/to/be/ignored \n"
-#~ ""
+#~ msgstr "debian-edu-etc-svk ignore /etc/path/to/file/to/be/ignored \n"
#, fuzzy
#~ msgid "Then make your changes, safe and quit the editor. That's it!"
@@ -14816,7 +14883,6 @@ msgstr ""
#~ "deb http://ftp.debian.org/debian/ lenny main \n"
#~ "deb http://security.debian.org/ lenny/updates main \n"
#~ "deb http://ftp.skolelinux.org/skolelinux lenny local\n"
-#~ ""
#~ msgid ""
#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/lwat-"
@@ -15240,13 +15306,11 @@ msgstr ""
#~ msgid ""
#~ "tjener:~# cd /etc/squid/\n"
#~ " tjener:/etc/squid# mv squid.conf etch-squid.conf\n"
-#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid."
-#~ "conf"
+#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid.conf"
#~ msgstr ""
#~ "tjener:~# cd /etc/squid/\n"
#~ " tjener:/etc/squid# mv squid.conf etch-squid.conf\n"
-#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid."
-#~ "conf"
+#~ " tjener:/etc/squid# cp /usr/share/doc/squid/examples/squid.conf squid.conf"
#~ msgid ""
#~ "To have the default Debian Edu configuration run <computeroutput>cfengine-"
@@ -15801,7 +15865,6 @@ msgstr ""
#~ "non-free\" >> /etc/apt/sources.list\n"
#~ "# oppdater oversikten over tilgjengelige pakker:\n"
#~ "aptitude update\n"
-#~ ""
#~ msgid ""
#~ "It is possible to save energy and money by turning off client machines at "
@@ -16055,7 +16118,6 @@ msgstr ""
#~ "deb http://ftp.debian.org/debian/ etch main \n"
#~ "deb http://security.debian.org/ etch/updates main \n"
#~ "deb http://ftp.skolelinux.org/skolelinux etch local\n"
-#~ ""
#~ msgid "And start the upgrade with:"
#~ msgstr "Nå kan du starte oppgraderingen med:"
@@ -16186,7 +16248,6 @@ msgstr ""
#~ " mozilla-firefox-locale-it\n"
#~ " mozilla-firefox-locale-el\n"
#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
-#~ ""
#, fuzzy
#~ msgid ""
@@ -16341,7 +16402,6 @@ msgstr ""
#~ "/usr/bin/net groupmap add rid=512 unixgroup=admins \\\n"
#~ " type=domain ntgroup=\"Domain Admins\" \\\n"
#~ " comment=\"All system administrators in the school\"\n"
-#~ ""
#, fuzzy
#~ msgid ""
@@ -16431,9 +16491,7 @@ msgstr ""
#, fuzzy
#~ msgid "debian-edu-etc-svk init"
-#~ msgstr ""
-#~ "debian-edu-etc-svk init\n"
-#~ ""
+#~ msgstr "debian-edu-etc-svk init\n"
#~ msgid ""
#~ "This adds all files in /etc to svk and also activates the hourly commit "
@@ -16621,9 +16679,7 @@ msgstr ""
#, fuzzy
#~ msgid "apt-get install mozilla-mplayer mozilla-acroread acroread-plugins"
-#~ msgstr ""
-#~ "apt-get install mozilla-mplayer mozilla-acroread acroread-plugins\n"
-#~ ""
+#~ msgstr "apt-get install mozilla-mplayer mozilla-acroread acroread-plugins\n"
#, fuzzy
#~ msgid ""
@@ -16670,9 +16726,7 @@ msgstr ""
#, fuzzy
#~ msgid "deb http://ftp.skolelinux.org/skolelinux/ lenny-test local"
-#~ msgstr ""
-#~ "deb http://ftp.skolelinux.org/skolelinux/ etch-test local\n"
-#~ ""
+#~ msgstr "deb http://ftp.skolelinux.org/skolelinux/ etch-test local\n"
#, fuzzy
#~ msgid ""
@@ -16768,7 +16822,6 @@ msgstr ""
#~ " hardware ethernet 00:00:00:00:00:00;\n"
#~ " fixed-address static00;\n"
#~ "}\n"
-#~ ""
#~ msgid ""
#~ "You need to replace the all-zero MAC-address with the correct one of your "
@@ -16788,7 +16841,6 @@ msgstr ""
#~ " hardware ethernet 00:40:05:AF:4E:C6;\n"
#~ " fixed-address static00;\n"
#~ "}\n"
-#~ ""
#~ msgid ""
#~ "</inlinemediaobject> Don't forget to restart the dhcpd as described above "
@@ -16849,7 +16901,6 @@ msgstr ""
#~ "wget http://ftp.de.debian.org/debian/pool/main/s/swi-prolog/swi-"
#~ "prolog_5.2.13-1_i386.deb\n"
#~ "dpkg -i swi-prolog_5.2.13-1_i386.deb\n"
-#~ ""
#, fuzzy
#~ msgid "Manual for Debian Edu Etch 5.0.3+edu0 Codename \"Lenny\""
@@ -16926,9 +16977,7 @@ msgstr ""
#, fuzzy
#~ msgid "{{{deb <ulink url=\"http://ftp.debian.org/debian\"/> etch main"
-#~ msgstr ""
-#~ "deb http://volatile.debian.org/debian-volatile etch/volatile main\n"
-#~ ""
+#~ msgstr "deb http://volatile.debian.org/debian-volatile etch/volatile main\n"
#, fuzzy
#~ msgid ""
@@ -16949,7 +16998,6 @@ msgstr ""
#~ "Errors were encountered while processing: \n"
#~ " slapd\n"
#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
-#~ ""
#, fuzzy
#~ msgid "E: Sub-process /usr/bin/dpkg returned an error code (1)}}}"
@@ -16957,7 +17005,6 @@ msgstr ""
#~ "Errors were encountered while processing: \n"
#~ " slapd\n"
#~ "E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
-#~ ""
#~ msgid "<phrase>attachment:network-arch.png</phrase>"
#~ msgstr "<phrase>attachment:network-arch.png</phrase>"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index 767b027..3ba6752 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-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-02-15 22:34-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"
@@ -7168,7 +7168,7 @@ msgid ""
"As in many free software projects, translations of this document are kept in "
"PO files. More information about the process can be found in "
"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
+"manual-translations</computeroutput>. The Git repository (see below) "
"contains this file too. Take a look there and at the <ulink url=\"http://"
"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
"specific conventions</ulink> if you want to help translating this document."
@@ -7178,8 +7178,8 @@ msgstr ""
msgid ""
"To commit your translations you need to be a member of the Alioth project "
"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
+"check out some files from from Git (which can be done anonymously) and "
+"create patches. Please file a bug against the debian-edu-doc package and "
"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
"\">instructions on how to submit bugs</ulink> here."
@@ -7189,14 +7189,13 @@ msgstr ""
msgid ""
"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
"anonymously with the following command (you need to have the "
-"<computeroutput>subversion</computeroutput> package installed for this to "
-"work):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -7209,8 +7208,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the bugreport."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -7220,7 +7219,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -7240,19 +7239,18 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Basic information about Alioth (the host where our Subversion repository is "
-"located) and Subversion is available at <ulink url=\"http://wiki.debian.org/"
-"Alioth/Svn\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
-"\">Version Control with Subversion</ulink>; it has a chapter on the <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Also you might want to look at the "
-"<computeroutput>kdesvn</computeroutput> package if you prefer a GUI client "
-"for Subversion instead of using the commandline client."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
msgstr ""
#. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
index 52a9263..14a6d70 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
@@ -3349,32 +3349,32 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
<section id="Translations--HowTo_translate_this_document">
<title>HowTo translate this document
</title>
-<para>As in many free software projects, translations of this document are kept in PO files. More information about the process can be found in <computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-translations</computeroutput>. The Subversion repository (see below) contains this file too. Take a look there and at the <ulink url="http://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#">language specific conventions</ulink> if you want to help translating this document.
+<para>As in many free software projects, translations of this document are kept in PO files. More information about the process can be found in <computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-translations</computeroutput>. The Git repository (see below) contains this file too. Take a look there and at the <ulink url="http://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#">language specific conventions</ulink> if you want to help translating this document.
</para>
-<para>To commit your translations you need to be a member of the Alioth project <computeroutput>debian-edu</computeroutput>. To translate, you just need to check out some files from from Subversion (which can be done anonymously) and create patches. Please file a bug against the debian-edu-doc package and attach the PO file to the <ulink url="http://bugs.debian.org/debian-edu-doc">bugreport</ulink>. You can find some <ulink url="http://bugs.debian.org">instructions on how to submit bugs</ulink> here.
+<para>To commit your translations you need to be a member of the Alioth project <computeroutput>debian-edu</computeroutput>. To translate, you just need to check out some files from from Git (which can be done anonymously) and create patches. Please file a bug against the debian-edu-doc package and attach the PO file to the <ulink url="http://bugs.debian.org/debian-edu-doc">bugreport</ulink>. You can find some <ulink url="http://bugs.debian.org">instructions on how to submit bugs</ulink> here.
</para>
-<para>You can check out the <computeroutput>debian-edu-doc</computeroutput> source anonymously with the following command (you need to have the <computeroutput>subversion</computeroutput> package installed for this to work):
+<para>You can check out the <computeroutput>debian-edu-doc</computeroutput> source anonymously with the following command (you need to have the <computeroutput>git</computeroutput> package installed for this to work):
</para>
<itemizedlist><listitem override="none">
-<para><computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc</computeroutput>
+<para><computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc.git</computeroutput>
</para></listitem></itemizedlist>
<para>Then edit the file <computeroutput>documentation/debian-edu-squeeze/debian-edu-squeeze-manual.$CC.po</computeroutput> (replacing $CC with your language code). There are many tools for translating available; we suggest using <computeroutput>lokalize</computeroutput>.
</para>
-<para>Then you either commit the file directly to Subversion (if you have the rights to do so) or send the file to the bugreport.
+<para>Then you either commit the file directly to Git (if you have the rights to do so) or send the file to the bugreport.
</para>
<para>To update your local copy of the repository use the following command inside the <computeroutput>debian-edu-doc</computeroutput> directory:
</para>
<itemizedlist><listitem override="none">
-<para><computeroutput>svn up</computeroutput>
+<para><computeroutput>git pull</computeroutput>
</para></listitem></itemizedlist>
<para>Read /usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-manual-translations to find information how to create a new PO file for your language if there isn't one yet, and how to update translations.
</para>
<para>Please keep in mind that this manual is still under development, so don't translate any string which contains "
FIXME". <!-- <remark>status ignore</remark> -->
</para>
-<para>Basic information about Alioth (the host where our Subversion repository is located) and Subversion is available at <ulink url="http://wiki.debian.org/Alioth/Svn"/>.
+<para>Basic information about Alioth (the host where our Git repository is located) and Git is available at <ulink url="http://wiki.debian.org/Alioth/Git"/>.
</para>
-<para>If you are new to Subversion, look at the <ulink url="http://svnbook.org">Version Control with Subversion</ulink>; it has a chapter on the <ulink url="http://svnbook.red-bean.com/en/1.0/ch03s05.html">basic workflow with Subversion</ulink>. Also you might want to look at the <computeroutput>kdesvn</computeroutput> package if you prefer a GUI client for Subversion instead of using the commandline client.
+<para>If you are new to Git, look at the <ulink url="http://git-scm.com/book">Pro Git</ulink> book; it has a chapter on the <ulink url="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository">recording changes to the repository</ulink>. Also you might want to look at the <computeroutput>gitk</computeroutput> package that provides a GUI for Git.
</para>
<para>Please report any problems.
</para>
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
index b2049b8..c4a1924 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.zh\n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-02-15 22:34-0400\n"
"PO-Revision-Date: 2011-03-28 20:21+0800\n"
"Last-Translator: Andrew Lee <ajqlee at debian.org>\n"
"Language-Team: zh-l10n <zh-l10n at lists.linux.org.tw>\n"
@@ -7810,7 +7810,7 @@ msgid ""
"As in many free software projects, translations of this document are kept in "
"PO files. More information about the process can be found in "
"<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-squeeze-"
-"manual-translations</computeroutput>. The Subversion repository (see below) "
+"manual-translations</computeroutput>. The Git repository (see below) "
"contains this file too. Take a look there and at the <ulink url=\"http://"
"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
"specific conventions</ulink> if you want to help translating this document."
@@ -7820,8 +7820,8 @@ msgstr ""
msgid ""
"To commit your translations you need to be a member of the Alioth project "
"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously) "
-"and create patches. Please file a bug against the debian-edu-doc package and "
+"check out some files from from Git (which can be done anonymously) and "
+"create patches. Please file a bug against the debian-edu-doc package and "
"attach the PO file to the <ulink url=\"http://bugs.debian.org/debian-edu-doc"
"\">bugreport</ulink>. You can find some <ulink url=\"http://bugs.debian.org"
"\">instructions on how to submit bugs</ulink> here."
@@ -7832,16 +7832,15 @@ msgstr ""
msgid ""
"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
"anonymously with the following command (you need to have the "
-"<computeroutput>subversion</computeroutput> package installed for this to "
-"work):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
msgstr ""
"(此 <computeroutput>debian-edu-doc</computeroutput> 的來源檔套件(source "
"package) 中包含了這個 <computeroutput>dia</computeroutput> 檔案。)"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -7854,8 +7853,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the bugreport."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -7865,7 +7864,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -7885,19 +7884,18 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"Basic information about Alioth (the host where our Subversion repository is "
-"located) and Subversion is available at <ulink url=\"http://wiki.debian.org/"
-"Alioth/Svn\"/>."
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"If you are new to Subversion, look at the <ulink url=\"http://svnbook.org"
-"\">Version Control with Subversion</ulink>; it has a chapter on the <ulink "
-"url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
-"Subversion</ulink>. Also you might want to look at the "
-"<computeroutput>kdesvn</computeroutput> package if you prefer a GUI client "
-"for Subversion instead of using the commandline client."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
msgstr ""
#. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index acabfba..51bf3b2 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-squeeze/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-squeeze/images/es/worldmap.png
index 1212c1d..a0b89cc 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-squeeze/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-squeeze/images/fr/worldmap.png
index c9b1d83..c6d576b 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-squeeze/images/worldmap.png
index 6180794..3b2ef36 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index acabfba..51bf3b2 100644
Binary files a/documentation/debian-edu-wheezy/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index 1212c1d..a0b89cc 100644
Binary files a/documentation/debian-edu-wheezy/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index c9b1d83..c6d576b 100644
Binary files a/documentation/debian-edu-wheezy/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index 6180794..3b2ef36 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
--
Debian package debian-edu-doc
More information about the debian-edu-commits
mailing list