[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Update Debian Edu Stretch manual from the wiki.

Holger Levsen gitlab at salsa.debian.org
Wed May 30 14:23:33 BST 2018 

Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc


Commits:
05b0fd11 by Holger Levsen at 2018-05-30T13:23:04+00:00
Update Debian Edu Stretch manual from the wiki.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


13 changed files:

- debian/changelog
- documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
- documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
- documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
- documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
- documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
- documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
- documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
- documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
- documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
- documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
- documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
- documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ debian-edu-doc (2.10.3) UNRELEASED; urgency=medium
 
   [ Holger Levsen ]
   * Update Debian Edu Buster manual from the wiki.
+  * Update Debian Edu Stretch manual from the wiki.
   * d/control:
     - update Vcs: headers to point to salsa.debian.org.
     - update Homepage: header to reflect that we are working on Buster now.


=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
=====================================
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2018-03-06 21:57+0000\n"
+"POT-Creation-Date: 2018-05-30 13:21+0000\n"
 "PO-Revision-Date: 2016-10-06 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -10809,8 +10809,8 @@ msgid ""
 "2016, 2017, 2018) and is released under the GPL v2 or any later version."
 msgstr ""
 "Den hollandske oversættelse er underlagt ophavsretten af Frans Spiesschaert "
-"(2014, 2015, 2016, 2017, 2018) og er udgivet under GPL version 2 eller enhver senere "
-"version."
+"(2014, 2015, 2016, 2017, 2018) og er udgivet under GPL version 2 eller "
+"enhver senere version."
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -10911,37 +10911,21 @@ msgstr ""
 "dokument."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "To commit your translations you need to be a member of the Alioth project "
-#| "<computeroutput>debian-edu</computeroutput>. If your Alioth username "
-#| "differs from your local one, create or edit <computeroutput>~/.ssh/"
-#| "config</computeroutput>. There should be an entry like:"
-msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
-"from your local one, create or edit <computeroutput>~/.ssh/config</"
-"computeroutput>. Add a config block like this:"
-msgstr ""
-"For at indsende dine oversættelser, så skal du være medlem af "
-"Aliothprojektet <computeroutput>debian-edu</computeroutput>. Hvis dit "
-"Aliothbrugernavn er forskelligt fra dit lokale navn, så opret og rediger "
-"<computeroutput>~/.ssh/config</computeroutput>. Der bør være et punkt såsom:"
-
-#. type: CDATA
-#, no-wrap
 msgid ""
-"Host git.debian.org\n"
-"User <your-alioth-username>"
+"To commit your translations you need to be a member of the Salsa project "
+"<computeroutput>debian-edu</computeroutput>."
 msgstr ""
-"Host git.debian.org\n"
-"User <dit-alioth-brugernavn>"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
+#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
+#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-"debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
+"debian-edu-doc.git</computeroutput>"
 msgstr ""
 "Klon så kilden <computeroutput>debian-edu-doc</computeroutput> med brug af "
 "ssh-adgang: <computeroutput>git clone git+ssh://git.debian.org/git/debian-"
@@ -10981,8 +10965,12 @@ msgstr ""
 "<computeroutput>git</computeroutput> installeret for at dette virker):"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-"
+#| "doc.git</computeroutput>"
 msgid ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
 "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
@@ -11053,10 +11041,14 @@ msgstr ""
 "indeholder »FIXME«."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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\"/>."
 msgid ""
-"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\"/>."
+"Basic information about Salsa (the host where our Git repository is located) "
+"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
 "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\"/>."
@@ -12325,6 +12317,31 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink 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>. If your Alioth "
+#~| "username differs from your local one, create or edit <computeroutput>~/."
+#~| "ssh/config</computeroutput>. There should be an entry like:"
+#~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. If your Alioth username "
+#~ "differs from your local one, create or edit <computeroutput>~/.ssh/"
+#~ "config</computeroutput>. Add a config block like this:"
+#~ msgstr ""
+#~ "For at indsende dine oversættelser, så skal du være medlem af "
+#~ "Aliothprojektet <computeroutput>debian-edu</computeroutput>. Hvis dit "
+#~ "Aliothbrugernavn er forskelligt fra dit lokale navn, så opret og rediger "
+#~ "<computeroutput>~/.ssh/config</computeroutput>. Der bør være et punkt "
+#~ "såsom:"
+
+#~ msgid ""
+#~ "Host git.debian.org\n"
+#~ "User <your-alioth-username>"
+#~ msgstr ""
+#~ "Host git.debian.org\n"
+#~ "User <dit-alioth-brugernavn>"
+
 #~ msgid ""
 #~ "<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 #~ "ulink> is an open source implementation of the programming language "


=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
=====================================
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-06 21:57+0000\n"
+"POT-Creation-Date: 2018-05-30 13:21+0000\n"
 "PO-Revision-Date: 2018-01-30 20:52+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -10129,31 +10129,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
-"from your local one, create or edit <computeroutput>~/.ssh/config</"
-"computeroutput>. Add a config block like this:"
+"To commit your translations you need to be a member of the Salsa project "
+"<computeroutput>debian-edu</computeroutput>."
 msgstr ""
-"Um Ihre Übersetzungen übermitteln zu können, müssen Sie ein Mitglied des "
-"Alioth-Projektes <computeroutput>debian-edu</computeroutput> sein. Wenn Ihr "
-"Alioth-Benutzername von Ihrem lokalen abweicht, dann sollten Sie die Datei "
-"<computeroutput>~/.ssh/config</computeroutput> anlegen oder editieren. Dort "
-"sollte solch ein Konfigurations-Block vorhanden sein:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"Host git.debian.org\n"
-"User <your-alioth-username>"
-msgstr ""
-"Host git.debian.org\n"
-"User <your-alioth-username>"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
+#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
+#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-"debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
+"debian-edu-doc.git</computeroutput>"
 msgstr ""
 "Übertragen Sie dann den Inhalt von <computeroutput>debian-edu-doc</"
 "computeroutput> mittels SSH-Zugang: <computeroutput>git clone git+ssh://git."
@@ -10185,8 +10174,12 @@ msgstr ""
 "<computeroutput>git</computeroutput> installiert sein):"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-"
+#| "doc.git</computeroutput>"
 msgid ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
 "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
@@ -10248,10 +10241,14 @@ msgstr ""
 "aufweisen."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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\"/>."
 msgid ""
-"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\"/>."
+"Basic information about Salsa (the host where our Git repository is located) "
+"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
 "Information über Alioth (auf dem sich das Git-Depot befindet) und Git ist "
 "unter <ulink url=\"http://wiki.debian.org/Alioth/Git\"/> verfügbar."
@@ -11499,6 +11496,25 @@ msgstr ""
 "werden."
 
 #~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. If your Alioth username "
+#~ "differs from your local one, create or edit <computeroutput>~/.ssh/"
+#~ "config</computeroutput>. Add a config block like this:"
+#~ msgstr ""
+#~ "Um Ihre Übersetzungen übermitteln zu können, müssen Sie ein Mitglied des "
+#~ "Alioth-Projektes <computeroutput>debian-edu</computeroutput> sein. Wenn "
+#~ "Ihr Alioth-Benutzername von Ihrem lokalen abweicht, dann sollten Sie die "
+#~ "Datei <computeroutput>~/.ssh/config</computeroutput> anlegen oder "
+#~ "editieren. Dort sollte solch ein Konfigurations-Block vorhanden sein:"
+
+#~ msgid ""
+#~ "Host git.debian.org\n"
+#~ "User <your-alioth-username>"
+#~ msgstr ""
+#~ "Host git.debian.org\n"
+#~ "User <your-alioth-username>"
+
+#~ msgid ""
 #~ "<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 #~ "ulink> is an open source implementation of the programming language "
 #~ "Prolog, commonly used for teaching and semantic web applications."


=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
=====================================
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-06 21:57+0000\n"
+"POT-Creation-Date: 2018-05-30 13:21+0000\n"
 "PO-Revision-Date: 2015-03-30 22:30+0000\n"
 "Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -9293,24 +9293,15 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
-"from your local one, create or edit <computeroutput>~/.ssh/config</"
-"computeroutput>. Add a config block like this:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"Host git.debian.org\n"
-"User <your-alioth-username>"
+"To commit your translations you need to be a member of the Salsa project "
+"<computeroutput>debian-edu</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-"debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
+"debian-edu-doc.git</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -9330,10 +9321,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#| "debian-edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
 msgid ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
+"<computeroutput>rsync -progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -9376,9 +9373,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"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\"/>."
+"Basic information about Salsa (the host where our Git repository is located) "
+"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>


=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
=====================================
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2018-03-06 21:57+0000\n"
+"POT-Creation-Date: 2018-05-30 13:21+0000\n"
 "PO-Revision-Date: 2015-06-22 10:34+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -11196,8 +11196,8 @@ msgid ""
 "2016, 2017, 2018) and is released under the GPL v2 or any later version."
 msgstr ""
 "La traduction danoise, dont les droits d'auteur appartiennent à Frans "
-"Spiesschaert (2014, 2015, 2016, 2017, 2018) est distribuée sous GPL v2 ou toute version "
-"ultérieure."
+"Spiesschaert (2014, 2015, 2016, 2017, 2018) est distribuée sous GPL v2 ou "
+"toute version ultérieure."
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -11301,38 +11301,21 @@ msgstr ""
 "vous voulez aider à traduire ce document."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "To commit your translations you need to be a member of the Alioth project "
-#| "<computeroutput>debian-edu</computeroutput>. If your Alioth username "
-#| "differs from your local one, create or edit <computeroutput>~/.ssh/"
-#| "config</computeroutput>. There should be an entry like:"
-msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
-"from your local one, create or edit <computeroutput>~/.ssh/config</"
-"computeroutput>. Add a config block like this:"
-msgstr ""
-"Pour soumettre votre traduction, vous devez être membre du projet "
-"<computeroutput>debian-edu</computeroutput> sur Alioth. Si votre identifiant "
-"sur Alioth est différent de votre identifiant local, créez ou éditez "
-"<computeroutput>~/.ssh/config</computeroutput>. Il devrait y avoir une "
-"entrée ressemblant à :"
-
-#. type: CDATA
-#, no-wrap
 msgid ""
-"Host git.debian.org\n"
-"User <your-alioth-username>"
+"To commit your translations you need to be a member of the Salsa project "
+"<computeroutput>debian-edu</computeroutput>."
 msgstr ""
-"Host git.debian.org\n"
-"User <votre-identifiant-alioth>"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
+#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
+#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-"debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
+"debian-edu-doc.git</computeroutput>"
 msgstr ""
 "Puis récupérez les sources de <computeroutput>debian-edu-doc</"
 "computeroutput> avec un accès SSH : <computeroutput>git clone git+ssh://git."
@@ -11372,8 +11355,12 @@ msgstr ""
 "avoir installé le paquet <computeroutput>git</computeroutput> pour cela) :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-"
+#| "doc.git</computeroutput>"
 msgid ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
 "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
@@ -11445,10 +11432,14 @@ msgstr ""
 "traduisez aucune chaîne comportant « FIXME »."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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\"/>."
 msgid ""
-"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\"/>."
+"Basic information about Salsa (the host where our Git repository is located) "
+"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
 "Des informations de base à propos de Alioth (la machine hébergeant notre "
 "dépôt Git) et de Git sont disponibles à <ulink url=\"http://wiki.debian.org/"
@@ -12745,6 +12736,31 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#, fuzzy
+#~| msgid ""
+#~| "To commit your translations you need to be a member of the Alioth "
+#~| "project <computeroutput>debian-edu</computeroutput>. If your Alioth "
+#~| "username differs from your local one, create or edit <computeroutput>~/."
+#~| "ssh/config</computeroutput>. There should be an entry like:"
+#~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. If your Alioth username "
+#~ "differs from your local one, create or edit <computeroutput>~/.ssh/"
+#~ "config</computeroutput>. Add a config block like this:"
+#~ msgstr ""
+#~ "Pour soumettre votre traduction, vous devez être membre du projet "
+#~ "<computeroutput>debian-edu</computeroutput> sur Alioth. Si votre "
+#~ "identifiant sur Alioth est différent de votre identifiant local, créez ou "
+#~ "éditez <computeroutput>~/.ssh/config</computeroutput>. Il devrait y avoir "
+#~ "une entrée ressemblant à :"
+
+#~ msgid ""
+#~ "Host git.debian.org\n"
+#~ "User <your-alioth-username>"
+#~ msgstr ""
+#~ "Host git.debian.org\n"
+#~ "User <votre-identifiant-alioth>"
+
 #~ msgid ""
 #~ "<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 #~ "ulink> is an open source implementation of the programming language "


=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
=====================================
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2018-03-06 21:57+0000\n"
+"POT-Creation-Date: 2018-05-30 13:21+0000\n"
 "PO-Revision-Date: 2018-02-04 17:24+0100\n"
 "Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -9917,7 +9917,8 @@ msgid ""
 "2016, 2017, 2018) and is released under the GPL v2 or any later version."
 msgstr ""
 "La traduzione in olandese  è protetta da copyright da Frans Spiesschaert "
-"(2014, 2015, 2016, 2017, 2018) e rilasciata sotto licenza GPL v2 o successiva."
+"(2014, 2015, 2016, 2017, 2018) e rilasciata sotto licenza GPL v2 o "
+"successiva."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9992,31 +9993,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
-"from your local one, create or edit <computeroutput>~/.ssh/config</"
-"computeroutput>. Add a config block like this:"
+"To commit your translations you need to be a member of the Salsa project "
+"<computeroutput>debian-edu</computeroutput>."
 msgstr ""
-"Per inviare la propria traduzione è necessario essere membro del progetto "
-"Alioth <computeroutput>debian-edu</computeroutput>. Se il tuo username "
-"Alioth è diverso da quello locale, creare o modificare <computeroutput>~/."
-"ssh/config</computeroutput>. Aggiungere un blocco di configurazione come "
-"questo:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"Host git.debian.org\n"
-"User <your-alioth-username>"
-msgstr ""
-"Host git.debian.org\n"
-"User <proprio-nome-utente-alioth>"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
+#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
+#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-"debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
+"debian-edu-doc.git</computeroutput>"
 msgstr ""
 "Controllare poi i sorgenti <computeroutput>debian-edu-doc</computeroutput> "
 "usando l'accesso ssh: <computeroutput>git clone git+ssh://git.debian.org/git/"
@@ -10048,8 +10038,12 @@ msgstr ""
 "pacchetto <computeroutput>git</computeroutput> installato):"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-"
+#| "doc.git</computeroutput>"
 msgid ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
 "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
@@ -10108,10 +10102,14 @@ msgstr ""
 "quindi non bisogna tradurre ogni stringa che contiene \"FIXME\"."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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\"/>."
 msgid ""
-"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\"/>."
+"Basic information about Salsa (the host where our Git repository is located) "
+"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
 "Informazioni di base su Alioth (l'host dove è localizzato il nostro "
 "repository Git) e Git sono disponibili su <ulink url=\"http://wiki.debian."
@@ -11366,6 +11364,25 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. If your Alioth username "
+#~ "differs from your local one, create or edit <computeroutput>~/.ssh/"
+#~ "config</computeroutput>. Add a config block like this:"
+#~ msgstr ""
+#~ "Per inviare la propria traduzione è necessario essere membro del progetto "
+#~ "Alioth <computeroutput>debian-edu</computeroutput>. Se il tuo username "
+#~ "Alioth è diverso da quello locale, creare o modificare <computeroutput>~/."
+#~ "ssh/config</computeroutput>. Aggiungere un blocco di configurazione come "
+#~ "questo:"
+
+#~ msgid ""
+#~ "Host git.debian.org\n"
+#~ "User <your-alioth-username>"
+#~ msgstr ""
+#~ "Host git.debian.org\n"
+#~ "User <proprio-nome-utente-alioth>"
+
+#~ msgid ""
 #~ "<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 #~ "ulink> is an open source implementation of the programming language "
 #~ "Prolog, commonly used for teaching and semantic web applications."


=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
=====================================
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2018-03-06 21:57+0000\n"
+"POT-Creation-Date: 2018-05-30 13:21+0000\n"
 "PO-Revision-Date: 2017-10-09 05:36+0900\n"
 "Last-Translator: victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -9534,26 +9534,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
-"from your local one, create or edit <computeroutput>~/.ssh/config</"
-"computeroutput>. Add a config block like this:"
+"To commit your translations you need to be a member of the Salsa project "
+"<computeroutput>debian-edu</computeroutput>."
 msgstr ""
 
-#. type: CDATA
-#, no-wrap
-msgid ""
-"Host git.debian.org\n"
-"User <your-alioth-username>"
-msgstr ""
-"Host git.debian.org\n"
-"User <aliothでのユーザ名>"
-
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
+#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
+#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-"debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
+"debian-edu-doc.git</computeroutput>"
 msgstr ""
 "を追加し、ssh 経由で <computeroutput>debian-edu-doc</computeroutput> ソースを"
 "取得します: <computeroutput>git clone git+ssh://git.debian.org/git/debian-"
@@ -9584,8 +9578,12 @@ msgstr ""
 "インストールしている必要があります):"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-"
+#| "doc.git</computeroutput>"
 msgid ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
 "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
@@ -9642,10 +9640,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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\"/>."
 msgid ""
-"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\"/>."
+"Basic information about Salsa (the host where our Git repository is located) "
+"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
 "Alioth (Gitリポジトリが置かれているホスト) やGitについての基本的な情報は "
 "<ulink url=\"http://wiki.debian.org/Alioth/Git\"/> にあります。"
@@ -10861,6 +10863,13 @@ msgstr ""
 "skolelinux.no/info/cdbygging/news.html\"/> にあります。"
 
 #~ msgid ""
+#~ "Host git.debian.org\n"
+#~ "User <your-alioth-username>"
+#~ msgstr ""
+#~ "Host git.debian.org\n"
+#~ "User <aliothでのユーザ名>"
+
+#~ msgid ""
 #~ "<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 #~ "ulink> is an open source implementation of the programming language "
 #~ "Prolog, commonly used for teaching and semantic web applications."


=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
=====================================
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,11 +21,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2018-03-06 21:57+0000\n"
+"POT-Creation-Date: 2018-05-30 13:21+0000\n"
 "PO-Revision-Date: 2018-04-28 19:40+0000\n"
 "Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n"
-"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
-"debian-edu-documentation/debian-edu-stretch/nb/>\n"
+"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
+"edu-documentation/debian-edu-stretch/nb/>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -5751,9 +5751,9 @@ msgstr ""
 "For å aktivere Wake-on-LAN på tjeneren legg til klienter til "
 "<computeroutput>/etc/shutdown-at-night/clients</computeroutput>. En linje "
 "pr. klient, IP-adressen først, og MAC-adressen (ethernet-adressen) neste, "
-"med mellomrom mellom, eller lag et skript <computeroutput>/etc/"
-"shutdown-at-night/clients-generator</computeroutput> for å generere listen "
-"av klienter raskt."
+"med mellomrom mellom, eller lag et skript <computeroutput>/etc/shutdown-at-"
+"night/clients-generator</computeroutput> for å generere listen av klienter "
+"raskt."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7518,8 +7518,8 @@ msgstr ""
 "lastbalanseres. Lagre denne filen som <computeroutput>/etc/ltsp/"
 "ssh_known_hosts.extra </computeroutput> på alle lastbalanseringstjenerne. "
 "Dette siste steget er veldig viktig siden ltsp-update-sshkeys kjører hver "
-"gang en tjener restartes, og <computeroutput>/etc/ltsp/"
-"ssh_known_hosts.extra</computeroutput> legges inn hvis filen eksisterer."
+"gang en tjener restartes, og <computeroutput>/etc/ltsp/ssh_known_hosts."
+"extra</computeroutput> legges inn hvis filen eksisterer."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -8528,8 +8528,8 @@ msgid ""
 msgstr ""
 "Etter installering av Skolelinux-hovedtjeneren, Samba, skulle tjeneren bli "
 "synlig i nettverket til Windows «Neighbourhood». Debian Edus Windows-domene "
-"er SKOLELINUX. Bruk en Windows-maskin (eller et Linux-system med SMBclient ("
-"SMB - Server Message Block)) for å bla gjennom ditt Windows/Samba-"
+"er SKOLELINUX. Bruk en Windows-maskin (eller et Linux-system med SMBclient "
+"(SMB - Server Message Block)) for å bla gjennom ditt Windows/Samba-"
 "nettverksmiljø."
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -8860,8 +8860,8 @@ msgid ""
 "your Debian Edu main server."
 msgstr ""
 "Andre oppgaver kjøres på hver pålogging. For ytterligere informasjon om "
-"dette, kan du referere til <computeroutput>etc/samba/"
-"netlogon</computeroutput> mappe på din Skolelinux-hovedtjener."
+"dette, kan du referere til <computeroutput>etc/samba/netlogon</"
+"computeroutput> mappe på din Skolelinux-hovedtjener."
 
 #. type: Content of: <article><section><title>
 msgid "HowTos for teaching and learning"
@@ -9801,7 +9801,8 @@ msgid ""
 "2016, 2017, 2018) and is released under the GPL v2 or any later version."
 msgstr ""
 "Opphavsretten for den nederlandske oversettelsen tilhører Frans Spiesschaert "
-"(2014, 2015, 2016, 2017, 2018), og er utgitt under GPL  v2 eller en senere versjon."
+"(2014, 2015, 2016, 2017, 2018), og er utgitt under GPL  v2 eller en senere "
+"versjon."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9876,31 +9877,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
-"from your local one, create or edit <computeroutput>~/.ssh/config</"
-"computeroutput>. Add a config block like this:"
+"To commit your translations you need to be a member of the Salsa project "
+"<computeroutput>debian-edu</computeroutput>."
 msgstr ""
-"For å melde inn oversettelser må du være medlem av Alioth-"
-"prosjektet<computeroutput> debian-edu </computeroutput>. Hvis ditt Alioth "
-"brukernavn er forskjellig fra brukernavnet på din lokale maskin, opprett "
-"eller rediger <computeroutput> ~ / .ssh/config</computeroutput>. Legg til en "
-"config-blokk som denne:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"Host git.debian.org\n"
-"User <your-alioth-username>"
-msgstr ""
-"Host git.debian.org\n"
-"User <ditt-alioth-brukernavn>"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
+#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
+#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-"debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
+"debian-edu-doc.git</computeroutput>"
 msgstr ""
 "Sjekk så ut <computeroutput>debian-edu-doc</computeroutput>-kildekoden ved "
 "hjelp av SSH: <computeroutput>git clone git+ssh://git.debian.org/git/debian-"
@@ -9932,8 +9922,12 @@ msgstr ""
 "computeroutput> installert for at dette skal fungere):"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-"
+#| "doc.git</computeroutput>"
 msgid ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
 "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
@@ -9992,10 +9986,14 @@ msgstr ""
 "så ikke oversett noen tekst (tekststreng) som inneholder «FIXME»."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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\"/>."
 msgid ""
-"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\"/>."
+"Basic information about Salsa (the host where our Git repository is located) "
+"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
 "Grunnleggende informasjon om Alioth (verten der vårt Git pakkelager er "
 "plassert) og Git er tilgjengelig på <ulink url=\"http://wiki.debian.org/"
@@ -10936,11 +10934,11 @@ msgid ""
 "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
 msgstr ""
 "<emphasis>squid</emphasis>: Utkobling og omstart av hovedtjeneren tar lenger "
-"tid enn før på grunn av en ny standardinnstilling <computeroutput>"
-"shutdown_lifetime 30 seconds</computeroutput>. Som et eksempel kan "
-"forsinkelsen  være satt til 10 sekunder ved å tilføye linjen <computeroutput>"
-"shutdown_lifetime 10 seconds</computeroutput> til <computeroutput>/etc/"
-"squid3/squid.conf</computeroutput>."
+"tid enn før på grunn av en ny standardinnstilling "
+"<computeroutput>shutdown_lifetime 30 seconds</computeroutput>. Som et "
+"eksempel kan forsinkelsen  være satt til 10 sekunder ved å tilføye linjen "
+"<computeroutput>shutdown_lifetime 10 seconds</computeroutput> til "
+"<computeroutput>/etc/squid3/squid.conf</computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -11234,6 +11232,25 @@ msgstr ""
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
 #~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. If your Alioth username "
+#~ "differs from your local one, create or edit <computeroutput>~/.ssh/"
+#~ "config</computeroutput>. Add a config block like this:"
+#~ msgstr ""
+#~ "For å melde inn oversettelser må du være medlem av Alioth-"
+#~ "prosjektet<computeroutput> debian-edu </computeroutput>. Hvis ditt Alioth "
+#~ "brukernavn er forskjellig fra brukernavnet på din lokale maskin, opprett "
+#~ "eller rediger <computeroutput> ~ / .ssh/config</computeroutput>. Legg til "
+#~ "en config-blokk som denne:"
+
+#~ msgid ""
+#~ "Host git.debian.org\n"
+#~ "User <your-alioth-username>"
+#~ msgstr ""
+#~ "Host git.debian.org\n"
+#~ "User <ditt-alioth-brukernavn>"
+
+#~ msgid ""
 #~ "<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 #~ "ulink> is an open source implementation of the programming language "
 #~ "Prolog, commonly used for teaching and semantic web applications."


=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
=====================================
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2018-03-06 21:57+0000\n"
+"POT-Creation-Date: 2018-05-30 13:21+0000\n"
 "PO-Revision-Date: 2018-03-06 22:11+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -10242,8 +10242,8 @@ msgid ""
 "2016, 2017, 2018) and is released under the GPL v2 or any later version."
 msgstr ""
 "De auteursrechten van de Nederlandse vertaling berusten bij Frans "
-"Spiesschaert (2014, 2015, 2016, 2017, 2018). De vertaling is vrijgegeven onder de "
-"licentie GPL v2 of een latere versie."
+"Spiesschaert (2014, 2015, 2016, 2017, 2018). De vertaling is vrijgegeven "
+"onder de licentie GPL v2 of een latere versie."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -10321,31 +10321,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
-"from your local one, create or edit <computeroutput>~/.ssh/config</"
-"computeroutput>. Add a config block like this:"
-msgstr ""
-"Om uw vertaling te kunnen vastleggen, moet u lid zijn van het Aliothproject "
-"<computeroutput>debian-edu</computeroutput>. Indien uw gebruikersnaam in "
-"Alioth verschilt van uw lokale gebruikersnaam, moet u het bestand "
-"<computeroutput>~/.ssh/config</computeroutput> aanmaken of bewerken. Voeg in "
-"het bestand een configuratieblok zoals het volgende toe:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"Host git.debian.org\n"
-"User <your-alioth-username>"
+"To commit your translations you need to be a member of the Salsa project "
+"<computeroutput>debian-edu</computeroutput>."
 msgstr ""
-"Host git.debian.org\n"
-"User <uw-alioth-gebruikersnaam>"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
+#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
+#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-"debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
+"debian-edu-doc.git</computeroutput>"
 msgstr ""
 "Maak vervolgens verbinding via ssh en haal de broncode op van "
 "<computeroutput>debian-edu-doc</computeroutput>: <computeroutput>git clone "
@@ -10377,8 +10366,12 @@ msgstr ""
 "u het pakket <computeroutput>git</computeroutput> geïnstalleerd hebben):"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-"
+#| "doc.git</computeroutput>"
 msgid ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
 "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
@@ -10441,10 +10434,14 @@ msgstr ""
 "moet u onderdelen waarbij \"FIXME\" staat, niet vertalen."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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\"/>."
 msgid ""
-"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\"/>."
+"Basic information about Salsa (the host where our Git repository is located) "
+"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
 "Basisinformatie over Alioth (de computer waarop zich onze opslagruimte van "
 "Git bevindt) en over Git is te vinden op <ulink url=\"http://wiki.debian.org/"
@@ -11708,6 +11705,25 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. If your Alioth username "
+#~ "differs from your local one, create or edit <computeroutput>~/.ssh/"
+#~ "config</computeroutput>. Add a config block like this:"
+#~ msgstr ""
+#~ "Om uw vertaling te kunnen vastleggen, moet u lid zijn van het "
+#~ "Aliothproject <computeroutput>debian-edu</computeroutput>. Indien uw "
+#~ "gebruikersnaam in Alioth verschilt van uw lokale gebruikersnaam, moet u "
+#~ "het bestand <computeroutput>~/.ssh/config</computeroutput> aanmaken of "
+#~ "bewerken. Voeg in het bestand een configuratieblok zoals het volgende toe:"
+
+#~ msgid ""
+#~ "Host git.debian.org\n"
+#~ "User <your-alioth-username>"
+#~ msgstr ""
+#~ "Host git.debian.org\n"
+#~ "User <uw-alioth-gebruikersnaam>"
+
+#~ msgid ""
 #~ "<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 #~ "ulink> is an open source implementation of the programming language "
 #~ "Prolog, commonly used for teaching and semantic web applications."


=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
=====================================
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2018-03-06 21:57+0000\n"
+"POT-Creation-Date: 2018-05-30 13:21+0000\n"
 "PO-Revision-Date: 2017-06-05 08:57+0000\n"
 "Last-Translator: Stanisław Krukowski <stdf021 at riseup.net>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -7864,24 +7864,15 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
-"from your local one, create or edit <computeroutput>~/.ssh/config</"
-"computeroutput>. Add a config block like this:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"Host git.debian.org\n"
-"User <your-alioth-username>"
+"To commit your translations you need to be a member of the Salsa project "
+"<computeroutput>debian-edu</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-"debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
+"debian-edu-doc.git</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -7902,7 +7893,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
 
@@ -7947,9 +7938,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"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\"/>."
+"Basic information about Salsa (the host where our Git repository is located) "
+"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>


=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
=====================================
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-03-06 21:57+0000\n"
+"POT-Creation-Date: 2018-05-30 13:21+0000\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"
@@ -7320,24 +7320,15 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
-"from your local one, create or edit <computeroutput>~/.ssh/config</"
-"computeroutput>. Add a config block like this:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"Host git.debian.org\n"
-"User <your-alioth-username>"
+"To commit your translations you need to be a member of the Salsa project "
+"<computeroutput>debian-edu</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-"debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
+"debian-edu-doc.git</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -7358,7 +7349,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
 
@@ -7403,9 +7394,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"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\"/>."
+"Basic information about Salsa (the host where our Git repository is located) "
+"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>


=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
=====================================
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -3420,17 +3420,16 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </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-stretch-manual-translations</computeroutput>. The Git repository (see below) contains this file too. Take a look there and at the <ulink url="https://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>. If your Alioth username differs from your local one, create or edit <computeroutput>~/.ssh/config</computeroutput>. Add a config block like this: 
-</para><screen><![CDATA[Host git.debian.org
-User <your-alioth-username>]]></screen>
-<para> Then check out the <computeroutput>debian-edu-doc</computeroutput> source using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/debian-edu/debian-edu-doc.git</computeroutput> 
+<para>To commit your translations you need to be a member of the Salsa project <computeroutput>debian-edu</computeroutput>. 
+</para>
+<para>Then check out the <computeroutput>debian-edu-doc</computeroutput> source using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/debian-edu-doc.git</computeroutput> 
 </para>
 <para>If you only want to translate, you need to check out only a few files from Git (which can be done anonymously). 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>. See <ulink url="http://bugs.debian.org">instructions on how to submit bugs</ulink> for more information. 
 </para>
 <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>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc.git</computeroutput> 
+<para><computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc.git</computeroutput> 
 </para></listitem></itemizedlist>
 <para>Then edit the file <computeroutput>documentation/debian-edu-stretch/debian-edu-stretch-manual.$CC.po</computeroutput> (replacing $CC with your language code). There are many tools for translating available; we suggest using <computeroutput>lokalize</computeroutput>. 
 </para>
@@ -3446,7 +3445,7 @@ User <your-alioth-username>]]></screen>
 <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 Git repository is located) and Git is available at <ulink url="http://wiki.debian.org/Alioth/Git"/>. 
