threads / discuss / 29595

Bulgarian translation of git

Subject: Bulgarian translation of git

## tl;dr

12 messages between Feb 10, 2012 and Feb 15, 2012.

replies: 11people: 4as markdown or json

Jiang Xin· Feb 13, 2012, 02:46 UTC · re: =?UTF-8?Q? Alexander_Shopov_(=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A=D1=80_=D0=A8=D0=BE=D0=BF=D0=BE=D0=B2) ?= · lore

Re: Bulgarian translation of git

Junio has a suggestion on how to contrib l10n for git, and you can see the discussion here: http://article.gmane.org/gmane.comp.version-control.git/189584.

Seems that the suggested git-po repo has not been setup yet, so let me have a try.

1. Repositiry git-po is hosted on GitHub: https://github.com/gotgit/git-po/
2. I made a commit on the maint branch with a initial version of 'po/git.pot'
    https://github.com/gotgit/git-po/commit/4247a7a9d39e2a74ce1d58e5eb1f5e5d87977989
3. As l10n coordinator for Chinese, I translate against the pot file, and
    the translated po file 'po/zh_CN.po' is commited in my own branch:
maint-zh-cn.
    You can find the commit in:
https://github.com/gotgit/git-po/commits/maint-zh-cn
4. I will merge the commit in branch maint-zh-cn back or other l10n
coordinators' contributes
    to maint branch.

I have a question, which version of po should be maintained? master branch or maint branch.

2012/2/10 "Alexander Shopov (Александър Шопов)" <lists@kambanaria.org>:
Show 13 quoted lines
> Hello,
>
> I am Alexander Shopov and would like to volunteer for the Bulgarian
> translation of git po file if no one else is doing this.
> How should I contribute it back?
> Via this email list, via fork-push from github, or a patch?
>
> Kind regards:
> al_shopov
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
-- 
蒋鑫

北京群英汇信息技术有限公司
邮件: worldhello.net@gmail.com
网址: http://www.ossxp.com/
博客: http://www.worldhello.net/
微博: http://weibo.com/gotgit/
电话: 010-51262007, 18601196889
Junio C Hamano· Feb 13, 2012, 03:56 UTC · re: Jiang Xin · lore

Re: Bulgarian translation of git

Jiang Xin <worldhello.net@gmail.com> writes:
Show 10 quoted lines
> Junio has a suggestion on how to contrib l10n for git, and you can see the
> discussion here: http://article.gmane.org/gmane.comp.version-control.git/189584.
>
> Seems that the suggested git-po repo has not been setup yet, so let me
> have a try.
>
> 1. Repositiry git-po is hosted on GitHub: https://github.com/gotgit/git-po/
>
> 2. I made a commit on the maint branch with a initial version of 'po/git.pot'
>     https://github.com/gotgit/git-po/commit/4247a7a9d39e2a74ce1d58e5eb1f5e5d87977989

Somebody needs to eyeball this commit before anything else happens on top of it, so that if there is a glaring mistake it can be caught before it spreads to affect work by translators for various languages.

Show 12 quoted lines
> 3. As l10n coordinator for Chinese, I translate against the pot file, and
>     the translated po file 'po/zh_CN.po' is commited in my own branch:
> maint-zh-cn.
>     You can find the commit in:
> https://github.com/gotgit/git-po/commits/maint-zh-cn
>
> 4. I will merge the commit in branch maint-zh-cn back or other l10n
> coordinators' contributes
>     to maint branch.
>
> I have a question, which version of po should be maintained? master
> branch or maint branch.

I would say for this round the git-po repository and its pot file should pick up whatever new translatable strings are added to 'master'.

After this is merged in 1.7.10, we may want to maintain separate tracks, but at this moment there is no point maintaining something mergeable to 1.7.9.x maintenance track.

Jiang Xin· Feb 13, 2012, 07:12 UTC · re: Junio C Hamano · lore

Re: Bulgarian translation of git

