Hi, Junio Please also pull the master branch which contains merge from 'maint' branch with fixes of non-trivial conflicts. The following changes since commit a3935e6791c619a9f2f472e9e553d45d88c4e263: The ninth batch of topics graduated to 'master' (2012-05-07 13:39:38 -0700) are available in the git repository at: https://github.com/git-l10n/git-po/ master for you to fetch changes up to b652ada42a76548569a0dc9c9cf356343f9e1c3a: Merge branch 'maint' (2012-05-12 15:01:22 +0800) ---------------------------------------------------------------- Jiang Xin (5): l10n: Update git.pot (1 new messages) Merge branch 'maint' l10n: Update git.pot (275 new, 15 removed messages) l10n: zh_CN.po: translate 1 new message Merge branch 'maint' Ralf Thielow (7): l10n: add new members to German translation team l10n: de.po: translate "track" as "beobachten" l10n: de.po: translate "remote" as "extern" l10n: de.po: collection of improvements l10n: de.po: unify translation of "ahead" and "behind" l10n: de.po: translate one new message Merge branch 'maint' into master Thomas Rast (4): l10n: de.po: translate "bare" as "bloß" l10n: de.po: hopefully uncontroversial fixes l10n: de.po: translate "bad" as "ungültig" ("invalid") l10n: de.po: collection of suggestions po/TEAMS | 3 + po/de.po | 487 ++++---- po/git.pot | 3715 ++++++++++++++++++++++++++++++++++++++++-------------------- 3 files changed, 2760 insertions(+), 1445 deletions(-) -- Jiang Xin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html