+<para>Basic information about Salsa (the host where our Git repository is located) and Git is available at <ulink url="https://wiki.debian.org/Salsa"/>. 
 </para>
 <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>


=====================================
documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
=====================================
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -6,11 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2018-03-06 21:57+0000\n"
+"POT-Creation-Date: 2018-05-30 13:21+0000\n"
 "PO-Revision-Date: 2018-05-29 04:35+0000\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
-"Language-Team: Chinese <https://hosted.weblate.org/projects/"
-"debian-edu-documentation/debian-edu-stretch/zh/>\n"
+"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
+"documentation/debian-edu-stretch/zh/>\n"
 "Language: zh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -5333,8 +5333,9 @@ msgid ""
 "and as a special case, checking for the LDM ssh connection command to work "
 "with LTSP thin clients."
 msgstr ""
-"当有人在使用客户端的时候其不应被关闭。这由检查输出来自<computeroutput>谁</computeroutput>来确保，而作为特殊的情况，对同 "
-"LTSP 瘦客户端工作的 LDM ssh 连接命令进行检查。"
+"当有人在使用客户端的时候其不应被关闭。这由检查输出来自<computeroutput>谁</"
+"computeroutput>来确保，而作为特殊的情况，对同 LTSP 瘦客户端工作的 LDM ssh 连"
+"接命令进行检查。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -5378,10 +5379,10 @@ msgid ""
 "space; or create a script <computeroutput>/etc/shutdown-at-night/clients-"
 "generator</computeroutput> to generate the list of clients on the fly."
 msgstr ""