2012/2/13 Junio C Hamano <gitster@pobox.com>:
Show 12 quoted lines
> Jiang Xin <worldhello.net@gmail.com> writes:
>
>> Junio has a suggestion on how to contrib l10n for git, and you can see the
>> discussion here: http://article.gmane.org/gmane.comp.version-control.git/189584.
>>
>> Seems that the suggested git-po repo has not been setup yet, so let me
>> have a try.
>>
>> 1. Repositiry git-po is hosted on GitHub: https://github.com/gotgit/git-po/
>>
>> 2. I made a commit on the maint branch with a initial version of 'po/git.pot'
>>     https://github.com/gotgit/git-po/commit/4247a7a9d39e2a74ce1d58e5eb1f5e5d87977989

This commit is based on current maint branch. Since the translated po files will first in 1.7.10, so the initial pot file should be generated from master branch. The pot file from the master branch has 10 new messages than from the maint branch.

For clarity, I removed the maint and other branches except the master branch, and made a new commit.

> Somebody needs to eyeball this commit before anything else happens on top
> of it, so that if there is a glaring mistake it can be caught before it
> spreads to affect work by translators for various languages.

So please check this commit with the updated pot file: https://github.com/gotgit/git-po/commit/816049b7ec0e5f452c77a4c4e71e2cb40a0ccb45 Please note In this commit I removed one line from the 'po/.gitignore' file.

As a translater for Chinese, I also made a commit with the translated po file 'po/zh_CN.po' in branch master-zh-cn (merged back to master branch).

Show 11 quoted lines
>>
>> I have a question, which version of po should be maintained? master
>> branch or maint branch.
>
> I would say for this round the git-po repository and its pot file should
> pick up whatever new translatable strings are added to 'master'.
>
> After this is merged in 1.7.10, we may want to maintain separate tracks,
> but at this moment there is no point maintaining something mergeable to
> 1.7.9.x maintenance track.
>
-- 
Jiang Xin
Junio C Hamano· Feb 13, 2012, 08:07 UTC · re: Jiang Xin · lore

Re: Bulgarian translation of git

Jiang Xin <worldhello.net@gmail.com> writes:
Show 7 quoted lines
>> Somebody needs to eyeball this commit before anything else happens on top
>> of it, so that if there is a glaring mistake it can be caught before it
>> spreads to affect work by translators for various languages.
>
> So please check this commit with the updated pot file:
> https://github.com/gotgit/git-po/commit/816049b7ec0e5f452c77a4c4e71e2cb40a0ccb45
> Please note In this commit I removed one line from the 'po/.gitignore' file.
Thanks.

As far as I can tell, this adds git.pot while removes the entry to remove it from po/.gitignore (because now it is a tracked file), but there is no description on how this file was generated in the log message.

Please give a short description to the effect that it was mechanically created by running xgettext on the sources as of b6b3b6a (Update draft release notes to 1.7.10, 2012-02-10), or something like that.

Other than that, I do not immediately see anything objectionable in this commit; I would still appreciate an extra set of eyeballs or two from people who have worked on gitk and/or git-gui i18n/l10n infrastructure in the past, just in case I forgot to check some obvious/trivial gotchas.

I am also Cc'ing people who participated in git-gui and gitk l10n with more than a couple of commits to their po/ part, found by:

    $ cd git-gui/po &&
      git rev-list --parents HEAD . |
      while read commit parent
      do
        git log --pretty=short $parent..$commit^2 -- :/po
      done | git shortlog -n -e
(same for gitk-git)
> As a translater for Chinese, I also made a commit with the translated po file
> 'po/zh_CN.po' in branch master-zh-cn (merged back to master branch).
Thanks.
Jiang Xin· Feb 13, 2012, 08:52 UTC · re: Junio C Hamano · lore

Re: Bulgarian translation of git

