Update translations.txt with new torbutton process.

1 files changed, 43 insertions, 40 deletions

diff --git a/doc/translations.txt b/doc/translations.txt
index 874abe1bc..a6b258223 100644
--- a/doc/translations.txt
+++ b/doc/translations.txt
@@ -77,57 +77,30 @@ the portal to check in their changes.
 
 To make use of the translations that users have commited to the translations/
 subversion module, you'll need to ensure that you have a current checked out
-copy of Torbutton:
+copy of them in your torbutton git checkout:
 
-    cd torbutton/trans_tools
-    torbutton/trans_tools$ svn up
+    cd torbutton.git/trans_tools
+    torbutton.git/trans_tools$ svn co https://tor-svn.freehaven.net/svn/translation/trunk/projects/torbutton pootle
 
 You should see something like the following:
 
-    Fetching external item into 'pootle'
-    External at revision 15300.
-
-    At revision 15300.
-
-Now if you had changes, you need to convert from .po and move
-the newly updated mozilla files into the current stable locale
-directory. First convert them with the 'mkmoz.sh' script and then
-move the proper mozilla files from 'torbutton/trans_tools/moz/' into
-'torbutton/src/chrome/locale/' directory while properly naming the files
-for their respective locale.
-
-Here's an example of how to move all of the current pootle translations into
-the svn trunk area of Torbutton:
-
-    cd torbutton/trans_tools
-    ./mkmoz.sh
-    for locale in `ls -1 moz/`;
-    do
-       mv -v moz/$locale/*.{dtd,properties} ../src/chrome/locale/$locale/;
-    done
-
-Now check the differences (ensure the output looks reasonable):
+    Checked out revision 21092.
 
-    svn diff
+If you made changes to strings in Torbutton, you need to rebuild the
+templates in torbutton.git/trans_tools/pootle/templates. This is done with
+the following command from within the torbutton.git checkout directory:
 
-And finally check in the changes:
-
-    svn commit
-
-
-If you make changes to strings in Torbutton, you need to rebuild the 
-templates in torbutton/trans_tools/pootle/templates. This is done via:
-
-    moz2po -P -i torbutton/src/chrome/locale/en/ -o torbutton/trans_tools/templates/
+    moz2po -P -i src/chrome/locale/en/ -o trans_tools/pootle/templates/
 
 You now have two options:
 
-Option 1 (The Pootle Web UI Way):
+Option 1 (The [shitty] Pootle Web UI Way):
 
 View then commit the changes to the template with:
 
-    svn diff torbutton/trans_tools/templates/ 
-    svn commit torbutton/trans_tools/templates/
+    cd trans_tools/pootle
+    svn diff templates
+    svn commit templates
 
 Then poke Jake to 'svn up' on the Pootle side. If you do this enough
 times, he may give you a button to click to update templates in Pootle,
@@ -150,7 +123,7 @@ Option 2 (Use your own msgmerge: YMMV, may change .po flags and formatting):
 
 Run msgmerge yourself for each language:
 
-    cd torbutton/trans_tools
+    cd trans_tools
     for i in `ls -1 pootle`
     do
        msgmerge -U ./pootle/$i/torbutton.dtd.po ./pootle/templates/torbutton.dtd.pot
@@ -171,6 +144,36 @@ breaks :)
 After this process is done, you then need to regenerate the mozilla
 .dtd and .properties files as specified above.
 
+
+Regardless of wether or not you had changes in the torbutton strings, if there
+were updated strings in pootle that you checked out from svn you now need to
+convert from .po and move the newly updated mozilla files into the current
+stable locale directory. First convert them with the 'mkmoz.sh' script and
+then move the proper mozilla files from 'torbutton.git/trans_tools/moz/' into
+'torbutton.git/src/chrome/locale/' directory while properly naming the files
+for their respective locale.
+
+Here's an example of how to move all of the current pootle translations into
+the svn trunk area of Torbutton:
+
+    cd trans_tools
+    ./mkmoz.sh
+    for locale in `ls -1 moz/`;
+    do
+      mv -v moz/$locale/*.{dtd,properties} ../src/chrome/locale/$locale/
+    done
+
+Now check the differences to your git branch to ensure the output looks
+reasonable:
+
+    cd ..
+    git diff
+
+And finally check in the changes:
+
+    cd src/chrome/locale
+    git commit .
+
 ---------------------------- Vidalia -------------------------------
 
 Vidalia uses our translation portal to accept translations. Users use the