-"启用服务器上的 wake-on-lan，添加客户端到 <computeroutput>/etc/shutdown-at-night/"
-"clients</computeroutput>，每一行一个，第一个是 IP 地址，随后是 MAC 地址（网卡地址），分隔以空格；"
-"或者创建一个即时生成客户端列表的脚本 <computeroutput>/etc/shutdown-at-night/clients-"
-"generator</computeroutput>。"
+"启用服务器上的 wake-on-lan，添加客户端到 <computeroutput>/etc/shutdown-at-"
+"night/clients</computeroutput>，每一行一个，第一个是 IP 地址，随后是 MAC 地址"
+"（网卡地址），分隔以空格；或者创建一个即时生成客户端列表的脚本 "
+"<computeroutput>/etc/shutdown-at-night/clients-generator</computeroutput>。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5410,8 +5411,8 @@ msgid ""
 "clients is this script using the netgroup tool from the <computeroutput>ng-"
 "utils</computeroutput> package:"
 msgstr ""
-"如果用 netgroup 来激活客户端 shutdown-at-night 的另一种选择是这一脚本使用来自 <computeroutput>ng-"
-"utils</computeroutput> 软件包的 netgroup 工具："
+"如果用 netgroup 来激活客户端 shutdown-at-night 的另一种选择是这一脚本使用来"
+"自 <computeroutput>ng-utils</computeroutput> 软件包的 netgroup 工具："
 
 #. type: CDATA
 #, no-wrap