2012/2/13 Junio C Hamano <gitster@pobox.com>:
Show 8 quoted lines
> Jiang Xin <worldhello.net@gmail.com> writes:
>
>>> Somebody needs to eyeball this commit before anything else happens on top
>>> of it, so that if there is a glaring mistake it can be caught before it
>>> spreads to affect work by translators for various languages.
>>
>> So please check this commit with the updated pot file:
>> ...

Please check this commit with the updated pot file: https://github.com/gotgit/git-po/commit/master%5E ( The commit with the amended commit message can be access using the above URL, no longer how this commit is ammended latter.)

Show 7 quoted lines
> As far as I can tell, this adds git.pot while removes the entry to remove
> it from po/.gitignore (because now it is a tracked file), but there is no
> description on how this file was generated in the log message.
>
> Please give a short description to the effect that it was mechanically
> created by running xgettext on the sources as of b6b3b6a (Update draft
> release notes to 1.7.10, 2012-02-10), or something like that.
I add a prefix 'l10n:' to the new amended commit log, is it OK?
$ git show --stat master^
commit b55102542911326e8191500ff6f53a2e1d52e504
Author: Jiang Xin <worldhello.net@gmail.com>
Date:   Mon Feb 13 14:37:59 2012 +0800
    l10n: initial git.pot for 1.7.10 upcoming release
    The file 'po/git.pot' is generated using the command 'make pot'
    against git v1.7.9-209-gb6b3b (Update draft release notes to 1.7.10).
    Also removed the entry po/git.pot from po/.gitignore, since it is a
    tracked file.
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 po/.gitignore |    1 -
 po/git.pot    | 3431 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3431 insertions(+), 1 deletions(-)
-- 
Jiang Xin
Jonathan Nieder· Feb 13, 2012, 14:00 UTC · re: Junio C Hamano · lore

Re: Bulgarian translation of git

Junio C Hamano wrote:
> Jiang Xin <worldhello.net@gmail.com> writes:
Show 9 quoted lines
>> I have a question, which version of po should be maintained? master
>> branch or maint branch.
>
> I would say for this round the git-po repository and its pot file should
> pick up whatever new translatable strings are added to 'master'.
>
> After this is merged in 1.7.10, we may want to maintain separate tracks,
> but at this moment there is no point maintaining something mergeable to
> 1.7.9.x maintenance track.

I wonder if there's a simple to ask the gettext tools to make a po template including strings from both 'maint' and 'master'. (Hackish way demonstrated below.)

Hopefully that would make it easier for translators to keep both tracks well maintained at the same time. If a problem in the translation of a string shared by 'master' and 'maint' is only noticed while working on 'master', there would be no need to go through the "switch branches; make the change; switch back; merge" dance.

What do you think? Jonathan

diff --git i/Makefile w/Makefile
index 1e91b19c..5dbc6205 100644
--- i/Makefile
+++ w/Makefile
@@ -2103,7 +2103,8 @@ LOCALIZED_C := $(C_OBJ:o=c)
 LOCALIZED_SH := $(SCRIPT_SH)
 
 po/git.pot: $(LOCALIZED_C)
