[debian-edu-commits] debian-edu/ 01/01: Update audacity manual and images from the wiki. Added Norwegian Bokmål of the Audacity manual by Jon Nordby.
Petter Reinholdtsen
pere at moszumanska.debian.org
Sun Nov 30 18:56:08 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 1e4e5fb8f257c684e5fd9d9bc43b3172d7b0b9aa
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Sun Nov 30 19:55:11 2014 +0100
Update audacity manual and images from the wiki. Added Norwegian Bokmål of the Audacity manual by Jon Nordby.
---
debian/changelog | 6 +
documentation/audacity/audacity-manual.fr.po | 166 +++++++--
...audacity-manual.fr.po => audacity-manual.nb.po} | 372 ++++++++++-----------
documentation/audacity/audacity-manual.nl.po | 166 +++++++--
documentation/audacity/audacity-manual.pot | 107 ++++--
documentation/audacity/audacity-manual.xml | 30 +-
6 files changed, 541 insertions(+), 306 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fd9fef0..79fcd17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ debian-edu-doc (1.6~20141203~8.0+edu0~alpha1) UNRELEASED; urgency=medium
* (en, de, fr) Update jessie network architecture images.
* (nb, nl) Fix po files by updating both using msgmerge.
+ [ Petter Reinholdtsen ]
+ * Update audacity manual and images from the wiki.
+
[ Jessie Manual translation updates ]
* German (Wolfgang Schweer)
* Dutch (Frans Spiesschaert) (Closes: #771231)
@@ -28,6 +31,9 @@ debian-edu-doc (1.6~20141203~8.0+edu0~alpha1) UNRELEASED; urgency=medium
* Dutch (Frans Spiesschaert)
* Norwegian (Ingrid Irvin)
+ [ Audacity manual translation updates ]
+ * Norwegian Bokmål (Jon Nordby)
+
-- Wolfgang Schweer <wschweer at arcor.de> Mon, 17 Nov 2014 15:18:02 +0100
debian-edu-doc (1.6~20141026~8.0+edu0~alpha0) unstable; urgency=medium
diff --git a/documentation/audacity/audacity-manual.fr.po b/documentation/audacity/audacity-manual.fr.po
index 2bb7684..5527734 100644
--- a/documentation/audacity/audacity-manual.fr.po
+++ b/documentation/audacity/audacity-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-11-17 15:32+0100\n"
+"POT-Creation-Date: 2014-11-30 19:31+0100\n"
"PO-Revision-Date: 2012-02-25 17:05+0100\n"
"Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -518,20 +518,33 @@ msgid "Translations of this document"
msgstr "Traductions de ce document"
#. type: Content of: <article><section><para>
-msgid "Fully translated versions of this document are available in French."
-msgstr "Ce document est disponible intégralement traduit en français."
+msgid ""
+"Versions of this document fully translated into French and Dutch are "
+"available. Incomplete translations exist for Norwegian Bokmål. This is an "
+"<ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/\">online "
+"overview of all languages</ulink>."
+msgstr ""
#. type: Content of: <article><section><section><title>
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.audacity-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.audacity-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/README.audacity-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."
msgstr ""
"Les traductions de ce document sont situées dans des fichiers .po comme pour "
"de nombreux projets de logiciels libres. Consultez <computeroutput>usr/share/"
@@ -540,12 +553,19 @@ msgstr ""
"souhaitez commencer/aider à traduire ce document."
#. type: Content of: <article><section><section><para>
-msgid ""
-"To commit your translations you need to be a member of the alioth project "
-"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from 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>."
+#, 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 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>. If your Alioth username differs "
+"from your local one, create or edit <computeroutput>~/.ssh/config</"
+"computeroutput>. There should be an entry like:"
msgstr ""
"Pour enregistrer vos traductions, vous devez être membre du projet alioth "
"<computeroutput>debian-edu</computeroutput>. Pour traduire, vous n'avez qu'à "
@@ -554,12 +574,41 @@ msgstr ""
"debian-edu at packages.qa.debian.org'>debian-edu 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 "
@@ -567,18 +616,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/audacity/audacity-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/audacity/audacity-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/audacity/audacity-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 éditer le fichier <computeroutput>documentation/audacity/audacity-"
@@ -587,9 +646,13 @@ msgstr ""
"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, vous pouvez soit enregistrer directement le fichier dans le dépôt "
"Subversion (si vous possédez les droits nécessaires), soit envoyer le "
@@ -604,17 +667,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>
-msgid ""
-"Read /usr/share/doc/debian-edu-doc-en/README.audacity-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>."
+#, fuzzy
+#| msgid ""
+#| "Read /usr/share/doc/debian-edu-doc-en/README.audacity-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/README.audacity-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."
msgstr ""
"Consultez /usr/share/doc/debian-edu-doc/README.audacity-manual-translations "
"pour apprendre comment créer un nouveau fichier PO pour votre langue s'il "
@@ -624,6 +695,30 @@ msgstr ""
"sur 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."
@@ -1209,3 +1304,6 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+
+#~ msgid "Fully translated versions of this document are available in French."
+#~ msgstr "Ce document est disponible intégralement traduit en français."
diff --git a/documentation/audacity/audacity-manual.fr.po b/documentation/audacity/audacity-manual.nb.po
similarity index 80%
copy from documentation/audacity/audacity-manual.fr.po
copy to documentation/audacity/audacity-manual.nb.po
index 2bb7684..4638a01 100644
--- a/documentation/audacity/audacity-manual.fr.po
+++ b/documentation/audacity/audacity-manual.nb.po
@@ -1,52 +1,51 @@
-# French translations for Debian Edu manual / Skolelinux
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
#
-# Christophe Masson <chrs.masson at free.fr>, 2008.
-# Olivier Vitrat <ovit.debian at gmail.com>, 2010.
-# Cédric Boutillier <cedric.boutillier at gmail.com>, 2012.
-# Jean-Paul Guillonneau <guillonneau.jeanpaul at free.fr>, 2012.
-# David Prévot <david at tilapin.org>, 2012.
-# Thomas Vincent <thomas at vinc-net.fr>, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-11-17 15:32+0100\n"
-"PO-Revision-Date: 2012-02-25 17:05+0100\n"
-"Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n"
-"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
-"Language: fr\n"
+# Translators:
+# Jon Nordby <jononor at gmail.com>, 2014
+# pere <pere-transifex at hungry.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: debian-edu-doc\n"
+"POT-Creation-Date: 2014-11-30 19:31+0100\n"
+"PO-Revision-Date: 2014-11-30 17:35+0000\n"
+"Last-Translator: Jon Nordby <jononor at gmail.com>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
+"p/debian-edu-doc/language/nb_NO/)\n"
+"Language: nb_NO\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
-msgstr "fr"
+msgstr "nb"
#. type: Content of: <article><articleinfo><title>
msgid "Debian Edu / Skolelinux Audacity manual"
-msgstr "Manuel d'Audacity pour Debian Edu / Skolelinux"
+msgstr "Debian Edu / Skolelinux Audacity manual"
#. type: Content of: <article><section><section><title>
msgid "Audacity manual"
-msgstr "Manuel d'Audacity"
+msgstr "Audacity manual"
#. type: Content of: <article><section><para>
msgid ""
"This is a manual for audacity, based on the 1.2.4b-2.1+b1 version from the "
"Debian Edu Etch 3.0 release."
msgstr ""
-"Voici le manuel d'Audacity, basé sur la version 1.2.4b-2.1+b1 de la "
-"publication Debian Edu Etch 3.0."
+"Dette er en manual for Audacity, basert på versjonen 1.2.4b-2.1+b1 fra "
+"Debian Edu Etch 3.0."
#. type: Content of: <article><section><para>
msgid ""
"The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
"Manuals/Audacity\"/> is a wiki and updated frequently."
msgstr ""
-"La version disponible depuis <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Manuals/Audacity\"/> est un wiki régulièrement mis à jour."
+"Versjonen på <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+"Manuals/Audacity\"/> er en wiki og oppdateres regelmessig."
#. type: Content of: <article><section><para>
msgid ""
@@ -55,14 +54,14 @@ msgid ""
"installed on a webserver, and is available <ulink url=\"http://maintainer."
"skolelinux.org/debian-edu-doc/\">online</ulink>."
msgstr ""
-"Les <link linkend=\"Translations\">traductions</link> font partie du paquet "
-"<computeroutput>debian-edu-doc</computeroutput>, qui peut être installé sur "
-"un serveur web et qui est disponible <ulink url=\"http://maintainer."
-"skolelinux.org/debian-edu-doc/\">en ligne</ulink>."
+"<link linkend=\"Translations\">Oversettelser</link> er del av pakken "
+"<computeroutput>debian-edu-doc</computeroutput>, som kan bli installert på "
+"en webtjener og er tilgjengelig <ulink url=\"http://maintainer.skolelinux."
+"org/debian-edu-doc/\">på nettet</ulink>."
#. type: Content of: <article><section><title>
msgid "Before you start"
-msgstr "Avant de commencer"
+msgstr "Før du starter"
#. type: Content of: <article><section><para>
msgid ""
@@ -70,10 +69,9 @@ msgid ""
"Jack, this is to make it possible to run other program that use sound at the "
"same time. How to setup Jack to run smoothly. The guide is here"
msgstr ""
-"Configurer Audacity n'est pas difficile, si vous pensez à le configurer pour "
-"utiliser Jack. Cela permet de faire fonctionner Audacity en même temps que "
-"d'autres programmes qui utilisent le son. Le guide pour configurer Jack est "
-"ici :"
+"Å sette opp Audacity er ikke vanskelig, hvis du husker å sette opp Audacity "
+"til a bruke Jack, for å gjøre det mulig for andre program å bruke lyd "
+"samtidig. Hvordan sette opp Jack til å virke sømløst. Oppskriften er her"
#. type: Content of: <article><section><para>
msgid ""
@@ -85,17 +83,15 @@ msgstr ""
#. type: Content of: <article><section><para>
msgid "I used Audacity 1.3.3-Beta when i make this documentation."
-msgstr ""
-"Lors de la rédaction de ce document, la version 1.3.12-Beta d'Audacity a été "
-"utilisée."
+msgstr "Jeg brukte Audacity 1.3.3-Beta da jeg lagde denne dokumentasjonen."
#. type: Content of: <article><section><para>
msgid ""
"So to set Audacity to use jack you have to go in the menu --> Edit ---"
"> Preferences."
msgstr ""
-"Pour faire en sorte qu'Audacity utilise Jack, allez dans le menu --> "
-"Édition --> Préférences."
+"For å sette Audacity til å bruke JACK må du gå inn i menyen --> Rediger "
+"---> Instillinger."
#. type: Content of: <article><section><para><inlinemediaobject>
msgid ""
@@ -116,8 +112,8 @@ msgid ""
"The next thing you have to be aware of that the project rate must be the "
"same sample rate you have set in jack."
msgstr ""
-"Le point suivant à vérifier est que le taux d'échantillonnage du projet est "
-"le même que celui indiqué dans les réglages de Jack."
+"Det neste du må være klar over er at prosjekt raten må være den samme som "
+"sampleraten du har satt i JACK."
#. type: Content of: <article><section><para><inlinemediaobject>
msgid ""
@@ -131,15 +127,15 @@ msgstr "samplerate.png"
#. type: Content of: <article><section><section><title>
msgid "Plugins"
-msgstr "Greffons"
+msgstr "Innstikk"
#. type: Content of: <article><section><section><para>
msgid "There are some plugins you probebly want:"
-msgstr "Voici certains greffons que vous pourriez souhaiter utiliser :"
+msgstr "Det er noen innstikk du antageligvis vil ha:"
#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
msgid "** audio Plugins **"
-msgstr "** Greffons audio **"
+msgstr "** Instikk for lyd **"
#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
msgid "swh-plugins"
@@ -155,15 +151,15 @@ msgstr "terminatorx"
#. type: Content of: <article><section><section><para>
msgid "fixme: put on some audio plugin you have experience with"
-msgstr "fixme: put on some audio plugin you have experience with"
+msgstr "fiksmeg: legg til noen lyd-instikk du har erfaring med"
#. type: Content of: <article><section><section><para>
msgid "Now you are ready to do some recording"
-msgstr "Maintenant vous êtes prêt à démarrer un enregistrement."
+msgstr "Nå er du klart til å gjøre opptak"
#. type: Content of: <article><section><section><title>
msgid "Where do i find audacity"
-msgstr "Où trouver Audacity ?"
+msgstr "Hvor finner jeg audacity"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -171,12 +167,12 @@ msgid ""
"look at the projects page here <ulink url=\"http://audacity.sourceforge.net/"
"\"/>"
msgstr ""
-"Vous pouvez simplement l'installer avec aptitude. Vous pouvez jeter un œil à "
-"la page web du projet <ulink url=\"http://audacity.sourceforge.net/\"/>."
+"Du kan installere Audacity med aptitude, og du kan også se prosjektets "
+"hjemmeside <ulink url=\"http://audacity.sourceforge.net/\"/>"
#. type: Content of: <article><section><title>
msgid "Doing some recording"
-msgstr "Faire un enregistrement"
+msgstr "Å gjøre opptak"
#. type: Content of: <article><section><para>
msgid ""
@@ -184,8 +180,8 @@ msgid ""
"that the record volume settings, not set to loud. It's better to have to low "
"setting rather to loud on this."
msgstr ""
-"D'abord, veillez à ne pas régler les volumes d'enregistrement trop forts. "
-"Mieux vaut qu'ils soient trop faibles que trop forts."
+"Det første du må huske når du gjør opptak er at opptakets voluminstillinger "
+"ikke er satt for høyt. Det er bedre å ha volumet for lavt enn for høyt."
#. type: Content of: <article><section><para><inlinemediaobject>
msgid ""
@@ -203,10 +199,8 @@ msgid ""
"the volume automaticall sett right volume on the record with out any danger "
"of have part of the sound overdriven."
msgstr ""
-"Une fois que vous avez enregistré ce que vous vouliez, vous pouvez "
-"normaliser l'enregistrement, ainsi le niveau automatique réglera "
-"correctement le volume, sans danger de se retrouver avec un son "
-"partiellement saturé."
+"Og når du har tatt opp det du ønsker, kan du normalisere opptaket slik at "
+"volumet blir korrekt uten fare for at lyden blir klippet."
#. type: Content of: <article><section><para><inlinemediaobject>
msgid ""
@@ -220,8 +214,7 @@ msgstr "normalize.png"
#. type: Content of: <article><section><para>
msgid "And after you have normalized the recorded segment, it looks like this."
-msgstr ""
-"Une fois que vous avez normalisé un segment enregistré, il ressemble à cela :"
+msgstr "Etter du har normalisert opptaket ser det slik ut."
#. type: Content of: <article><section><para><inlinemediaobject>
msgid ""
@@ -239,10 +232,8 @@ msgid ""
"to be sure that the record you have done not are overdrived, so have to Low "
"setting and afterwards let audacity fix the volume on it."
msgstr ""
-"Le volume du segment enregistré est maintenant corrigé. La meilleure façon "
-"d'avoir la certitude que l'enregistrement effectué ne sera pas saturé est "
-"donc d'enregistrer avec un réglage sonore faible, et de laisser Audacity "
-"corriger le volume."
+"Nå er volumet på denne biten av opptaket korrekt. Dette er en bedre måte å "
+"passe på at opptaket du har gjort ikke blir klippet."
#. type: Content of: <article><section><para>
msgid ""
@@ -250,16 +241,13 @@ msgid ""
"your microphone. So first part is to make a \"noise profile\" of what you "
"want to remove from your recordet segment."
msgstr ""
-"Il est possible de réduire le bruit de l'enregistrement, pour supprimer par "
-"exemple les chuintements du microphone. La première étape consiste à "
-"réaliser un « profil de bruit » de ce que vous voulez supprimer du segment "
-"enregistré."
+"Nå vil vi fjerne støy fra opptaket, for eksempel bakgrunnstøy fra "
+"mikrofonen. Så første steg er å lage en \"støyprofil\" av hva du vil fjerne "
+"fra opptaket."
#. type: Content of: <article><section><para>
msgid "1. First zoom out so you more clearly can see the recording."
-msgstr ""
-"1. D'abord, faites un zoom arrière pour avoir une vue d'ensemble de "
-"l'enregistrement."
+msgstr "1. Først zoom ut slik at du kan se opptaket tydligere."
#. type: Content of: <article><section><para><inlinemediaobject>
msgid "<imageobject><imagedata fileref=\"./images/zoom.png\"/></imageobject>"
@@ -275,8 +263,8 @@ msgid ""
"hold down on the segment, and drag. You mark the zone you need to get the "
"profile of."
msgstr ""
-"2. Marquez ensuite le passage dont vous voulez faire le profil, en cliquant "
-"sur le bouton gauche au début du segment, puis en glissant."
+"2. Deretter marker hva du vil lage en profil av. Klikk og hold ned venstre "
+"museknapp mens du drar. Marker området du trenger å få en profil av."
#. type: Content of: <article><section><para><inlinemediaobject>
msgid ""
@@ -290,7 +278,7 @@ msgstr "marking.png"
#. type: Content of: <article><section><para>
msgid "3. Then choose that you want to use Noize removal"
-msgstr "3. Puis choisissez « Réduction du bruit » parmi les effets."
+msgstr "3. Deretter velg at du vil bruke Støyfjerning"
#. type: Content of: <article><section><para><inlinemediaobject>
msgid ""
@@ -304,7 +292,7 @@ msgstr "noiseremoval.png"
#. type: Content of: <article><section><para>
msgid "4. Then Create \"noise profile\""
-msgstr "4. Prenez ensuite le profil du bruit."
+msgstr "4. Så lag \"støyprofil\""
#. type: Content of: <article><section><para><inlinemediaobject>
msgid ""
@@ -323,9 +311,8 @@ msgid ""
"5. Then you choose the whole record by clicking CTRL + A, and choose noise "
"removal again from meny, but this time press OK"
msgstr ""
-"5. Enfin, sélectionnez l'enregistrement entier en appuyant sur Ctrl+A et "
-"choisissez à nouveau l'effet « Réduction du bruit » dans le menu, en "
-"appuyant cette fois sur le bouton « Valider »."
+"5. Så velg hele opptaket ved å klikke Ctrl + A, og velg Støyfjerning igjen "
+"fra menyen, men denne gangen trykk OK"
#. type: Content of: <article><section><para>
msgid ""
@@ -333,22 +320,21 @@ msgid ""
"just search the big menu that is available after you installed the plugins i "
"recommended."
msgstr ""
-"Si vous voulez ajouter de la réverbération, ou d'autres effets sympathiques, "
-"vous n'avez qu'à choisir dans le long menu qui est disponible après "
-"l'installation des greffons recommandés."
+"Så hvis du ønsker å legge til gjenklang og andre effekter, så søker du bare "
+"i den store menyen som er tilgjengelig etter du installerte innstikkene som "
+"ble anbefalt."
#. type: Content of: <article><section><para>
msgid ""
"You have several way to export you finished result. You can export it as "
"WAV, AIFF MP3, OGG, FLAC, just choose export in the file menu."
msgstr ""
-"Il est possible d'exporter le résultat final dans l'un des formats "
-"suivants : WAV, AIFF, MP3, OGG, FLAC, en choisissant l'option « Exporter… » "
-"dans le menu Fichier."
+"Du har flere måter å eksportere det ferdig resultatet på. Du kan eksportere "
+"som WAV, AIFF, MP3, OFF, FLAC, bare velg Eksporter i Fil menyen."
#. type: Content of: <article><section><title>
msgid "Importing Audio"
-msgstr "Importer du son"
+msgstr "Importere lyd"
#. type: Content of: <article><section><para>
msgid ""
@@ -356,13 +342,13 @@ msgid ""
"You can directly import Mp3 files into the project, and mixing different "
"song together in audacity"
msgstr ""
-"Avec Audacity vous pouvez importer des données audio (audio, MIDI, "
-"marqueurs, données brutes). Il est possible d'importer directement des "
-"fichiers MP3 dans le projet et mixer différentes chansons."
+"Med Audacity kan du importere lyd av typen Audio, Midi, Labels, Raw Data. Du "
+"kan direkte importere MP3 filter inn i prosjektet, og mikse sammen "
+"forskjellige sanger i Audacity."
#. type: Content of: <article><section><para>
msgid "Let me give you example."
-msgstr "Par exemple :"
+msgstr "Her er et eksempel."
#. type: Content of: <article><section><para>
msgid ""
@@ -371,11 +357,10 @@ msgid ""
"then the newly importet audio will come under your first audio, the "
"posibility to mixing here is huge."
msgstr ""
-"Tout d'abord, vous avez une chanson principale « smurfesangen ». Importez "
-"ensuite une autre chanson, en choisissant simplement dans le menu --> "
-"Fichier --> Importer --> Audio. Les données audio importées seront "
-"placées sous celles de la chanson principale. Les possibilités de mixage "
-"sont énormes."
+"Først hovedsangen min \"smurfesangen\", og så kan du importere for miksing "
+"en sang til. Bare velg den i menyen > > Fil > > Importer Lyd, så "
+"vil det importerte lydsporet komme under det første lydsporet. Muligeten for "
+"å mikse er stor."
#. type: Content of: <article><section><para><inlinemediaobject>
msgid ""
@@ -389,7 +374,7 @@ msgstr "mixingaudio.png"
#. type: Content of: <article><section><title>
msgid "Tool section"
-msgstr "Section outils"
+msgstr "Verktøyseksjon"
#. type: Content of: <article><section><para><inlinemediaobject>
msgid ""
@@ -403,7 +388,7 @@ msgstr "toolbox.png"
#. type: Content of: <article><section><section><title>
msgid "Selection tool"
-msgstr "Outil de sélection"
+msgstr "Utvalgsverktøy"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -411,21 +396,19 @@ msgid ""
"selection tool, choose where you want to cut it. And then with \"ctrl + I\" "
"split it. And then with time shift tool you can move the segment."
msgstr ""
-"Pour pouvoir séparer et déplacer un morceau, vous devez d'abord choisir avec "
-"l'outil de sélection où vous souhaitez le couper. Séparez-le ensuite avec "
-"Ctrl+I. Vous pouvez ensuite le déplacer avec l'outil de glissement temporel."
+"For å splitte lyden slik at du kan flytte deler av den må du først bruke "
+"utvalgsverktøyet og velge hvor du vil kutte det. Bruk Ctrl + I for å "
+"splitte. Og deretter med tidsskift verktøyet kan du flytte delen."
#. type: Content of: <article><section><section><title>
msgid "Zooming tool"
-msgstr "Outil de zoom"
+msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"With the Zooming tool you can zoom into the audio segment and then with the "
"draving tool manipulateing the audio"
msgstr ""
-"Avec l'outil de zoom, vous pouvez agrandir un segment audio, puis manipuler "
-"les données audio avec l'outil de retouche."
#. type: Content of: <article><section><section><para><inlinemediaobject>
msgid ""
@@ -439,15 +422,13 @@ msgstr "manipulating.png"
#. type: Content of: <article><section><section><title>
msgid "Envelope Tool"
-msgstr "Outil de niveau (enveloppe)"
+msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"With the envelope tool you can manipulate the volume bye decrease and "
"increase volume wherever you are on the segment"
msgstr ""
-"Vous pouvez jouer sur le volume grâce à l'outil de niveau, et l'augmenter ou "
-"le diminuer en n'importe quel point du segment."
#. type: Content of: <article><section><section><para><inlinemediaobject>
msgid ""
@@ -463,15 +444,15 @@ msgstr "manipulating1.png"
#. type: Content of: <article><section><section><title>
msgid "Time Shifting Tool"
-msgstr "Outil de glissement temporel"
+msgstr ""
#. type: Content of: <article><section><section><para>
msgid "with this you can move your audio segments arround."
-msgstr "Vous pouvez déplacer les segments audio avec cet outil."
+msgstr ""
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
-msgstr "Copyright et auteurs"
+msgstr ""
#. type: Content of: <article><section><para>
msgid ""
@@ -479,9 +460,6 @@ msgid ""
"Holger Levsen (2009) and is released under the GPL2 or any later version. "
"Enjoy!"
msgstr ""
-"Le document est écrit par Alf Tonny Bätz (2008, 2009), Holger Levsen (2009). "
-"Les droits de copie sont la propriété des auteurs. Ce document est distribué "
-"avec la license GPL2 ou toute version ultérieure."
#. type: Content of: <article><section><para>
msgid ""
@@ -490,15 +468,10 @@ msgid ""
"emphasis>! Then add your name here and release it under the \"GPL v2 or any "
"later version\" licence."
msgstr ""
-"Si vous enrichissez son contenu, <emphasis role=\"strong\">ne le faites, "
-"s'il-vous-plaît, que si vous êtes l'auteur des ajouts et envisagez de les "
-"distribuer sous les mêmes conditions</emphasis> ! Ajoutez alors votre nom "
-"ici pour indiquer que vous publiez vos modifications sous GPL v2 ou toute "
-"version ultérieure."
#. type: Content of: <article><section><title>
msgid "Translation copyright and authors"
-msgstr "Copyright de traduction et auteurs"
+msgstr ""
#. type: Content of: <article><section><para>
msgid ""
@@ -507,135 +480,146 @@ msgid ""
"Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, "
"2012) and is released under the GPL v2 or any later version."
msgstr ""
-"La traduction française, dont les droits d'auteur appartiennent à Christophe "
-"Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) et l'équipe "
-"française de localisation (2009, 2010, 2012), est distribuée sous GPL v2 ou "
-"toute version ultérieure."
#. type: Content of: <article><section><title>
msgid "Translations of this document"
-msgstr "Traductions de ce document"
+msgstr ""
#. type: Content of: <article><section><para>
-msgid "Fully translated versions of this document are available in French."
-msgstr "Ce document est disponible intégralement traduit en français."
+msgid ""
+"Versions of this document fully translated into French and Dutch are "
+"available. Incomplete translations exist for Norwegian Bokmål. This is an "
+"<ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/\">online "
+"overview of all languages</ulink>."
+msgstr ""
#. type: Content of: <article><section><section><title>
msgid "HowTo translate this document"
-msgstr "Comment traduire ce document"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"As in many free software projects, translations of this document are kept in "
+"PO files. More information about the process can be found in "
+"<computeroutput>/usr/share/doc/debian-edu-doc/README.audacity-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."
+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>. 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 ""
-"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.audacity-manual-translations</computeroutput> for more information on "
-"this. Please read also read this, if you want to start/help translating this "
-"document."
+"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 ""
-"Les traductions de ce document sont situées dans des fichiers .po comme pour "
-"de nombreux projets de logiciels libres. Consultez <computeroutput>usr/share/"
-"doc/debian-edu-doc/README.release-manual-translations</computeroutput> pour "
-"plus d'informations à ce propos. Veuillez lire aussi ce qui suit si vous "
-"souhaitez commencer/aider à traduire ce document."
#. type: Content of: <article><section><section><para>
msgid ""
-"To commit your translations you need to be a member of the alioth project "
-"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from 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>."
+"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 ""
-"Pour enregistrer vos traductions, vous devez être membre du projet alioth "
-"<computeroutput>debian-edu</computeroutput>. Pour traduire, vous n'avez qu'à "
-"importer quelques fichiers depuis Subversion (ce qui peut être fait "
-"anonymement), créer des correctifs et les envoyer à <ulink url='mailto:"
-"debian-edu at packages.qa.debian.org'>debian-edu at packages.qa.debian.org\"</"
-"ulink>."
#. 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 ""
-"Vous pouvez télécharger le source du paquet <computeroutput>debian-edu-doc</"
-"computeroutput> anonymement à l'aide de la commande suivante (vous devez "
-"avoir installé le paquet <computeroutput>subversion</computeroutput> pour "
-"cela) :"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
msgstr ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
#. type: Content of: <article><section><section><para>
msgid ""
-"Then edit the <computeroutput>documentation/audacity/audacity-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/audacity/audacity-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 éditer le fichier <computeroutput>documentation/audacity/audacity-"
-"manual.$CC.po</computeroutput> (où vous remplacez $CC par votre code de "
-"langue). Il existe de nombreux outils de traduction disponibles, nous vous "
-"suggérons d'utiliser <computeroutput>lokalize</computeroutput>."
#. 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 ""
-"Ensuite, vous pouvez soit enregistrer directement le fichier dans le dépôt "
-"Subversion (si vous possédez les droits nécessaires), soit envoyer le "
-"fichier à la liste de diffusion."
#. type: Content of: <article><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 ""
-"Pour mettre à jour votre copie locale du dépôt, utilisez la commande "
-"suivante dans le répertoire <computeroutput>debian-edu-doc</computeroutput> :"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
-msgstr "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Read /usr/share/doc/debian-edu-doc/README.audacity-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."
+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 ""
-"Read /usr/share/doc/debian-edu-doc-en/README.audacity-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>."
-msgstr ""
-"Consultez /usr/share/doc/debian-edu-doc/README.audacity-manual-translations "
-"pour apprendre comment créer un nouveau fichier PO pour votre langue s'il "
-"n'en existe pas déjà un et comment mettre à jour les traductions. Si vous "
-"débutez avec Subversion, vous pouvez consulter le livre <ulink url=\"http://"
-"svnbook.org\">Contrôle de version avec Subversion</ulink>, qui a un chapitre "
-"sur le <ulink url=\"http://svnbook.red-bean.com/nightly/fr/svn.tour.cycle."
-"html\">cycle de travail de base</ulink>."
+"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."
+msgstr "Meld fra om eventuelle problemer."
#. type: Content of: <article><section><title>
msgid "Appendix A - The GNU Public License"
-msgstr "Annexe A - La Licence Publique GNU"
+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."
-msgstr "Note aux traducteurs : il n'est pas nécessaire de traduire le texte de la licence GPL."
+msgstr "Notat til oversettere: Det er ikke nødvendig å oversette GPL lisensteksten."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -644,11 +628,6 @@ msgid ""
"wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/CopyRight#"
"\">Copyright chapter</ulink> for the full list of copyright owners."
msgstr ""
-"Copyright (C) 2008,2009 Alf Tonny Bätz < <ulink url=\"mailto:alfton at gmail."
-"com\">alfton at gmail.com</ulink> > et autres auteurs. Consultez le <ulink "
-"url=\"https://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/"
-"CopyRight#\">chapitre Copyright</ulink> pour la liste complète des "
-"propriétaires de Copyright."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -756,13 +735,6 @@ msgid ""
"give any other recipients of the Program a copy of this License along with "
"the Program."
msgstr ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
-"copies of the Program's source code as you receive it, in any medium, "
-"provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the "
-"notices that refer to this License and to the absence of any warranty; and "
-"give any other recipients of the Program a copy of this License along with "
-"the Program."
#. type: Content of: <article><section><section><para>
msgid ""
diff --git a/documentation/audacity/audacity-manual.nl.po b/documentation/audacity/audacity-manual.nl.po
index 08b394c..92a160b 100644
--- a/documentation/audacity/audacity-manual.nl.po
+++ b/documentation/audacity/audacity-manual.nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-11-17 15:32+0100\n"
+"POT-Creation-Date: 2014-11-30 19:31+0100\n"
"PO-Revision-Date: 2014-08-08 15:36+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -519,21 +519,33 @@ msgid "Translations of this document"
msgstr "Vertalingen van dit document"
#. type: Content of: <article><section><para>
-msgid "Fully translated versions of this document are available in French."
+msgid ""
+"Versions of this document fully translated into French and Dutch are "
+"available. Incomplete translations exist for Norwegian Bokmål. This is an "
+"<ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/\">online "
+"overview of all languages</ulink>."
msgstr ""
-"Volledig vertaalde versies van dit document zijn beschikbaar in het Frans."
#. type: Content of: <article><section><section><title>
msgid "HowTo translate this document"
msgstr "Hoe dit document vertalen"
#. 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.audacity-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.audacity-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/README.audacity-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."
msgstr ""
"Vertalingen van dit document worden bijgehouden in PO-bestanden, zoals dit "
"het geval is voor veel projecten van vrije programmatuur. Lees "
@@ -543,12 +555,19 @@ msgstr ""
"van dit document."
#. type: Content of: <article><section><section><para>
-msgid ""
-"To commit your translations you need to be a member of the alioth project "
-"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from 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>."
+#, 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 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>. If your Alioth username differs "
+"from your local one, create or edit <computeroutput>~/.ssh/config</"
+"computeroutput>. There should be an entry like:"
msgstr ""
"Om uw vertaling te kunnen vastleggen, moet u lid zijn van het Aliothproject "
"<computeroutput>debian-edu</computeroutput>. Om te beginnen vertalen, moet u "
@@ -557,12 +576,41 @@ msgstr ""
"naar <ulink url=\"mailto: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 ""
"U kunt anoniem de broncode van <computeroutput>debian-edu-doc</"
"computeroutput> ophalen met de volgende opdracht (opdat dit zou werken moet "
@@ -570,18 +618,28 @@ msgstr ""
"hebben):"
#. 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/audacity/audacity-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/audacity/audacity-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/audacity/audacity-manual."
+"$CC.po</computeroutput> (replacing $CC with your language code). There are "
+"many tools for translating available; we suggest using "
"<computeroutput>lokalize</computeroutput>."
msgstr ""
"Bewerk vervolgens het bestand <computeroutput>documentation/audacity/"
@@ -591,9 +649,13 @@ msgstr ""
"<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 ""
"Nadien kunt u ofwel rechtstreeks het bestand vastleggen in Subversion "
"(indien u over de rechten beschikt om dat te doen) of het bestand naar de "
@@ -609,17 +671,25 @@ msgstr ""
"<computeroutput>debian-edu-doc</computeroutput> bevindt:"
#. 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.audacity-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>."
+#, fuzzy
+#| msgid ""
+#| "Read /usr/share/doc/debian-edu-doc-en/README.audacity-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/README.audacity-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."
msgstr ""
"In het bestand /usr/share/doc/debian-edu-doc-en/README.audacity-manual-"
"translations kunt u informatie vinden over het aanmaken van een nieuw PO-"
@@ -630,6 +700,30 @@ msgstr ""
"in Subversion: <ulink url=\"http://svnbook.red-bean.com/en/1.0/ch03s05.html"
"\">basic workflow with Subversion</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 "Gelieve ons eventuele problemen te rapporteren."
@@ -1215,3 +1309,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+
+#~ msgid "Fully translated versions of this document are available in French."
+#~ msgstr ""
+#~ "Volledig vertaalde versies van dit document zijn beschikbaar in het Frans."
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index cd4712a..b909e9d 100644
--- a/documentation/audacity/audacity-manual.pot
+++ b/documentation/audacity/audacity-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-17 15:32+0100\n"
+"POT-Creation-Date: 2014-11-30 19:31+0100\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"
@@ -422,7 +422,11 @@ msgid "Translations of this document"
msgstr ""
#. type: Content of: <article><section><para>
-msgid "Fully translated versions of this document are available in French."
+msgid ""
+"Versions of this document fully translated into French and Dutch are "
+"available. Incomplete translations exist for Norwegian Bokmål. This is an "
+"<ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/\">online "
+"overview of all languages</ulink>."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -431,48 +435,72 @@ 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.audacity-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/README.audacity-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."
+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>. 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 ""
-"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 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>."
+"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/audacity/audacity-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/audacity/audacity-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>
@@ -482,17 +510,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/README.audacity-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."
+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 ""
-"Read /usr/share/doc/debian-edu-doc-en/README.audacity-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>."
+"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/audacity/audacity-manual.xml b/documentation/audacity/audacity-manual.xml
index 94e8fe6..b6107fb 100644
--- a/documentation/audacity/audacity-manual.xml
+++ b/documentation/audacity/audacity-manual.xml
@@ -176,31 +176,43 @@
<section id="Translations">
<title>Translations of this document
</title>
-<para>Fully translated versions of this document are available in French.
+<para>Versions of this document fully translated into French and Dutch are available. Incomplete translations exist for Norwegian Bokmål. This is an <ulink url="http://maintainer.skolelinux.org/debian-edu-doc/">online overview of all languages</ulink>.
</para>
<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.audacity-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/README.audacity-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>. To translate, you just need to check out some files 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/audacity/audacity-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/audacity/audacity-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.audacity-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/README.audacity-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