@@ -5438,8 +5439,9 @@ msgid ""
 "that machine, you can access the server behind the firewall via the SSH "
 "tunnel."
 msgstr ""
-"要从互联网上访问防火墙背后的机器，考虑安装 <computeroutput>autossh</computeroutput> 软件包。它可以用来建立一个 "
-"SSH 隧道到一台你可以访问到的互联网上的机器。从该机器，可以通过 SSH 隧道访问防火墙背后的服务器。"
+"要从互联网上访问防火墙背后的机器，考虑安装 <computeroutput>autossh</"
+"computeroutput> 软件包。它可以用来建立一个 SSH 隧道到一台你可以访问到的互联网"
+"上的机器。从该机器，可以通过 SSH 隧道访问防火墙背后的服务器。"
 
 #. type: Content of: <article><section><section><title>
 msgid ""
@@ -5455,8 +5457,9 @@ msgid ""
 "this profile will lead to a machine, which is part of the Debian Edu "
 "network, but which doesn't have any services running (yet)."
 msgstr ""
-"在默认安装中，所有服务是在主服务器 tjener 上运行。为简化移动某服务到另一机器，可以用到 <emphasis>minimal</emphasis> "
-"安装配置。以这一配置安装会让一台机器是 Debian Edu 网络的一部分，但（还）未运行任何服务。"
+"在默认安装中，所有服务是在主服务器 tjener 上运行。为简化移动某服务到另一机"
+"器，可以用到 <emphasis>minimal</emphasis> 安装配置。以这一配置安装会让一台机"
+"器是 Debian Edu 网络的一部分，但（还）未运行任何服务。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5499,10 +5502,10 @@ msgid ""
 "(see the history of those pages to find them) if they are fine with moving "
 "the howto and putting it under the GPL.)"
 msgstr ""