-	$(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ $(XGETTEXT_FLAGS_C) $(LOCALIZED_C)
+	cp $@ $@+
+	$(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_C) $(LOCALIZED_C)
 	$(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_SH) \
 		$(LOCALIZED_SH)
 	mv $@+ $@
Jiang Xin· Feb 13, 2012, 15:43 UTC · re: Jonathan Nieder · lore

Re: Bulgarian translation of git

2012/2/13 Jonathan Nieder <jrnieder@gmail.com>:
Show 11 quoted lines
> I wonder if there's a simple to ask the gettext tools to make a po
> template including strings from both 'maint' and 'master'.  (Hackish way
> demonstrated below.)
>
> Hopefully that would make it easier for translators to keep both
> tracks well maintained at the same time.  If a problem in the
> translation of a string shared by 'master' and 'maint' is only noticed
> while working on 'master', there would be no need to go through the
> "switch branches; make the change; switch back; merge" dance.
>
> What do you think?

Translators on a new language may not like this. Translating the obsolete messages in pot file is boring and waste of time.

>  po/git.pot: $(LOCALIZED_C)
> -       $(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ $(XGETTEXT_FLAGS_C) $(LOCALIZED_C)
> +       cp $@ $@+
Failed if po/git.pot does not exist. touch one first?
> +       $(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_C) $(LOCALIZED_C)
>        $(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_SH) \
>                $(LOCALIZED_SH)
>        mv $@+ $@
-- 
Jiang Xin
Jonathan Nieder· Feb 13, 2012, 15:56 UTC · re: Jiang Xin · lore

Re: Bulgarian translation of git

Jiang Xin wrote:
> 2012/2/13 Jonathan Nieder <jrnieder@gmail.com>:
Show 6 quoted lines
>> I wonder if there's a simple to ask the gettext tools to make a po
>> template including strings from both 'maint' and 'master'.  (Hackish way
>> demonstrated below.)
>>
>> Hopefully that would make it easier for translators to keep both
>> tracks well maintained at the same time.
[...]
>> What do you think?
>
> Translators on a new language may not like this. Translating the obsolete
> messages in pot file is boring and waste of time.

Right, doing this for real require somehow removing stale messages, too, so the pot file would only contain messages from actively maintained releases (the tip of 'master' and 'maint').

Will experiment privately a little more.
Junio C Hamano· Feb 13, 2012, 18:52 UTC · re: Jonathan Nieder · lore

Re: Bulgarian translation of git

Jonathan Nieder <jrnieder@gmail.com> writes:
> Hopefully that would make it easier for translators to keep both
> tracks well maintained at the same time.

I somehow think it is not such a big deal if l10n messages are not maintained for maintenance tracks at all, actually, given that our cycles for the master track have been 8-10 weeks long, which is not a long time to wait, compared to 5 years people survived without any ;-).

Jiang Xin· Feb 15, 2012, 03:28 UTC · re: Junio C Hamano · lore

Re: Bulgarian translation of git

I squash the following in the pot initial commit, and update the commit log. commit: https://github.com/gotgit/git-po/commit/master%5E

diff --git a/Makefile b/Makefile
index 87fb3..88268 100644
--- a/Makefile
+++ b/Makefile
@@ -2576,7 +2576,6 @@ dist-doc:

 distclean: clean
        $(RM) configure
-       $(RM) po/git.pot

 clean:
        $(RM) *.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o
xdiff/*.o vcs-svn/*.o \


2012/2/14 Junio C Hamano <gitster@pobox.com>:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>
>> Hopefully that would make it easier for translators to keep both
>> tracks well maintained at the same time.
>
> I somehow think it is not such a big deal if l10n messages are not
> maintained for maintenance tracks at all, actually, given that our cycles
> for the master track have been 8-10 weeks long, which is not a long time
> to wait, compared to 5 years people survived without any ;-).
>
-- 
蒋鑫

北京群英汇信息技术有限公司
邮件: worldhello.net@gmail.com
网址: http://www.ossxp.com/
博客: http://www.worldhello.net/
微博: http://weibo.com/gotgit/
电话: 010-51262007, 18601196889
Junio C Hamano· Feb 15, 2012, 18:09 UTC · re: Jiang Xin · lore

Re: Bulgarian translation of git

Jiang Xin <worldhello.net@gmail.com> writes:
Show 12 quoted lines
> I squash the following in the pot initial commit, and update the commit log.
> commit:  https://github.com/gotgit/git-po/commit/master%5E
>
> diff --git a/Makefile b/Makefile
> index 87fb3..88268 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2576,7 +2576,6 @@ dist-doc:
>
>  distclean: clean
>         $(RM) configure
> -       $(RM) po/git.pot

Yeah, that change is very sensible. I am surprised that nobody noticed it so far while this topic was discussed.

← back to recent threads