[Xfce-i18n] master or xfce-4.6

[Mike Massonnet]

Hi Dmitriy,

2009/8/22 Dmitriy Kudryashov <overmailed at gmail.com>:
> Hi, everyone.
>
> I commit translations to 'master' branch but some translators commit
> to xfce-4.6. Will the xfce-4.6 be ever merged with master or the
> translations from it will remain locked there? So what is the proper
> branch to commit?

No, there is no automatic merges, you have to upload on your own to
the different branches. You can use the tool msgmerge[1] (provided
with gettext) to reuse updated/added translations from master to
xfce4.6.

[1] http://wiki.xfce.org/translations/msgmerge

Regards
Mike