-"FIXME: The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\""
-"/> are either user- or developer-specific. Let's move the user-specific "
-"HowTos over here (and delete them over there)! (But first ask the authors ("
-"see the history of those pages to find them) if they are fine with moving "
+"FIXME: The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/"
+"\"/> are either user- or developer-specific. Let's move the user-specific "
+"HowTos over here (and delete them over there)! (But first ask the authors "
+"(see the history of those pages to find them) if they are fine with moving "
 "the howto and putting it under the GPL.)"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -8407,9 +8410,10 @@ msgid ""
 "\"https://jenkins.debian.net/userContent/debian-edu-doc/\">online overview "
 "of shipped translations</ulink>."
 msgstr ""
-"本文档已有翻译成德语，意大利语，法语，丹麦语，荷兰语，挪威布克莫尔语以及日语的版本。存在不完整的西班牙语，波兰语和简体中文翻译。这里是<ulink "
-"url=\"https://jenkins.debian.net/userContent/debian-edu-doc/\""
-">已收录翻译的在线综览</ulink>。"
+"本文档已有翻译成德语，意大利语，法语，丹麦语，荷兰语，挪威布克莫尔语以及日语"
+"的版本。存在不完整的西班牙语，波兰语和简体中文翻译。这里是<ulink url="
+"\"https://jenkins.debian.net/userContent/debian-edu-doc/\">已收录翻译的在线综"
+"览</ulink>。"
 
 #. type: Content of: <article><section><section><title>
 msgid "HowTo translate this document"
