[debian-edu-commits] debian-edu/ 01/01: Update rosengarden manual and images from the wiki.

Petter Reinholdtsen pere at moszumanska.debian.org
Wed Jun 18 14:09:41 UTC 2014


This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-doc.

commit 7481bc2308711b85ecde1220dd39a5906db16717
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Jun 18 16:09:37 2014 +0200

    Update rosengarden manual and images from the wiki.
---
 debian/changelog                                 |   1 +
 documentation/rosegarden/rosegarden-manual.es.po |  99 +++++++++----
 documentation/rosegarden/rosegarden-manual.fr.po | 149 +++++++++++++++----
 documentation/rosegarden/rosegarden-manual.nb.po | 178 ++++++++++++++---------
 documentation/rosegarden/rosegarden-manual.pot   |  99 +++++++++----
 documentation/rosegarden/rosegarden-manual.xml   |  30 ++--
 6 files changed, 393 insertions(+), 163 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18d7cd2..fb8b1d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ debian-edu-doc (1.5~XXX) UNRELEASED; urgency=medium
     #751678).
   * Update Norwegian Bokmål translation of the Rosegarden manual.
   * Add build rules to create epub version too (Closes: #687106).
+  * Update rosengarden manual and images from the wiki.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 03 Apr 2014 14:52:00 +0200
 
diff --git a/documentation/rosegarden/rosegarden-manual.es.po b/documentation/rosegarden/rosegarden-manual.es.po
index d1db8d0..d573baa 100644
--- a/documentation/rosegarden/rosegarden-manual.es.po
+++ b/documentation/rosegarden/rosegarden-manual.es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Rosegarden Manual Debian Edu\n"
 "Report-Msgid-Bugs-To: tato at debian.org.sv\n"
-"POT-Creation-Date: 2014-05-02 18:19+0300\n"
+"POT-Creation-Date: 2014-06-18 16:09+0300\n"
 "PO-Revision-Date: 2012-01-10 10:33-0600\n"
 "Last-Translator: Rafael Ernesto Rivas <tato at debian.org.sv>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -3029,8 +3029,9 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore "
-"Skogly (2008) and is released under the GPL v2 or any later version."
+"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008), Tore Skogly "
+"(2008) and Petter Reinholdtsen (2014) and is released under the GPL v2 or "
+"any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -3056,48 +3057,71 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Translations of this document are kept in PO files like in many free "
-"software projects, read <computeroutput>usr/share/doc/debian-edu-doc-en/"
-"README.rosegarden-manual-translations</computeroutput> for more information "
-"on this. Please read also read this, if you want to start/help translating "
-"this document."
+"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-en/README.rosegarden-manual-"
+"translations</computeroutput> for more information on this. The Git "
+"repository (see below) contains this file too. Take a look there if you want "
+"to help translating this document."
 msgstr ""
 
 #. 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), "
-"create patches and send those to <ulink url=\"mailto:debian-edu-doc at packages."
-"qa.debian.org\">debian-edu-doc at packages.qa.debian.org</ulink>."
+"<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:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"Host git.debian.org\n"
+"User <your-alioth-username>"
+msgstr ""
+
+#. type: Content of: <article><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>"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If you only want 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."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"You can checkout the <computeroutput>debian-edu-doc</computeroutput> source "
+"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>
 msgid ""
-"Then edit the <computeroutput>documentation/rosegarden/rosegarden-manual.$CC."
-"po</computeroutput> (where you replace $CC with your language code). There "
-"are many tools for translating available, we suggest to use "
+"Then edit the file <computeroutput>documentation/rosegarden/rosegarden-"
+"manual.$CC.po</computeroutput> (replacing $CC with your language code). "
+"There are many tools for translating available; we suggest using "
 "<computeroutput>lokalize</computeroutput>."
 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 mailinglist."
+"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>
@@ -3107,17 +3131,38 @@ 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>
 msgid ""
 "Read /usr/share/doc/debian-edu-doc-en/README.rosegarden-manual-translations "
 "to find information how to create a new PO file for your language if there "
-"is none yet, and how to update translations. 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>."
+"isn't one yet, and how to update translations."
+msgstr ""
+
+#.  <remark>
+#. status ignore</remark> 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please keep in mind that this manual is still under development, so don't "
+"translate any string which contains \" FIXME\"."
+msgstr ""
+
+#. type: Content of: <article><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\"/>."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"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/rosegarden/rosegarden-manual.fr.po b/documentation/rosegarden/rosegarden-manual.fr.po
index 8596038..995e5cd 100644
--- a/documentation/rosegarden/rosegarden-manual.fr.po
+++ b/documentation/rosegarden/rosegarden-manual.fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2014-05-02 18:19+0300\n"
+"POT-Creation-Date: 2014-06-18 16:09+0300\n"
 "PO-Revision-Date: 2012-02-25 11:11-0400\n"
 "Last-Translator: Thomas Vincent <thomas at vinc-net.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -3372,8 +3372,9 @@ msgstr "Droit de reproduction et auteurs des traductions"
 #| "The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore "
 #| "Skogly (2008) and is released under the GPL2 or any later version."
 msgid ""
-"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore "
-"Skogly (2008) and is released under the GPL v2 or any later version."
+"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008), Tore Skogly "
+"(2008) and Petter Reinholdtsen (2014) and is released under the GPL v2 or "
+"any later version."
 msgstr ""
 "La traduction norvégienne Bokmål, dont les droits d'auteur appartiennent à "
 "Tore Skogly (2008), est distribuée sous GPL2 ou toute version ultérieure."
@@ -3410,12 +3411,20 @@ msgid "HowTo translate this document"
 msgstr "Comment traduire ce document"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"Translations of this document are kept in PO files like in many free "
-"software projects, read <computeroutput>usr/share/doc/debian-edu-doc-en/"
-"README.rosegarden-manual-translations</computeroutput> for more information "
-"on this. Please read also read this, if you want to start/help translating "
-"this document."
+#, fuzzy
+#| msgid ""
+#| "Translations of this document are kept in PO files like in many free "
+#| "software projects, read <computeroutput>usr/share/doc/debian-edu-doc-en/"
+#| "README.rosegarden-manual-translations</computeroutput> for more "
+#| "information on this. Please read also read this, if you want to start/"
+#| "help translating this document."
+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-en/README.rosegarden-manual-"
+"translations</computeroutput> for more information on this. The Git "
+"repository (see below) contains this file too. Take a look there if you want "
+"to help translating this document."
 msgstr ""
 "Les traductions de ce document sont situées dans des fichiers PO comme pour "
 "de nombreux projets de logiciels libres, lisez <computeroutput>usr/share/doc/"
@@ -3424,12 +3433,19 @@ msgstr ""
 "souhaitez commencer/aider à traduire ce document."
 
 #. type: Content of: <article><section><section><para>
+#, 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), create patches and send those to <ulink url=\"mailto:debian-"
+#| "edu-doc at packages.qa.debian.org\">debian-edu-doc at packages.qa.debian.org</"
+#| "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), "
-"create patches and send those to <ulink url=\"mailto:debian-edu-doc at packages."
-"qa.debian.org\">debian-edu-doc at packages.qa.debian.org</ulink>."
+"<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:"
 msgstr ""
 "Pour livrer vos traductions, vous devez être membre du projet Alioth "
 "<computeroutput>debian-edu</computeroutput>. Pour traduire, vous n'avez qu'à "
@@ -3438,12 +3454,41 @@ msgstr ""
 "debian-edu-doc at packages.qa.debian.org\">debian-edu-doc at packages.qa.debian."
 "org</ulink>."
 
+#. type: CDATA
+#, no-wrap
+msgid ""
+"Host git.debian.org\n"
+"User <your-alioth-username>"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
-"You can checkout the <computeroutput>debian-edu-doc</computeroutput> source "
+"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>"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If you only want 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."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, 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):"
+"<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 "
@@ -3451,18 +3496,28 @@ msgstr ""
 "cela) :"
 
 #. 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>"
 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>"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"Then edit the <computeroutput>documentation/rosegarden/rosegarden-manual.$CC."
-"po</computeroutput> (where you replace $CC with your language code). There "
-"are many tools for translating available, we suggest to use "
+#, fuzzy
+#| msgid ""
+#| "Then edit the <computeroutput>documentation/rosegarden/rosegarden-manual."
+#| "$CC.po</computeroutput> (where you replace $CC with your language code). "
+#| "There are many tools for translating available, we suggest to use "
+#| "<computeroutput>lokalize</computeroutput>."
+msgid ""
+"Then edit the file <computeroutput>documentation/rosegarden/rosegarden-"
+"manual.$CC.po</computeroutput> (replacing $CC with your language code). "
+"There are many tools for translating available; we suggest using "
 "<computeroutput>lokalize</computeroutput>."
 msgstr ""
 "Ensuite éditez le fichier <computeroutput>documentation/rosegarden/"
@@ -3471,9 +3526,13 @@ msgstr ""
 "nous vous suggérons d'utiliser <computeroutput>lokalize</computeroutput>."
 
 #. 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 mailinglist."
 msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the mailinglist."
+"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 livrez directement le fichier sous Subversion (si vous "
 "possédez les droits nécessaires), soit vous envoyez le fichier à la liste de "
@@ -3488,17 +3547,25 @@ 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>"
+#, fuzzy
+#| msgid "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
 msgstr "<computeroutput>svn up</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Read /usr/share/doc/debian-edu-doc-en/README.rosegarden-manual-"
+#| "translations to find information how to create a new PO file for your "
+#| "language if there is none yet, and how to update translations. 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>."
 msgid ""
 "Read /usr/share/doc/debian-edu-doc-en/README.rosegarden-manual-translations "
 "to find information how to create a new PO file for your language if there "
-"is none yet, and how to update translations. 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>."
+"isn't one yet, and how to update translations."
 msgstr ""
 "Lisez /usr/share/doc/debian-edu-doc-en/README.rosegarden-manual-translations "
 "pour apprendre comment créer un nouveau fichier PO pour votre langue s'il "
@@ -3508,6 +3575,30 @@ msgstr ""
 "concernant le <ulink url=\"http://svnbook.red-bean.com/nightly/fr/svn.tour."
 "cycle.html\">cycle de travail de base</ulink>."
 
+#.  <remark>
+#. status ignore</remark> 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please keep in mind that this manual is still under development, so don't "
+"translate any string which contains \" FIXME\"."
+msgstr ""
+
+#. type: Content of: <article><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\"/>."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"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>
 msgid "Please report any problems."
 msgstr "Veuillez signaler tout problème."
diff --git a/documentation/rosegarden/rosegarden-manual.nb.po b/documentation/rosegarden/rosegarden-manual.nb.po
index ba9ad4f..4f34a91 100644
--- a/documentation/rosegarden/rosegarden-manual.nb.po
+++ b/documentation/rosegarden/rosegarden-manual.nb.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rosegarden-manual.nb\n"
-"POT-Creation-Date: 2014-06-17 13:59+0300\n"
+"POT-Creation-Date: 2014-06-18 16:09+0300\n"
 "PO-Revision-Date: 2014-06-17 15:19+0200\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-no at lister.ping.uio.no>\n"
@@ -357,10 +357,6 @@ msgid "How to fix recorded audio files"
 msgstr "Hvordan fikse lydopptaksfiler"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Take in use Audacity, i have made a documentations that help you to get "
-#| "startet. First you just double click on the audio segment, and audacity "
-#| "should start automatical and load the segment you have choosen."
 msgid ""
 "Take in use Audacity, I have made a documentation that help you to get "
 "started. First you just double click on the audio segment, and audacity "
@@ -534,9 +530,6 @@ msgid "Other devices that are compatible with Linux"
 msgstr "Andre enheter som er kompatible med Linux"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "This have been tested with skolelinux 3, kubuntu 7.10, kubuntu 8.04 and "
-#| "with kernel 2.6.22.16, and 2.6.24.18"
 msgid ""
 "These have been tested with skolelinux 3, kubuntu 7.10, kubuntu 8.04 and "
 "with kernel 2.6.22.16, and 2.6.24.18"
@@ -551,8 +544,8 @@ msgstr "<emphasis role=\"strong\"> Enhet </emphasis>"
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\"> extra install, needs depends </emphasis>"
 msgstr ""
-"<emphasis role=\"strong\"> ekstrainstallasjon, trenger avhengigheter <"
-"/emphasis>"
+"<emphasis role=\"strong\"> ekstrainstallasjon, trenger avhengigheter </"
+"emphasis>"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Roland edirol UA-25"
@@ -677,9 +670,6 @@ msgid "Usb Works, and the piano also have midi inn/out"
 msgstr "Usb Works, and the piano also have midi inn/out"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Thanks to Mario Music for allowed me to be in there store testing this "
-#| "equipment."
 msgid ""
 "Thanks to Mario Music for allowing me to be in their store testing this "
 "equipment."
@@ -1844,7 +1834,6 @@ msgid "63"
 msgstr "63"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "Synth Bass 1"
 msgid "SynthBrass 1"
 msgstr "SynthBass 1"
 
@@ -1869,7 +1858,6 @@ msgid "64"
 msgstr "64"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "Synth Bass 2"
 msgid "SynthBrass 2"
 msgstr "SynthBass 2"
 
@@ -2854,13 +2842,12 @@ msgid ""
 msgstr ""
 "Det er ennå ikke mulig å vise et pianosegment i et dualsystem (grand "
 "staff).  Men <ulink url=\"http://rosegarden.sourceforge.net/tutorial/"
-"supplemental/piano/index.html\">her er en detaljert manual</ulink> om hvordan "
-"tegne slike noter med <ulink url=\"https://wiki.debian.org/LilyPond\">"
-"LilyPond</ulink>. Første "
-"steg er å splitte segmentet på tonehøyde (dette refererer til <ulink "
-"url=\"https://sourceforge.net/tracker/?func=detail&"
-"atid=354932&aid=1987423&group_id=4932\">endringsforespørsel 4932<"
-"/ulink>)."
+"supplemental/piano/index.html\">her er en detaljert manual</ulink> om "
+"hvordan tegne slike noter med <ulink url=\"https://wiki.debian.org/LilyPond"
+"\">LilyPond</ulink>. Første steg er å splitte segmentet på tonehøyde (dette "
+"refererer til <ulink url=\"https://sourceforge.net/tracker/?func=detail&"
+"atid=354932&aid=1987423&group_id=4932\">endringsforespørsel 4932</"
+"ulink>)."
 
 #. type: Content of: <article><section><section><title>
 msgid "Setting notes manually, and step recording"
@@ -3300,24 +3287,18 @@ msgstr "Så la oss gå igjennom dette steg før steg."
 #, no-wrap
 msgid ""
 "1. File, create new\n"
-"2. Right click on untitled, and choose Properties. (Rename it to your "
-"liking)\n"
+"2. Right click on untitled, and choose Properties. (Rename it to your liking)\n"
 "3. Click on the \"+\", and right click under Samples, \n"
-"   and choose load sample (choose the wav files you want to use for your "
-"instrument)\n"
-"4. Click on the \"+\" behind Samples, and User, there you see your wav file. "
-"\n"
+"   and choose load sample (choose the wav files you want to use for your instrument)\n"
+"4. Click on the \"+\" behind Samples, and User, there you see your wav file. \n"
 "   In our case, there are two files, named L and R \n"
 "   (Hint: file names are truncated to 10 characters)\n"
-"5. Then click on Instrument, so it gets highlighted, then click right and "
-"choose New Instrument\n"
+"5. Then click on Instrument, so it gets highlighted, then click right and choose New Instrument\n"
 "6. Click on the \"+\" behind Instrument, and right click on New item, \n"
 "   and choose properties and change name to your liking.\n"
 "7. Then it's time to select the samples to be used for our new instrument: \n"
-"   Mark them within Samples/User by holding down the control key while "
-"clicking. \n"
-"   Afterwards, you can insert those samples at Instruments/Your Instrument by "
-"means of the\n"
+"   Mark them within Samples/User by holding down the control key while clicking. \n"
+"   Afterwards, you can insert those samples at Instruments/Your Instrument by means of the\n"
 "   Paste function in the context menu (right click).\n"
 "   Your Samples have been assigned to the instrument name you made.\n"
 "   (Hint: This works like a link; whenever you change sample properties,\n"
@@ -3327,18 +3308,15 @@ msgstr ""
 "2. høyreklikk på untitled, og velg Properties. (Endre SF2 filens navn)\n"
 "3. klikk på \"+\", og høyreklikk under Samples, \n"
 "   velg load sample (velg den nye lyden din)\n"
-"4.klikk på \"+\" ved siden av Samples, og under User kan du se wav-"
-"filen. \n"
+"4.klikk på \"+\" ved siden av Samples, og under User kan du se wav-filen. \n"
 "   du ser filen som to filer en for venstre og høyre\n"
-"5. klikk på  Instrument, slik at det blir valgt, så høyreklikker du og "
-"velger New Instrument\n"
+"5. klikk på  Instrument, slik at det blir valgt, så høyreklikker du og velger New Instrument\n"
 "6. klikk på  \"+\" foran Instrument, høyreklikk på New Item, \n"
 "   Velg properties og endre navnet til ditt nye instrument\n"
 "\"7. Nå kan du importere wav-filen til det nyopprettede instrumentet. \n"
-"   Velg begge under user ved å holde inne CTRL og venstreklikke på de "
-"to, \n"
+"   Velg begge under user ved å holde inne CTRL og venstreklikke på de to, \n"
 "   deretter høyreklikker du på ditt nye instrument og velger paste \n"
-"   Din WAV-fil har nå blitt en del av ditt nye instrument.\n"
+"   Din WAV-fil har nå blitt en del av ditt nye instrument."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject>
 msgid ""
@@ -3455,10 +3433,19 @@ msgid "Translation copyright and authors"
 msgstr "Opphavsrett og forfattere av oversettelser"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Alf Tonny Bätz (2008, 2009), "
+#| "Holger Levsen (2008) and is released under the GPL2 or any later version. "
+#| "Enjoy!"
 msgid ""
-"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore "
-"Skogly (2008) and is released under the GPL v2 or any later version."
+"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008), Tore Skogly "
+"(2008) and Petter Reinholdtsen (2014) and is released under the GPL v2 or "
+"any later version."
 msgstr ""
+"Dette dokumentet er skrevet av og opphavsretten innehas av Alf Tonny Bätz "
+"(2008, 2009), og Holger Levsen (2008), og er gitt ut med lisensen GPL2 eller "
+"en senere versjon. Nyt det!"
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -3476,8 +3463,8 @@ msgid ""
 "Fully translated versions of this document are available in Norwegian Bokmål "
 "and French."
 msgstr ""
-"Komplett oversatt versjon av dette dokumentet er tilgjengelig på norsk bokmål "
-"og fransk."
+"Komplett oversatt versjon av dette dokumentet er tilgjengelig på norsk "
+"bokmål og fransk."
 
 #. type: Content of: <article><section><section><title>
 msgid "HowTo translate this document"
@@ -3485,50 +3472,77 @@ msgstr "Hvordan oversette dette dokumentet"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Translations of this document are kept in PO files like in many free "
-"software projects, read <computeroutput>usr/share/doc/debian-edu-doc-en/"
-"README.rosegarden-manual-translations</computeroutput> for more information "
-"on this. Please read also read this, if you want to start/help translating "
-"this document."
+"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-en/README.rosegarden-manual-"
+"translations</computeroutput> for more information on this. The Git "
+"repository (see below) contains this file too. Take a look there if you want "
+"to help translating this document."
 msgstr ""
 
 #. 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), "
-"create patches and send those to <ulink url=\"mailto:debian-edu-doc at packages."
-"qa.debian.org\">debian-edu-doc at packages.qa.debian.org</ulink>."
+"<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:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"Host git.debian.org\n"
+"User <your-alioth-username>"
+msgstr ""
+
+#. type: Content of: <article><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>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"You can checkout the <computeroutput>debian-edu-doc</computeroutput> source "
+"If you only want 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."
+msgstr ""
+
+#. 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 ""
 
 #. 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>"
 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>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Then edit the <computeroutput>documentation/rosegarden/rosegarden-manual.$CC."
-"po</computeroutput> (where you replace $CC with your language code). There "
-"are many tools for translating available, we suggest to use "
+"Then edit the file <computeroutput>documentation/rosegarden/rosegarden-"
+"manual.$CC.po</computeroutput> (replacing $CC with your language code). "
+"There are many tools for translating available; we suggest using "
 "<computeroutput>lokalize</computeroutput>."
 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 mailinglist."
+"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>
@@ -3538,17 +3552,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
+#, fuzzy
+#| msgid "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
 msgstr "<computeroutput>svn up</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Read /usr/share/doc/debian-edu-doc-en/README.rosegarden-manual-translations "
 "to find information how to create a new PO file for your language if there "
-"is none yet, and how to update translations. 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>."
+"isn't one yet, and how to update translations."
+msgstr ""
+
+#.  <remark>
+#. status ignore</remark> 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please keep in mind that this manual is still under development, so don't "
+"translate any string which contains \" FIXME\"."
+msgstr ""
+
+#. type: Content of: <article><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\"/>."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"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>
@@ -3561,8 +3598,7 @@ msgstr "Vedlegg A - Den offentlige GNU-lisensen"
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"Note to translators: there is no need to translate the GPL license text."
+msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index 89c2461..34f83d2 100644
--- a/documentation/rosegarden/rosegarden-manual.pot
+++ b/documentation/rosegarden/rosegarden-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-11 00:08+0300\n"
+"POT-Creation-Date: 2014-06-18 16:09+0300\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"
@@ -2930,8 +2930,9 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore "
-"Skogly (2008) and is released under the GPL v2 or any later version."
+"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008), Tore Skogly "
+"(2008) and Petter Reinholdtsen (2014) and is released under the GPL v2 or "
+"any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -2957,48 +2958,71 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Translations of this document are kept in PO files like in many free "
-"software projects, read <computeroutput>usr/share/doc/debian-edu-doc-en/"
-"README.rosegarden-manual-translations</computeroutput> for more information "
-"on this. Please read also read this, if you want to start/help translating "
-"this document."
+"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-en/README.rosegarden-manual-"
+"translations</computeroutput> for more information on this. The Git "
+"repository (see below) contains this file too. Take a look there if you want "
+"to help translating this document."
 msgstr ""
 
 #. 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), "
-"create patches and send those to <ulink url=\"mailto:debian-edu-doc at packages."
-"qa.debian.org\">debian-edu-doc at packages.qa.debian.org</ulink>."
+"<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:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"Host git.debian.org\n"
+"User <your-alioth-username>"
+msgstr ""
+
+#. type: Content of: <article><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>"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If you only want 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."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"You can checkout the <computeroutput>debian-edu-doc</computeroutput> source "
+"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>
 msgid ""
-"Then edit the <computeroutput>documentation/rosegarden/rosegarden-manual.$CC."
-"po</computeroutput> (where you replace $CC with your language code). There "
-"are many tools for translating available, we suggest to use "
+"Then edit the file <computeroutput>documentation/rosegarden/rosegarden-"
+"manual.$CC.po</computeroutput> (replacing $CC with your language code). "
+"There are many tools for translating available; we suggest using "
 "<computeroutput>lokalize</computeroutput>."
 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 mailinglist."
+"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>
@@ -3008,17 +3032,38 @@ 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>
 msgid ""
 "Read /usr/share/doc/debian-edu-doc-en/README.rosegarden-manual-translations "
 "to find information how to create a new PO file for your language if there "
-"is none yet, and how to update translations. 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>."
+"isn't one yet, and how to update translations."
+msgstr ""
+
+#.  <remark>
+#. status ignore</remark> 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please keep in mind that this manual is still under development, so don't "
+"translate any string which contains \" FIXME\"."
+msgstr ""
+
+#. type: Content of: <article><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\"/>."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"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/rosegarden/rosegarden-manual.xml b/documentation/rosegarden/rosegarden-manual.xml
index b191dab..f518950 100644
--- a/documentation/rosegarden/rosegarden-manual.xml
+++ b/documentation/rosegarden/rosegarden-manual.xml
@@ -1391,7 +1391,7 @@
 <section id="CopyRight--Translation_copyright_and_authors">
 <title>Translation copyright and authors
 </title>
-<para>The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore Skogly (2008) and is released under the GPL v2 or any later version. 
+<para>The Bokmål translation is copyrighted by Alf Tonny Bätz (2008), Tore Skogly (2008) and Petter Reinholdtsen (2014) and is released under the GPL v2 or any later version. 
 </para>
 <para>The French translation is copyrighted by Arnaud Bonvalle (2009), Thomas Vincent (2012) and the French l10n team (2012) and is released under the GPL v2 or any later version. 
 </para>
@@ -1406,25 +1406,37 @@
 <section id="Translations--HowTo_translate_this_document">
 <title>HowTo translate this document
 </title>
-<para>Translations of this document are kept in PO files like in many free software projects, read <computeroutput>usr/share/doc/debian-edu-doc-en/README.rosegarden-manual-translations</computeroutput> for more information on this. Please read also read this, if you want to start/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-en/README.rosegarden-manual-translations</computeroutput> for more information on this. The Git repository (see below) contains this file too. Take a look there 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), create patches and send those to <ulink url="mailto:debian-edu-doc at packages.qa.debian.org">debian-edu-doc at packages.qa.debian.org</ulink>. 
+<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>. There should be an entry like: 
+</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>
-<para>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): 
+<para>If you only want 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>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 <computeroutput>documentation/rosegarden/rosegarden-manual.$CC.po</computeroutput> (where you replace $CC with your language code). There are many tools for translating available, we suggest to use <computeroutput>lokalize</computeroutput>. 
+<para>Then edit the file <computeroutput>documentation/rosegarden/rosegarden-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 mailinglist. 
+<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-en/README.rosegarden-manual-translations to find information how to create a new PO file for your language if there is none yet, and how to update translations. 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>. 
+<para>Read /usr/share/doc/debian-edu-doc-en/README.rosegarden-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 Git repository is located) and Git is available at <ulink url="http://wiki.debian.org/Alioth/Git"/>. 
+</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>
 <para>Please report any problems. 
 </para>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git



More information about the debian-edu-commits mailing list