Update documentation files on git migration

1 files changed, 21 insertions, 16 deletions

diff --git a/doc/translations_po.txt b/doc/translations_po.txt
index 8961ae8b7..1657de81b 100644
--- a/doc/translations_po.txt
+++ b/doc/translations_po.txt
@@ -1,8 +1,8 @@
-Debian Installation Manual - notes for translation
+Debian Installation Guide - notes for translations
 --------------------------------------------------
 
 This file explains how to translate the manual using .po files.
-This is now officially supported.
+This is now officially supported and the recommended way.
 
 !!! For general information on translating the manual, please see the
 !!! translations.txt file.
@@ -50,7 +50,7 @@ poxml tools.
                          using .po files
 - ./scripts/set_untranslated : used for the conversion of existing translations
 
-All scripts should be run from the ./manual directory and take the language as
+All scripts should be run from the ./installation-guide directory and take the language as
 parameter.
 
 
@@ -62,8 +62,8 @@ to switch from translating XML files to using PO files.
 
 The template files for the manual are available in ./po/pot, so all you need
 to do is create a new directory for your language (using the official ISO
-code for your language) and copy the .pot file you want to translate to a
-.po file in that directory.
+code for your language) and copy all the .pot files to a .po file in that
+directory.
 
 Example for a Dutch translation:
   - mkdir ./po/nl
@@ -77,22 +77,22 @@ start translating them.
   
 Committing your translation
 ===========================
-The translation can be committed to d-i's SVN repository using:
-  1. svn ci ./po/<your language> -m "<some comment describing the changes>"
+The translation can be committed to d-i's git repository using:
+  1. git add ./po/<lang>/*
+  2. git commit -m "<some comment describing the changes>"
+  2. git push
 
-If this is the first time you commit the translation of a file, you will need
-to run the 'svn add' command on the new files before you do 'svn ci'.
-Tip: use the commands 'svn st ' and 'svn diff' before you commit your changes
-to check what you are committing before you run the 'svn ci' command.
+Tip: use the command 'git diff -u' before you commit your changes (step 2),
+to check what you are committing.
 
 
 Updating your translation
 =========================
 The PO files for your language and the templates for the manual are
 updated regularly when there are changes in the original English XML
-files.  This is done during the "daily" builds (currently done by
-Frans Pop); you should not have to update your PO files yourself, but
-rather get the updates using 'svn up'. Changed strings will be marked
+files.  This is done during the "daily" builds (currently done by the i18n
+coordinator); you should not have to update your PO files yourself, but
+rather get the updates using 'git pull'. Changed strings will be marked
 'fuzzy' and new strings will be untranslated.
 
 After this your PO files in the ./po directory should be updated and you can
@@ -100,13 +100,13 @@ update the translation with your favorite PO file editor. To commit the
 changes, follow again the procedure described in the previous section.
 
 To update the POT and PO files manually, use the following commands:
-  1. svn up
+  1. git pull
   2. ./scripts/merge_xml en
   3. ./scripts/update_pot
   4. ./scripts/update_po <your language>
 
 NOTE
-Doing this manually may result in SVN conflicts when you next 'svn up' with
+Doing this manually may result in git conflicts when you next 'git pull' with
 the repository. The preferred method is to just wait until your PO files are
 updated for you.
 
@@ -145,6 +145,8 @@ However, the update_pot and update_pot functions from above's step 1-3 are
 performed in a temporary directory, so buildone_ng.sh cannot be used to update
 your translation po files!
 For this, you need to still follow the chapter "Updating your translation".
+The intention of buildone_ng.sh is just, to provide an easy method for
+translators, to build the manual for testing their translation.
 
 Converting an existing translation from .xml files to .po files
 ===============================================================
@@ -289,6 +291,9 @@ If you find any errors in this file, please fix them.
 --------------------------------------------------------------------------
 Changelog:
 
+2018/06/03 Holger Wansing
+ - Updating (most) content on git migration
+
 2017-04-12 Holger Wansing
  - Document new buildone_ng.sh script, to build manual from po files
    with one command.