@@ -8432,30 +8436,23 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
-"from your local one, create or edit <computeroutput>~/.ssh/config</"
-"computeroutput>. Add a config block like this:"
-msgstr ""
-"要提交你的翻译你需要是 Alioth 项目 <computeroutput>debian-edu</computeroutput> 的成员。如果你的 "
-"Alioth 用户名不同于你的本地的，创建或编辑 <computeroutput>~/.ssh/"
-"config</computeroutput>。添加一个配置块例如这个："
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"Host git.debian.org\n"
-"User <your-alioth-username>"
+"To commit your translations you need to be a member of the Salsa project "
+"<computeroutput>debian-edu</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
+#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
+#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-"debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git at salsa.debian.org:debian-edu/"
+"debian-edu-doc.git</computeroutput>"
 msgstr ""
-"然后使用 ssh 访问签出 <computeroutput>debian-edu-doc</computeroutput> "
-"源代码：<computeroutput>git clone git+ssh://git.debian.org/git/debian-edu/debian-"
+"然后使用 ssh 访问签出 <computeroutput>debian-edu-doc</computeroutput> 源代"
+"码：<computeroutput>git clone git+ssh://git.debian.org/git/debian-edu/debian-"
 "edu-doc.git</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
@@ -8466,9 +8463,10 @@ msgid ""
 "debian.org/debian-edu-doc\">bugreport</ulink>. See <ulink url=\"http://bugs."
 "debian.org\">instructions on how to submit bugs</ulink> for more information."
 msgstr ""
