Differences between revisions 66 and 92 (spanning 26 versions)
⇤ ← Revision 66 as of 2010-08-10 12:00:48 →
Size: 9996
Editor: DanielDumitriu
Comment:
← Revision 92 as of 2014-05-07 07:43:20 → ⇥
Size: 11845
Editor: MartinGeisler
Comment:
Deletions are marked like this. Additions are marked like this.
Line 2: Line 2:
Line 11: Line 10:
Translations are stored as `xx.po` and `xx_yy.po` files in the `i18n/` directory. The `xx` corresponds to the language code of the translation and the `yy` is the optional country code. Find your language code in the [[http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html|ISO 639-1 list]] and, if needed, your country code in [[http://www.gnu.org/software/gettext/manual/html_node/Country-Codes.html|ISO 3166 list]]. Translations are stored as ''`xx.po`'' and ''`xx_yy.po`'' files in the ''`i18n/`'' directory. The `xx` corresponds to the language code of the translation and the `yy` is the optional country code. Find your language code in the [[http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html|ISO 639-1 list]] and, if needed, your country code in [[http://www.gnu.org/software/gettext/manual/html_node/Country-Codes.html|ISO 3166 list]]. Most translations only use a language code.
Line 13: Line 12:
To create a new translation you first create a `i18n/hg.pot` file. This is can be done with the Makefile: To create a new translation you first create a ''`i18n/hg.pot`'' file. This is can be done with the Makefile:
Line 18: Line 17:
You create your translation from the `hg.pot` file. You can use the `msginit` program to start a new translation or you can copy the `hg.pot` file to the correct `xx.po` name. You create your translation from the ''`hg.pot`'' file. You can use the `msginit` program to start a new translation or you can copy the ''`hg.pot`'' file to the correct ''`xx.po`'' name. If you copy it by hand, please set the `Language` header to `xx`.
Line 20: Line 19:
Now edit the `xx.po` file with your favorite PO editor, such as [[http://www.poedit.net/|Poedit]] or Emacs. You can also simply edit the `xx.po` file with a text editor (such as !WordPad), but you must then be careful to keep the formatting. Now edit the ''`xx.po`'' file with your favorite PO editor, such as [[http://www.poedit.net/|Poedit]], Emacs, or [[https://www.google.com/search?q=po+editor|some other PO editor]]. You can also simply edit the ''`xx.po`'' file with a text editor (such as !WordPad), but you must then be careful to keep the formatting.
Line 22: Line 21:
To actually use the translation you need to compile the `xx.po` file into a `xx.mo` If you have the `msgfmt` program installed you can do the compilation like this: To actually use the translation you need to compile the ''`xx.po`'' file into a ''`xx.mo`''. If you have the `msgfmt` program installed you can do the compilation like this:
Line 27: Line 26:
Alternatively, you can let Poedit or another PO editor do the compilation. The resulting file should be called `hg.mo` and must be saved as Alternatively, you can let Poedit or another PO editor do the compilation. The resulting file should be called ''`hg.mo`'' and must be saved as
Line 32: Line 31:
Using `setup.py` does this for you, if you compiled the `xx.po` file manually you have to create the directory structure yourself. If you use ''`setup.py`'', the file is automatically saved here for you. If you compiled the ''`xx.po`'' file manually you have to create the directory structure yourself.
Line 34: Line 33:
Now ensure that your LANGUAGE environment variable is set to 'xx'. In a shell from the Bash-family you do this by: Now ensure that your `LANGUAGE` environment variable is set to `xx`. In a shell from the Bash-family you do this by:
Line 42: Line 41:
When changes are made to the Mercurial source, new strings will appear that must be translated. Updating an old translation to take these strings into account is easy: regenerate the `hg.pot` file as above and use the `msgmerge` program to merge new strings into the translation:
/!\ Translations can have their own working repository, check first the proper repository to be cloned before starting.

When changes are made to the Mercurial source, new strings will appear that must be translated. Updating an old translation to take these strings into account is easy: regenerate the ''`hg.pot`'' file as above and use the `msgmerge` program to merge new strings into the translation:
Line 47: Line 49:
Antother way is to call make with the po-file Another way is to call make with the po-file:
Line 52: Line 54:
This combines the regeneration of `hg.pot`  and `msgmerge`. This combines the regeneration of ''`hg.pot`'' and `msgmerge`.
Line 54: Line 56:
Then translate the new strings, make the `xx.mo` file and enjoy. Then translate the new strings, make the ''`xx.mo`'' file and enjoy. When you commit the updated translation, use
Line 56: Line 58:
If you prefer to have the location information present while working on the translation, then leave out the {{{--no-location}}} flag above. The location info from `hg.pot` will then be merged into the `xx.po` file and you will be able to quickly jump to the source fo a given translation. {{{
i18n-xx: synchronized with NODE
}}}
where `NODE` is either the changeset hash of your working copy parent revision before the commit or (better) the hash of its most recent ancestor that changed a translated message.

If you prefer to have the location information present while working on the translation, then leave out the {{{--no-location}}} flag above. The location info from ''`hg.pot`'' will then be merged into the ''`xx.po`'' file and you will be able to quickly jump to the source for a given translation.
Line 63: Line 70:
You should always use `hg diff` to check that your patch contains only the necessary changes. You should always use '`hg diff`' to check that your patch contains only the necessary changes.
Line 66: Line 73:
When you are happy with your translation, please notify MartinGeisler. The easiest way is to join {{{#mercurial}}} on {{{irc.freenode.net}}} and contact {{{mg}}} with a URL where the update can be pulled from. He will then push the changes to the [[http://bitbucket.org/mg/hg-i18n/|i18n queue]] from where they will eventually be pulled into the main repository. If you are making a new translation, then please notify MartinGeisler. The easiest way is to join {{{#mercurial}}} on {{{irc.freenode.net}}} and contact {{{mg}}} with a URL where the update can be pulled from. He will then push the changes to the [[http://bitbucket.org/mg/hg-i18n/|i18n queue]] from where they will eventually be pulled into the main repository.
Line 68: Line 75:
If your change concerns the stable branch, then please remember to update to that branch. It is then '''imperative''' that you merge the stable branch into the default branch. The rule is that your {{{xx}}} repository must always be a ''superset'' of your {{{xx-stable}}} repository. That will ensure that {{{i18n}}} remains a superset of {{{i18n-stable}}} and so no merges will be necessary later. You should commit your changes to the '''stable''' branch, so update to that branch before starting. This will ensure that your translations will be available on the next tagged release in at most a month, so it'll reach users (and hopefully get feedback) earlier.
Line 70: Line 77:
Please rebase your changesets to the tip of the target repository, and collapse them before submitting them for inclusion (use {{{hg rebase --collapse}}}). That will keep the number of merges to a minimum and simplify the history graph. /!\ '''Do not merge across branches''', since that could inadvertently propagate unwanted code changes.

Your commit messages should have this format:

{{{
i18n-xx: short description
}}}
For a new translation, the first changesets could look like this:

{{{
i18n-xx: new translation
i18n-xx: translated add, log, diff
i18n-xx: translated status
}}}

Please rebase your changesets on top of the stable branch before pushing them to the hg-i18n repository (use '`hg rebase`'). That will keep the number of merges to a minimum and simplify the history graph.
Line 73: Line 95:
 * modify {{{xx.po}}} and commit it (in your {{{xx}}} repository)
 * once in a while (especially before pushing), do a {{{hg pull --rebase}}}
 * run {{{make local}}} to rebuild the .mo files
 * test your translation with `./hg` (make sure first that `$LANGUAGE` equals `xx`)
 * run {{{make test-gendoc}}} to make sure that you don't introduce reStructuredText syntax errors (you will need docutils for that, e.g. package {{{python-docutils}}} in Debian/Ubuntu)
 * when you are happy with your translation, run {{{hg rebase --collapse}}} and push it to your target repository
* modify ''`xx.po`'' and commit it (in your `xx` repository)
 * once in a while (especially before pushing), do a '`hg pull --rebase`'
 * run '`make local`' to rebuild the ''`.mo`'' files
 * test your translation with '`./hg`' (make sure first that `$LANGUAGE` equals `xx`)
 * run '`make test-gendoc.t`' to make sure that you don't introduce reStructuredText syntax errors (you will need docutils for that, e.g. package {{{python-docutils}}} in Debian/Ubuntu)
 * when you are happy with your translation push it to hg-i18n
Line 95: Line 118:
=== Possible repository setup ===
Although you can use any repository to keep track of your translation progress, the following setup may prove handy:

 * create a Bitbucket repository by forking the [[http://bitbucket.org/mg/hg-i18n/|i18n queue]]; you need a [[http://bitbucket.org/|Bitbucket]] account for that
 * clone that repository on your machine
 * work on the clone: edit, commit, pull changes from the [[http://bitbucket.org/mg/hg-i18n/|i18n queue]] with `hg pull --rebase` (that also updates your local repository)
 * push your changes to the fork repository
 * let MartinGeisler know where your fork lies, and he'll push the changes to the [[http://bitbucket.org/mg/hg-i18n/|i18n queue]]

When you will have the rights to do it, you will be able to push your changes directly to [[http://bitbucket.org/mg/hg-i18n/|i18n queue]] (and you may discontinue your fork, if you wish so).
Line 106: Line 140:
It is important to list the {{{tortoisehg-xx.po}}} file first since each translation is taken from that file. Now concatenate the two files using {{{msgcat}}}: It is important to list the ''`tortoisehg-xx.po`'' file first since each translation is taken from that file. Now concatenate the two files using {{{msgcat}}}:
Line 111: Line 145:
The {{{hg.pot}}} file is there to ensure that the strings remain in the order given in that file. The ''`hg.pot`'' file is there to ensure that the strings remain in the order given in that file.
Line 113: Line 147:
Some of the translations may conflict between the two projects. This is marked like this in the {{{xx.po}}} file (this is from the German translation): Some of the translations may conflict between the two projects. This is marked like this in the ''`xx.po`'' file (this is from the German translation):
Line 123: Line 157:
You must go through the {{{xx.po}}} file and resolve these conflicts. In the example above, the translation for Mercurial used "Unbekannte Antword" whereas the translation for TortoiseHg used "nicht erkannte antwort". Delete the lines marked with "{{{#-#-#-#-#}}}" and delete the translation you don't like. Talk to the TortoiseHg translator and try to agree on a common terminology --- that will make future imports easier for both of you. You must go through the ''`xx.po`'' file and resolve these conflicts. In the example above, the translation for Mercurial used "Unbekannte Antword" whereas the translation for TortoiseHg used "nicht erkannte antwort". Delete the lines marked with "{{{#-#-#-#-#}}}" and delete the translation you don't like. Talk to the TortoiseHg translator and try to agree on a common terminology --- that will make future imports easier for both of you.
Line 128: Line 162:
You simply have to enable the extension and then use Mercurial like normal. Use {{{hg i18nstat}}} to dump the accumulated statistics. When you translate one of the missing strings, it will disappear from the statistics the next time it is used (the extension wont notice that it is translated unless the string is used). You simply have to enable the extension and then use Mercurial like normal. Use '`hg i18nstat`' to dump the accumulated statistics. When you translate one of the missing strings, it will disappear from the statistics the next time it is used (the extension wont notice that it is translated unless the string is used).
Line 133: Line 167:
 * Brazilian Portuguese (WagnerBruna) -- Development takes place at http://bitbucket.org/wbruna/hg-i18n-pt_br/  * [[BrazilianPortugueseTranslation|Brazilian Portuguese]] (WagnerBruna)
Line 137: Line 171:
 * German (TobiasBell) -- Development takes place at http://bitbucket.org/FabianKreutz/hg-i18n-de/  * [[GermanTranslation|German]]
Line 139: Line 173:
 * Italian (StefanoTortarolo)  * Italian (StefanoTortarolo) -- Development takes place at http://bitbucket.org/astratto/hg-i18n-it/
Line 141: Line 175:
 * [[TranslatingMercurialIntoRussian|Russian]] (AlexanderSauta) -- Development takes place at https://bitbucket.org/demosito/hg-i18n-ru
 * [[RomanianTranslation|Romanian]] (DanielDumitriu) -- Development takes place at http://bitbucket.org/dumitriu/hg-i18n-ro/
Line 142: Line 178:
 * Traditional Chinese (Chia-Huan Wu) -- patch queue: http://bitbucket.org/willie/hg-cht-translation/  * Traditional Chinese (ChiaHuanWu) -- Development takes place at https://bitbucket.org/hgcht/hg-cht-translation
 
Line 146: Line 183:
 * French hgbook (RomainPelisse) -- patch queue: http://bitbucket.org/rpelisse/hgbook-fr/ , dedicated mailing list : hgfr-subscribe@flibuste.net , archived at http://www.mail-archive.com/hgfr@flibuste.net/ (obviously, the mailing list is in French :) ). We created a dedicated page to help organize our work : (FrenchTranslation).   * [[RomanianTranslation|Romanian]] (DanielDumitriu) -- Development takes place at http://bitbucket.org/dumitriu/hg-i18n-ro/  * French hgbook (RomainPelisse) -- patch queue: http://bitbucket.org/rpelisse/hgbook-fr/ , dedicated mailing list : http://groups.google.com/group/hgfr (obviously, the mailing list is in French :) ). We created a dedicated page to help organize our work : (FrenchTranslation).
Line 154: Line 190:

[[JapaneseTranslatingMercurial|日本語]]

Internationalizing Mercurial

This page will describe how you can help internationalize Mercurial by translating it into your language of choice. Mercurial uses the standard i18n Gettext infrastructure, and we will only give a quick introduction to it here. Please take a look at the Gettext manual if you are unfamiliar with translating software.

Contents

  1. Starting a New Translation
  2. Updating a Translation
  3. Submitting
  4. Formatting
  5. Tips
    1. Possible repository setup
    2. Importing strings from TortoiseHg
    3. Attacking the most used strings first
  6. Existing Translations

1. Starting a New Translation

If you find that Mercurial is not yet translated into your favorite language, then you can start one. First look at the bottom of this page or contact the development MailingList to see if an effort is already underway. There is also the Transifex listing.

Translations are stored as xx.po and xx_yy.po files in the i18n/ directory. The xx corresponds to the language code of the translation and the yy is the optional country code. Find your language code in the ISO 639-1 list and, if needed, your country code in ISO 3166 list. Most translations only use a language code.

To create a new translation you first create a i18n/hg.pot file. This is can be done with the Makefile: 

% make update-pot

You create your translation from the hg.pot file. You can use the msginit program to start a new translation or you can copy the hg.pot file to the correct xx.po name. If you copy it by hand, please set the Language header to xx.

Now edit the xx.po file with your favorite PO editor, such as Poedit, Emacs, or some other PO editor. You can also simply edit the xx.po file with a text editor (such as WordPad), but you must then be careful to keep the formatting.

To actually use the translation you need to compile the xx.po file into a xx.mo. If you have the msgfmt program installed you can do the compilation like this: 

% python setup.py build_mo

Alternatively, you can let Poedit or another PO editor do the compilation. The resulting file should be called hg.mo and must be saved as 

locale/xx/LC_MESSAGES/hg.mo

If you use setup.py, the file is automatically saved here for you. If you compiled the xx.po file manually you have to create the directory structure yourself.

Now ensure that your LANGUAGE environment variable is set to xx. In a shell from the Bash-family you do this by: 

% export LANGUAGE=xx

Then run hg to see if your translations are picked up.

2. Updating a Translation

/!\ Translations can have their own working repository, check first the proper repository to be cloned before starting.

When changes are made to the Mercurial source, new strings will appear that must be translated. Updating an old translation to take these strings into account is easy: regenerate the hg.pot file as above and use the msgmerge program to merge new strings into the translation: 

msgmerge --no-location --update i18n/xx.po i18n/hg.pot

Another way is to call make with the po-file: 

make i18n/xx.po

This combines the regeneration of hg.pot and msgmerge.

Then translate the new strings, make the xx.mo file and enjoy. When you commit the updated translation, use 

i18n-xx: synchronized with NODE

where NODE is either the changeset hash of your working copy parent revision before the commit or (better) the hash of its most recent ancestor that changed a translated message.

If you prefer to have the location information present while working on the translation, then leave out the --no-location flag above. The location info from hg.pot will then be merged into the xx.po file and you will be able to quickly jump to the source for a given translation.

To avoid creating excessive diffs you must strip out this information before committing your translation: 

msgcat --no-location -o xx.po xx.po

You should always use 'hg diff' to check that your patch contains only the necessary changes.

3. Submitting

If you are making a new translation, then please notify MartinGeisler. The easiest way is to join #mercurial on irc.freenode.net and contact mg with a URL where the update can be pulled from. He will then push the changes to the i18n queue from where they will eventually be pulled into the main repository.

You should commit your changes to the stable branch, so update to that branch before starting. This will ensure that your translations will be available on the next tagged release in at most a month, so it'll reach users (and hopefully get feedback) earlier.

/!\ Do not merge across branches, since that could inadvertently propagate unwanted code changes.

Your commit messages should have this format: 

i18n-xx: short description

For a new translation, the first changesets could look like this: 

i18n-xx: new translation
i18n-xx: translated add, log, diff
i18n-xx: translated status

Please rebase your changesets on top of the stable branch before pushing them to the hg-i18n repository (use 'hg rebase'). That will keep the number of merges to a minimum and simplify the history graph.

In general, your working cycle can look like this:

  • modify xx.po and commit it (in your xx repository)

  • once in a while (especially before pushing), do a 'hg pull --rebase'

  • run 'make local' to rebuild the .mo files

  • test your translation with './hg' (make sure first that $LANGUAGE equals xx)

  • run 'make test-gendoc.t' to make sure that you don't introduce reStructuredText syntax errors (you will need docutils for that, e.g. package python-docutils in Debian/Ubuntu)

  • when you are happy with your translation push it to hg-i18n

4. Formatting

The translations of command help texts should be word-wrapped at 78 characters. Please follow this pattern: 

short description, starting with lowercase

    Larger description of the command. Each paragraph should be word-wrapped
    at 70 characters and indented with 4 spaces.

    Paragraphs are separated by a single empty line. Use a single space
    between sentences.

5. Tips

List your tips and tricks here.

5.1. Possible repository setup

Although you can use any repository to keep track of your translation progress, the following setup may prove handy:

  • create a Bitbucket repository by forking the i18n queue; you need a Bitbucket account for that

  • clone that repository on your machine

  • work on the clone: edit, commit, pull changes from the i18n queue with hg pull --rebase (that also updates your local repository)

  • push your changes to the fork repository

  • let MartinGeisler know where your fork lies, and he'll push the changes to the i18n queue

When you will have the rights to do it, you will be able to push your changes directly to i18n queue (and you may discontinue your fork, if you wish so).

5.2. Importing strings from TortoiseHg

The TortoiseHg project has made a number of translations and about 50 of the strings from their project overlap with the strings in Mercurial. To reuse them, start by downloading the latest version for your language. The URL are of this form: 

http://bitbucket.org/tortoisehg/stable/raw/tip/i18n/tortoisehg/xx.po

Use wget or your browser to download the file and save it as tortoise-xx.po to the i18n folder. Then extract the strings common to both translations: 

msgcomm tortoisehg-xx.po hg.pot -o common-xx.po

It is important to list the tortoisehg-xx.po file first since each translation is taken from that file. Now concatenate the two files using msgcat: 

msgcat --no-location hg.pot common-xx.po xx.po -o xx.po

The hg.pot file is there to ensure that the strings remain in the order given in that file.

Some of the translations may conflict between the two projects. This is marked like this in the xx.po file (this is from the German translation): 

msgid "unrecognized response\n"
msgstr ""
"#-#-#-#-#  de.po (Mercurial)  #-#-#-#-#\n"
"Unbekannte Antwort\n"
"#-#-#-#-#  tortoisehg-de.po (tortoisehg)  #-#-#-#-#\n"
"nicht erkannte antwort\n"

You must go through the xx.po file and resolve these conflicts. In the example above, the translation for Mercurial used "Unbekannte Antword" whereas the translation for TortoiseHg used "nicht erkannte antwort". Delete the lines marked with "#-#-#-#-#" and delete the translation you don't like. Talk to the TortoiseHg translator and try to agree on a common terminology --- that will make future imports easier for both of you.

5.3. Attacking the most used strings first

In order to translate the most important strings first, you may want to use the i18nstat extension. This extension will log each string translated and count the number of times an untranslated string is used.

You simply have to enable the extension and then use Mercurial like normal. Use 'hg i18nstat' to dump the accumulated statistics. When you translate one of the missing strings, it will disappear from the statistics the next time it is used (the extension wont notice that it is translated unless the string is used).

6. Existing Translations

Translations distributed with Mercurial (see also the Transifex listing):

Translations not yet distributed with Mercurial:

Please contact the person listed above if you would like to help with a particular language. If you want to start a new translation, then add the language and your name to the list and go ahead.

CategoryTranslations

日本語

TranslatingMercurial (last edited 2016-04-06 22:23:52 by timeless)