{"thread":{"id":"30515","subject":"Please pull git-l10n maint branch with de, zh_CN l10n updates","startedAt":"2012-05-12T07:34:04Z","lastAt":"2012-05-14T23:29:23Z","messageCount":4,"participants":["Jiang Xin","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"191435","messageId":"CANYiYbEyZsiE7MWbJVQGYM_1vyi+y8MVCeGGf7G-_y9vMRdxYQ@mail.gmail.com","threadId":"30515","inReplyTo":null,"subject":"Please pull git-l10n maint branch with de, zh_CN l10n updates","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2012-05-12T07:34:04Z","receivedAt":"2012-05-12T07:34:04Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Hi Junio,\n\nThe following changes since commit 42325fb2e078377a3914bf1d80160f22cb1f78d6:\n\n  Start preparing for 1.7.10.2 (2012-05-07 13:24:32 -0700)\n\nare available in the git repository at:\n\n  https://github.com/git-l10n/git-po/ maint\n\nfor you to fetch changes up to 2f64542f9c2f6082dd5aa7d8d13886cdc965d175:\n\n  l10n: zh_CN.po: translate 1 new message (2012-05-12 14:56:06 +0800)\n\n----------------------------------------------------------------\nJiang Xin (2):\n      l10n: Update git.pot (1 new messages)\n      l10n: zh_CN.po: translate 1 new message\n\nRalf Thielow (6):\n      l10n: add new members to German translation team\n      l10n: de.po: translate \"track\" as \"beobachten\"\n      l10n: de.po: translate \"remote\" as \"extern\"\n      l10n: de.po: collection of improvements\n      l10n: de.po: unify translation of \"ahead\" and \"behind\"\n      l10n: de.po: translate one new message\n\nThomas Rast (4):\n      l10n: de.po: translate \"bare\" as \"bloß\"\n      l10n: de.po: hopefully uncontroversial fixes\n      l10n: de.po: translate \"bad\" as \"ungültig\" (\"invalid\")\n      l10n: de.po: collection of suggestions\n\n po/TEAMS    |    3 +\n po/de.po    |  666 ++++++++++++++++++++++++++++++-----------------------------\n po/git.pot  |  192 ++++++++---------\n po/zh_CN.po |  192 ++++++++---------\n 4 files changed, 538 insertions(+), 515 deletions(-)\n\n-- \nJiang Xin\n"},{"id":"191436","messageId":"CANYiYbETtF6SYMVJM0H+XNsB3E+KTLd8dgJM6vWHoS1E+V4YRw@mail.gmail.com","threadId":"30515","inReplyTo":"CANYiYbEyZsiE7MWbJVQGYM_1vyi+y8MVCeGGf7G-_y9vMRdxYQ@mail.gmail.com","subject":"Re: Please pull git-l10n maint branch with de, zh_CN l10n updates","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2012-05-12T07:45:05Z","receivedAt":"2012-05-12T07:45:05Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Hi, Junio\n\nPlease also pull the master branch which contains merge from\n'maint' branch with fixes of non-trivial conflicts.\n\nThe following changes since commit a3935e6791c619a9f2f472e9e553d45d88c4e263:\n\n  The ninth batch of topics graduated to 'master' (2012-05-07 13:39:38 -0700)\n\nare available in the git repository at:\n\n  https://github.com/git-l10n/git-po/ master\n\nfor you to fetch changes up to b652ada42a76548569a0dc9c9cf356343f9e1c3a:\n\n  Merge branch 'maint' (2012-05-12 15:01:22 +0800)\n\n----------------------------------------------------------------\n\nJiang Xin (5):\n      l10n: Update git.pot (1 new messages)\n      Merge branch 'maint'\n      l10n: Update git.pot (275 new, 15 removed messages)\n      l10n: zh_CN.po: translate 1 new message\n      Merge branch 'maint'\n\nRalf Thielow (7):\n      l10n: add new members to German translation team\n      l10n: de.po: translate \"track\" as \"beobachten\"\n      l10n: de.po: translate \"remote\" as \"extern\"\n      l10n: de.po: collection of improvements\n      l10n: de.po: unify translation of \"ahead\" and \"behind\"\n      l10n: de.po: translate one new message\n      Merge branch 'maint' into master\n\nThomas Rast (4):\n      l10n: de.po: translate \"bare\" as \"bloß\"\n      l10n: de.po: hopefully uncontroversial fixes\n      l10n: de.po: translate \"bad\" as \"ungültig\" (\"invalid\")\n      l10n: de.po: collection of suggestions\n\n po/TEAMS   |    3 +\n po/de.po   |  487 ++++----\n po/git.pot | 3715 ++++++++++++++++++++++++++++++++++++++++--------------------\n 3 files changed, 2760 insertions(+), 1445 deletions(-)\n\n-- \nJiang Xin\n"},{"id":"191518","messageId":"7vehqmha43.fsf@alter.siamese.dyndns.org","threadId":"30515","inReplyTo":"CANYiYbEyZsiE7MWbJVQGYM_1vyi+y8MVCeGGf7G-_y9vMRdxYQ@mail.gmail.com","subject":"Re: Please pull git-l10n maint branch with de, zh_CN l10n updates","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-05-14T18:48:44Z","receivedAt":"2012-05-14T18:48:44Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pulled; thanks.\n"},{"id":"191533","messageId":"CANYiYbFX5_JuCdbrDQpY-oHuBgpskB-woYcfVgSxk222Mx4bGQ@mail.gmail.com","threadId":"30515","inReplyTo":"7vehqmha43.fsf@alter.siamese.dyndns.org","subject":"Re: Please pull git-l10n maint branch with de, zh_CN l10n updates","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2012-05-14T23:29:23Z","receivedAt":"2012-05-14T23:29:23Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"2012/5/15 Junio C Hamano <gitster@pobox.com>:\n> Pulled; thanks.\n\nFound new messages need to be translated in both maint and master branch.\nSo I update git.pot for both maint and master branch.\n\n * Update in maint branch:\n\n    l10n: Update git.pot (3 new, 2 removed messages)\n\n    Generate po/git.pot from v1.7.10.2-35-g0b9f4:\n\n     - 3 new l10n messages at lines: 2743, 2751, 2759.\n\n     - 2 removed l10n messages from lines: 1879, 2757.\n\n * Update in master branch:\n\n    l10n: Update git.pot (8 new, 4 removed messages)\n\n    Generate po/git.pot from v1.7.10.2-520-g6a4a48:\n\n     - 8 new l10n messages at lines:\n\n       977, 982, 1404, 1409, 1414, 1419, 1424, 1429.\n\n     - 4 removed l10n messages from lines:\n\n       977, 1399, 1404, 1409.\n\nI will send another email to l10n team leader one by one latter.\n\n-- \nJiang Xin\n"}]}