-"如果只是想要做翻译，仅需从 Git 签出少数文件（这是可以匿名进行的）。请提交相关 debian-edu-doc 软件包的错误并附上 PO 文件到<"
-"ulink url=\"http://bugs.debian.org/debian-edu-doc\">错误报告</ulink>。更多信息参阅<"
-"ulink url=\"http://bugs.debian.org\">如何提交错误的说明</ulink>。"
+"如果只是想要做翻译，仅需从 Git 签出少数文件（这是可以匿名进行的）。请提交相"
+"关 debian-edu-doc 软件包的错误并附上 PO 文件到<ulink url=\"http://bugs."
+"debian.org/debian-edu-doc\">错误报告</ulink>。更多信息参阅<ulink url="
+"\"http://bugs.debian.org\">如何提交错误的说明</ulink>。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8476,14 +8474,20 @@ msgid ""
 "anonymously with the following command (you need to have the "
 "<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
-"可以用以下命令（需要安装 <computeroutput>git</computeroutput> 软件包来工作）匿名签出 <computeroutput"
-">debian-edu-doc</computeroutput> 源代码："
+"可以用以下命令（需要安装 <computeroutput>git</computeroutput> 软件包来工作）"
+"匿名签出 <computeroutput>debian-edu-doc</computeroutput> 源代码："
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
+#| "debian-edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
 msgid ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8497,13 +8501,16 @@ msgstr ""
 msgid ""
 "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 "然后或直接提交该文件到 Git （如有那样做的权限）抑或发送该文件到错误报告。"
