Please pull git-l10n maint branch with de, zh_CN l10n updates

Hi Junio,

The following changes since commit 42325fb2e078377a3914bf1d80160f22cb1f78d6:

  Start preparing for 1.7.10.2 (2012-05-07 13:24:32 -0700)

are available in the git repository at:

  https://github.com/git-l10n/git-po/ maint

for you to fetch changes up to 2f64542f9c2f6082dd5aa7d8d13886cdc965d175:

  l10n: zh_CN.po: translate 1 new message (2012-05-12 14:56:06 +0800)

----------------------------------------------------------------
Jiang Xin (2):
      l10n: Update git.pot (1 new messages)
      l10n: zh_CN.po: translate 1 new message

Ralf Thielow (6):
      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

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    |  666 ++++++++++++++++++++++++++++++-----------------------------
 po/git.pot  |  192 ++++++++---------
 po/zh_CN.po |  192 ++++++++---------
 4 files changed, 538 insertions(+), 515 deletions(-)

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(-)

Pulled; thanks.

2012/5/15 Junio C Hamano <gitster@pobox.com>:

Found new messages need to be translated in both maint and master branch. So I update git.pot for both maint and master branch.

 * Update in maint branch:

    l10n: Update git.pot (3 new, 2 removed messages)

    Generate po/git.pot from v1.7.10.2-35-g0b9f4:

     - 3 new l10n messages at lines: 2743, 2751, 2759.

     - 2 removed l10n messages from lines: 1879, 2757.

 * Update in master branch:

    l10n: Update git.pot (8 new, 4 removed messages)

    Generate po/git.pot from v1.7.10.2-520-g6a4a48:

     - 8 new l10n messages at lines:

       977, 982, 1404, 1409, 1414, 1419, 1424, 1429.

     - 4 removed l10n messages from lines:

       977, 1399, 1404, 1409.

I will send another email to l10n team leader one by one latter.