2008-07-02 23:10:13 +02:00
|
|
|
## Instructions for helping translate text for Vidalia, TorButton
|
|
|
|
## and TorCheck
|
2008-04-29 05:41:28 +02:00
|
|
|
## ( More translation information for Tor related apps will accumulate here )
|
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
Our translations are handled in one of two places. The Tor Translation Portal
|
|
|
|
handles all of the translations for Vidalia, Torbutton and TorCheck. The Tor
|
|
|
|
website itself is currently handled by hand translations using subversion.
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-07-02 23:49:58 +02:00
|
|
|
-------------------------------------------------------------------------
|
|
|
|
|
|
|
|
For the Tor website, you'll need a Tor SVN account.
|
2008-06-21 01:15:48 +02:00
|
|
|
If you do not have one and you need one, please run this command with your
|
|
|
|
desired username in place of 'USERNAME':
|
|
|
|
htdigest -c passwd.tmp "Tor subversion repository" USERNAME
|
2008-07-02 23:49:58 +02:00
|
|
|
and send us the contents of passwd.tmp.
|
2008-06-21 01:15:48 +02:00
|
|
|
|
2008-07-02 23:49:58 +02:00
|
|
|
-------------------------------------------------------------------------
|
2008-06-21 01:15:48 +02:00
|
|
|
|
2008-07-02 23:49:58 +02:00
|
|
|
For the Portal-based projects, all three check in their respective .po
|
|
|
|
files into the following subversion urls:
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
https://tor-svn.freehaven.net/svn/translation/trunk/projects/torbutton
|
|
|
|
https://tor-svn.freehaven.net/svn/translation/trunk/projects/torcheck
|
2008-07-02 12:33:11 +02:00
|
|
|
https://svn.vidalia-project.net/svn/vidalia/trunk/src/vidalia/i18n/
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
The current pootle configuration is checked into subversion as well:
|
2008-06-03 13:01:16 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
https://tor-svn.freehaven.net/svn/translation/trunk/pootle
|
2008-07-02 23:10:13 +02:00
|
|
|
|
2009-03-16 08:56:01 +01:00
|
|
|
---------------------------- TorCheck -------------------------------
|
|
|
|
|
2008-07-02 23:10:13 +02:00
|
|
|
TorCheck uses our translation portal to accept translations. Users use
|
|
|
|
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 TorCheck:
|
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
cd check/trunk/i18n/
|
|
|
|
check/trunk/i18n$ svn up
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
You should see something like the following:
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
Fetching external item into 'pootle'
|
|
|
|
External at revision 15300.
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
At revision 15300.
|
2008-07-02 23:10:13 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
Now if you had changes, you'd simply want to move the newly updated .po files
|
|
|
|
into the current stable directory. Moving the .po files from
|
|
|
|
'check/trunk/i18n/pootle/' into 'check/trunk/i18n' properly naming the files
|
|
|
|
for their respective locale.
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
Here's an example of how to move all of the current pootle translations into
|
|
|
|
the svn trunk area of TorCheck:
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
cd check/trunk/i18n/
|
|
|
|
for locale in `ls -1 pootle/|grep -v template`;
|
2008-07-02 23:10:13 +02:00
|
|
|
do
|
2008-06-17 07:47:49 +02:00
|
|
|
mv -v pootle/$locale/TorCheck_$locale.po TorCheck_$locale.po;
|
|
|
|
done
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
Now check the differences (ensure the output looks reasonable):
|
2008-07-02 23:10:13 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
svn diff
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
Ensure that msgfmt has no errors:
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
msgfmt -C *.po
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
And finally check in the changes:
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
svn commit
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2009-03-16 08:56:01 +01:00
|
|
|
---------------------------- Torbutton -------------------------------
|
|
|
|
|
2008-07-02 23:10:13 +02:00
|
|
|
Torbutton uses our translation portal to accept translations. Users use
|
|
|
|
the portal to check in their changes.
|
2009-03-16 08:56:01 +01:00
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
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
|
2009-12-03 09:34:01 +01:00
|
|
|
copy of them in your torbutton git checkout:
|
2008-07-02 23:10:13 +02:00
|
|
|
|
2009-12-03 09:34:01 +01:00
|
|
|
cd torbutton.git/trans_tools
|
|
|
|
torbutton.git/trans_tools$ svn co https://tor-svn.freehaven.net/svn/translation/trunk/projects/torbutton pootle
|
2008-06-17 07:47:49 +02:00
|
|
|
|
|
|
|
You should see something like the following:
|
|
|
|
|
2009-12-03 09:34:01 +01:00
|
|
|
Checked out revision 21092.
|
2008-07-02 23:10:13 +02:00
|
|
|
|
2009-12-03 09:34:01 +01:00
|
|
|
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:
|
2008-04-29 05:41:28 +02:00
|
|
|
|
2009-12-03 09:34:01 +01:00
|
|
|
moz2po -P -i src/chrome/locale/en/ -o trans_tools/pootle/templates/
|
2009-03-16 08:56:01 +01:00
|
|
|
|
|
|
|
You now have two options:
|
|
|
|
|
2009-12-03 09:34:01 +01:00
|
|
|
Option 1 (The [shitty] Pootle Web UI Way):
|
2009-03-16 08:56:01 +01:00
|
|
|
|
|
|
|
View then commit the changes to the template with:
|
|
|
|
|
2009-12-03 09:34:01 +01:00
|
|
|
cd trans_tools/pootle
|
|
|
|
svn diff templates
|
|
|
|
svn commit templates
|
2009-03-16 08:56:01 +01:00
|
|
|
|
|
|
|
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,
|
|
|
|
or maybe even an account on the Pootle server. Persistence is a virtue.
|
|
|
|
|
|
|
|
You then need to go to the Pootle website and click the checkbox next to
|
|
|
|
every language on:
|
|
|
|
https://translation.torproject.org/projects/torbutton/admin.html
|
|
|
|
and then click "Update Languages" at the bottom.
|
|
|
|
|
|
|
|
You then need to go to each language and go to "Editing Options" and click
|
|
|
|
"Commit" for each one.
|
|
|
|
|
|
|
|
You then need to 'svn up' locally, and follow the procedure above for
|
|
|
|
rebuilding your .dtd and .properties files.
|
|
|
|
|
|
|
|
Yes, this sucks. :/
|
|
|
|
|
|
|
|
Option 2 (Use your own msgmerge: YMMV, may change .po flags and formatting):
|
|
|
|
|
|
|
|
Run msgmerge yourself for each language:
|
|
|
|
|
2009-12-03 09:34:01 +01:00
|
|
|
cd trans_tools
|
2009-03-16 08:56:01 +01:00
|
|
|
for i in `ls -1 pootle`
|
|
|
|
do
|
|
|
|
msgmerge -U ./pootle/$i/torbutton.dtd.po ./pootle/templates/torbutton.dtd.pot
|
|
|
|
msgmerge -U ./pootle/$i/torbutton.properties.po ./pootle/templates/torbutton.properties.pot
|
|
|
|
done
|
|
|
|
svn diff pootle
|
|
|
|
svn commit pootle
|
|
|
|
|
|
|
|
Then poke Jake to 'svn up' on the Pootle side. If you do this enough times,
|
|
|
|
he may give you a button on Pootle, or maybe even an account on the Pootle
|
|
|
|
server. Persistence is a virtue.
|
|
|
|
|
|
|
|
You may notice that some .po file flags and string formatting have changed
|
|
|
|
with this method, depending on your gettext version. It is unclear if this
|
|
|
|
is a problem. Please update this doc if you hit a landmine and everything
|
|
|
|
breaks :)
|
|
|
|
|
|
|
|
After this process is done, you then need to regenerate the mozilla
|
|
|
|
.dtd and .properties files as specified above.
|
|
|
|
|
2009-12-03 09:34:01 +01:00
|
|
|
|
|
|
|
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 .
|
|
|
|
|
2009-03-16 08:56:01 +01:00
|
|
|
---------------------------- Vidalia -------------------------------
|
|
|
|
|
2008-06-17 07:47:49 +02:00
|
|
|
Vidalia uses our translation portal to accept translations. Users use the
|
2008-06-19 20:44:15 +02:00
|
|
|
portal to check in their changes. No conversion or moving is required other
|
|
|
|
than normal pootle usage.
|
2008-05-28 06:31:16 +02:00
|
|
|
|