+msgstr ""
+"然后或直接提交该文件到 Git （如有那样做的权限）抑或发送该文件到错误报告。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To update your local copy of the repository use the following command inside "
 "the <computeroutput>debian-edu-doc</computeroutput> directory:"
-msgstr "在 <computeroutput>debian-edu-doc</computeroutput> 目录内使用以下命令更新文件库的本地副本："
+msgstr ""
+"在 <computeroutput>debian-edu-doc</computeroutput> 目录内使用以下命令更新文件"
+"库的本地副本："
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "<computeroutput>git pull</computeroutput>"
@@ -8525,13 +8532,17 @@ msgid ""
 msgstr "请留意这一手册仍在开发中，那就不要翻译任何含有 ” FIXME” 的字符串。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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\"/>."
 msgid ""
-"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\"/>."
+"Basic information about Salsa (the host where our Git repository is located) "
+"and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
-"关于 Alioth （我们的 Git 代码库位于该主机）和 Git 的基本信息 <ulink url=\"http://wiki.debian.org/"
-"Alioth/Git\"/>。"
+"关于 Alioth （我们的 Git 代码库位于该主机）和 Git 的基本信息 <ulink url="
+"\"http://wiki.debian.org/Alioth/Git\"/>。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8541,10 +8552,10 @@ msgid ""
 "changes to the repository</ulink>. Also you might want to look at the "
 "<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
 msgstr ""
-"如果对 Git 不熟悉，查阅<ulink url=\"http://git-scm.com/book\">专业 Git</ulink> 书籍；有一章<"
-"ulink url=\"http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-"
-"Repository\">代码库记录变化</ulink>。也可能需要看一看 <computeroutput>gitk</computeroutput> "
-"软件包所提供的 Git 图形界面。"
+"如果对 Git 不熟悉，查阅<ulink url=\"http://git-scm.com/book\">专业 Git</"
+"ulink> 书籍；有一章<ulink url=\"http://git-scm.com/book/en/Git-Basics-"
+"Recording-Changes-to-the-Repository\">代码库记录变化</ulink>。也可能需要看一"
+"看 <computeroutput>gitk</computeroutput> 软件包所提供的 Git 图形界面。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Translate online using a web browser"
@@ -9463,6 +9474,17 @@ msgstr ""
 "info/cdbygging/news.html\"/> 找到。"
 
 #~ msgid ""
+#~ "To commit your translations you need to be a member of the Alioth project "
+#~ "<computeroutput>debian-edu</computeroutput>. If your Alioth username "
+#~ "differs from your local one, create or edit <computeroutput>~/.ssh/"
+#~ "config</computeroutput>. Add a config block like this:"
+#~ msgstr ""
+#~ "要提交你的翻译你需要是 Alioth 项目 <computeroutput>debian-edu</"
+#~ "computeroutput> 的成员。如果你的 Alioth 用户名不同于你的本地的，创建或编"
+#~ "辑 <computeroutput>~/.ssh/config</computeroutput>。添加一个配置块例如这"
+#~ "个："
+
+#~ msgid ""
 #~ "This is explained in more detail in the <link linkend=\"NetworkClients--"
 #~ "Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
 #~ "\">HowTo/NetworkClients</link> chapter of this manual."



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/commit/05b0fd1143fc70d338ed8578936e345401361be0

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/commit/05b0fd1143fc70d338ed8578936e345401361be0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20180530/865907c1/attachment-0001.html>

More information about the debian-edu-commits mailing list