{"thread":{"id":"38014","subject":"[L10N] please review a batch l10n update for Git 2.2.0 final","startedAt":"2014-11-20T03:26:23Z","lastAt":"2014-11-21T19:43:17Z","messageCount":8,"participants":["Jiang Xin","Ralf Thielow","Peter Krefting","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"252241","messageId":"CANYiYbFrNCqxfrcaOWjeEZ2no=DRHVoDic8Qg989=U_VUTWiWA@mail.gmail.com","threadId":"38014","inReplyTo":null,"subject":"[L10N] please review a batch l10n update for Git 2.2.0 final","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2014-11-20T03:26:23Z","receivedAt":"2014-11-20T03:26:23Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Hi,\n\nOnly two days left for Git 2.2.0 final according to Git calendar\n(http://tinyurl.com/gitCal),\nbut there is a new update for our L10N team to respond.\n\nThe change is so small, I can handle it. git-diff shows:\n\n -msgid \"empty trailer token in trailer '%s'\"\n +msgid \"empty trailer token in trailer '%.*s'\"\n\nIn order to catch up with Git 2.2.0 final, I update all affected l10n\ntranslations.\nIf there are errors or you want to update yourself, please send me new\npull request and I will rebase on your commit. What I have made:\n\n l10n: batch updates for one trivial change\n\n In order to catch up with the release of Git 2.2.0 final, make a batch\n l10n update for the new l10n change brought by commit d52adf1 (trailer:\n display a trailer without its trailing newline).\n\n Signed-off-by: Jiang Xin \n\n po/bg.po | 110 +++++-----\n po/ca.po | 56 ++---\n po/de.po | 629 ++++++++++++++++++++++++++++--------------------------\n po/fr.po | 90 ++++----\n po/sv.po | 76 +++----\n po/vi.po | 56 ++---\n po/zh_CN.po | 56 ++---\n 7 files changed, 554 insertions(+), 519 deletions(-)\n\nBecause I update the .po files with msgmerge, this update also\nbrings some format changes, so not panic. :) What I changed are:\n\n bg.po:msgid \"empty trailer token in trailer '%.*s'\"\n bg.po-msgstr \"празна завършваща лексема в епилога „%.*s“\"\n --\n ca.po:msgid \"empty trailer token in trailer '%.*s'\"\n ca.po-msgstr \"fitxa de remolc buida en el remolc '%.*s'\"\n --\n de.po:msgid \"empty trailer token in trailer '%.*s'\"\n de.po-msgstr \"leerer Anhang-Token in Anhang '%.*s'\"\n --\n fr.po:msgid \"empty trailer token in trailer '%.*s'\"\n fr.po-msgstr \"symbole vide dans la ligne de fin '%.*s'\"\n --\n sv.po:msgid \"empty trailer token in trailer '%.*s'\"\n sv.po-msgstr \"tom släpradssymbol i släpraden \\\"%.*s\\\"\"\n --\n vi.po:msgid \"empty trailer token in trailer '%.*s'\"\n vi.po-msgstr \"thẻ thừa trống rỗng trong phần thừa “%.*s”\"\n --\n zh_CN.po:msgid \"empty trailer token in trailer '%.*s'\"\n zh_CN.po-msgstr \"签名 '%.*s' 的键为空\"\n\nNOTE for Ralf: After I updated de.po, there are 3 fuzzies instead of one.\nI can only fix one of them.\n\n-- \nJiang Xin\n"},{"id":"252243","messageId":"CAN0XMOLZw+btduQkQwMLykYFgFuZzTfMwnexyGR0FBdbG=qFmA@mail.gmail.com","threadId":"38014","inReplyTo":"CANYiYbFrNCqxfrcaOWjeEZ2no=DRHVoDic8Qg989=U_VUTWiWA@mail.gmail.com","subject":"Re: [L10N] please review a batch l10n update for Git 2.2.0 final","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2014-11-20T06:31:16Z","receivedAt":"2014-11-20T06:31:16Z","isPatch":false,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":">\n> NOTE for Ralf: After I updated de.po, there are 3 fuzzies instead of one.\n> I can only fix one of them.\n>\n\nI just send a pull-request to you. It seems I have forgotten one git.pot update.\nSorry\n"},{"id":"252244","messageId":"alpine.DEB.2.00.1411200847410.21018@ds9.cixit.se","threadId":"38014","inReplyTo":"CANYiYbFrNCqxfrcaOWjeEZ2no=DRHVoDic8Qg989=U_VUTWiWA@mail.gmail.com","subject":"Re: [L10N] please review a batch l10n update for Git 2.2.0 final","fromName":"Peter Krefting","fromEmail":"peter@softwolves.pp.se","sentAt":"2014-11-20T07:48:11Z","receivedAt":"2014-11-20T07:48:11Z","isPatch":false,"sender":{"key":"peter@softwolves.pp.se","avatar":"https://avatars.githubusercontent.com/u/990764?v=4"},"body":"Jiang Xin:\n\n> Because I update the .po files with msgmerge, this update also\n> brings some format changes, so not panic. :) What I changed are:\n\nSwedish (sv) looks fine, thanks!\n\n-- \n\\\\// Peter - http://www.softwolves.pp.se/\n"},{"id":"252245","messageId":"CANYiYbEt7r1Bjx9VA29Vk5FL9Qu0nTeXVZWAaggrcM=eNsY7Rg@mail.gmail.com","threadId":"38014","inReplyTo":"CAN0XMOLZw+btduQkQwMLykYFgFuZzTfMwnexyGR0FBdbG=qFmA@mail.gmail.com","subject":"Re: [L10N] please review a batch l10n update for Git 2.2.0 final","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2014-11-20T08:04:37Z","receivedAt":"2014-11-20T08:04:37Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"2014-11-20 14:31 GMT+08:00 Ralf Thielow :\n>>\n>> NOTE for Ralf: After I updated de.po, there are 3 fuzzies instead of one.\n>> I can only fix one of them.\n>>\n>\n> I just send a pull-request to you. It seems I have forgotten one git.pot update.\n\nMerged. I also see a nice workaround in your commit. It's a fix for the issue\nyou reported [1] yesterday on our side. ;-)\n\n msgid \"check\"\n +msgstr \"check|on-demand\"\n\n[1]: http://www.spinics.net/lists/git/msg241964.html\n\n-- \nJiang Xin\n"},{"id":"252246","messageId":"CANYiYbH5-eDSkq8LQsyixMsDh6e9ZA7nTVib_GbdK5BQ6vE6OA@mail.gmail.com","threadId":"38014","inReplyTo":"CANYiYbEt7r1Bjx9VA29Vk5FL9Qu0nTeXVZWAaggrcM=eNsY7Rg@mail.gmail.com","subject":"Re: [L10N] please review a batch l10n update for Git 2.2.0 final","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2014-11-20T08:30:44Z","receivedAt":"2014-11-20T08:30:44Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"2014-11-20 16:04 GMT+08:00 Jiang Xin :\n> 2014-11-20 14:31 GMT+08:00 Ralf Thielow :\n>>>\n>>> NOTE for Ralf: After I updated de.po, there are 3 fuzzies instead of one.\n>>> I can only fix one of them.\n>>>\n>>\n>> I just send a pull-request to you. It seems I have forgotten one git.pot update.\n>\n> Merged. I also see a nice workaround in your commit. It's a fix for the issue\n> you reported [1] yesterday on our side. ;-)\n>\n> msgid \"check\"\n> +msgstr \"check|on-demand\"\n>\n> [1]: http://www.spinics.net/lists/git/msg241964.html\n>\n\nAnother batch update:\n\ncommit 7ba2ba7d12163a8f9a9947d7880bd26f2970d4c5\nAuthor: Jiang Xin \nDate: Thu Nov 20 16:12:34 2014 +0800\n\n l10n: remove a superfluous translation for push.c\n\n Ralf reported that '--recurse-submodules' option in push.c should not be\n translated [1]. Before his commit is merged, remove superfluous\n translations for push.c.\n\n [1] http://www.spinics.net/lists/git/msg241964.html\n\n Signed-off-by: Jiang Xin \n\ndiff --git a/po/bg.po b/po/bg.po\nindex 4394eef..ccdd11e 100644\n--- a/po/bg.po\n+++ b/po/bg.po\n@@ -131,7 +131,7 @@ msgstr \"\"\n \"Project-Id-Version: git master\\n\"\n \"Report-Msgid-Bugs-To: Git Mailing List \\n\"\n \"POT-Creation-Date: 2014-11-20 09:42+0800\\n\"\n-\"PO-Revision-Date: 2014-11-20 10:15+0800\\n\"\n+\"PO-Revision-Date: 2014-11-20 16:09+0800\\n\"\n \"Last-Translator: Alexander Shopov \\n\"\n \"Language-Team: Bulgarian \\n\"\n \"Language: bg\\n\"\n@@ -8676,10 +8676,6 @@ msgstr \"УКАЗАТЕЛ>:<ОЧАКВАНА_СТОЙНОСТ\"\n msgid \"require old value of ref to be at this value\"\n msgstr \"УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ\"\n\n-#: builtin/push.c:506\n-msgid \"check\"\n-msgstr \"проверка\"\n-\n #: builtin/push.c:507\n msgid \"control recursive pushing of submodules\"\n msgstr \"управление на рекурсивното изтласкване на подмодулите\"\ndiff --git a/po/ca.po b/po/ca.po\nindex b30c611..1fea047 100644\n--- a/po/ca.po\n+++ b/po/ca.po\n@@ -8,7 +8,7 @@ msgstr \"\"\n \"Project-Id-Version: Git\\n\"\n \"Report-Msgid-Bugs-To: Git Mailing List \\n\"\n \"POT-Creation-Date: 2014-11-20 09:42+0800\\n\"\n-\"PO-Revision-Date: 2014-11-20 10:23+0800\\n\"\n+\"PO-Revision-Date: 2014-11-20 16:10+0800\\n\"\n \"Last-Translator: Alex Henrie \\n\"\n \"Language-Team: Catalan\\n\"\n \"Language: ca\\n\"\n@@ -8320,10 +8320,6 @@ msgstr \"nom-de-referència>:\\n\"\n \"POT-Creation-Date: 2014-11-20 09:42+0800\\n\"\n-\"PO-Revision-Date: 2014-11-20 10:21+0800\\n\"\n+\"PO-Revision-Date: 2014-11-20 16:10+0800\\n\"\n \"Last-Translator: Jean-Noël Avila \\n\"\n \"Language-Team: Jean-Noël Avila \\n\"\n \"Language: fr\\n\"\n@@ -8472,10 +8472,6 @@ msgstr \"nom de référence>:\\n\"\n \"POT-Creation-Date: 2014-11-20 09:42+0800\\n\"\n-\"PO-Revision-Date: 2014-11-20 10:19+0800\\n\"\n+\"PO-Revision-Date: 2014-11-20 16:10+0800\\n\"\n \"Last-Translator: Peter Krefting \\n\"\n \"Language-Team: Swedish \\n\"\n \"Language: sv\\n\"\n@@ -8245,10 +8245,6 @@ msgstr \"refnamn>:\\n\"\n \"POT-Creation-Date: 2014-11-20 09:42+0800\\n\"\n-\"PO-Revision-Date: 2014-11-20 10:17+0800\\n\"\n+\"PO-Revision-Date: 2014-11-20 16:10+0800\\n\"\n \"Last-Translator: Trần Ngọc Quân \\n\"\n \"Language-Team: Vietnamese \\n\"\n \"Language: vi\\n\"\n@@ -8368,10 +8368,6 @@ msgstr \"tên-tham-chiếu>:\\n\"\n \"POT-Creation-Date: 2014-11-20 09:42+0800\\n\"\n-\"PO-Revision-Date: 2014-11-20 10:05+0800\\n\"\n+\"PO-Revision-Date: 2014-11-20 16:10+0800\\n\"\n \"Last-Translator: Jiang Xin \\n\"\n \"Language-Team: GitHub \\n\"\n \"Language: zh_CN\\n\"\n@@ -8191,10 +8191,6 @@ msgstr \"引用名>:<期望值\"\n msgid \"require old value of ref to be at this value\"\n msgstr \"要求引用旧的取值为设定值\"\n\n-#: builtin/push.c:506\n-msgid \"check\"\n-msgstr \"检查\"\n-\n #: builtin/push.c:507\n msgid \"control recursive pushing of submodules\"\n msgstr \"控制子模组的递归推送\"\n\n\n\n\n-- \nJiang Xin\n"},{"id":"252308","messageId":"xmqqmw7l1nq5.fsf@gitster.dls.corp.google.com","threadId":"38014","inReplyTo":"CANYiYbH5-eDSkq8LQsyixMsDh6e9ZA7nTVib_GbdK5BQ6vE6OA@mail.gmail.com","subject":"Re: [L10N] please review a batch l10n update for Git 2.2.0 final","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-11-20T23:00:50Z","receivedAt":"2014-11-20T23:00:50Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jiang Xin writes:\n\n> 2014-11-20 16:04 GMT+08:00 Jiang Xin :\n>> 2014-11-20 14:31 GMT+08:00 Ralf Thielow :\n>>>>\n>>>> NOTE for Ralf: After I updated de.po, there are 3 fuzzies instead of one.\n>>>> I can only fix one of them.\n>>>>\n>>>\n>>> I just send a pull-request to you. It seems I have forgotten one git.pot update.\n>>\n>> Merged. I also see a nice workaround in your commit. It's a fix for the issue\n>> you reported [1] yesterday on our side. ;-)\n>>\n>> msgid \"check\"\n>> +msgstr \"check|on-demand\"\n>>\n>> [1]: http://www.spinics.net/lists/git/msg241964.html\n>\n> Another batch update:\n>\n> commit 7ba2ba7d12163a8f9a9947d7880bd26f2970d4c5\n> ...\n\nI've pushed out what should be -rc3 minus l10n changes and try to\nmake sure there will be no N_() and _() changes.\n\nLet's do a 2.2-rc3 as the last round of this cycle tomorrow. I've\nfetched up to your 7ba2ba7 but haven't merged it yet, just in case\nyou will have further updates. Otherwise, 2.2-rc3 will be what is\nat the tip of 'master' today with 7ba2ba7 merged in.\n\nThanks.\n"},{"id":"252321","messageId":"CANYiYbEa_p6q9iTS6Rys5dmZNhfZYngNFXGK-gYJFfzODg+B5g@mail.gmail.com","threadId":"38014","inReplyTo":"xmqqmw7l1nq5.fsf@gitster.dls.corp.google.com","subject":"Re: [L10N] please review a batch l10n update for Git 2.2.0 final","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2014-11-21T08:59:55Z","receivedAt":"2014-11-21T08:59:55Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"2014-11-21 7:00 GMT+08:00 Junio C Hamano :\n> I've pushed out what should be -rc3 minus l10n changes and try to\n> make sure there will be no N_() and _() changes.\n>\n> Let's do a 2.2-rc3 as the last round of this cycle tomorrow. I've\n> fetched up to your 7ba2ba7 but haven't merged it yet, just in case\n> you will have further updates. Otherwise, 2.2-rc3 will be what is\n> at the tip of 'master' today with 7ba2ba7 merged in.\n\n\nHi Junio,\n\nPlease pull the following changes since commit\nca0107e279df1465946970113d68b4ee26ffbcc4:\n\n Merge branch 'sv/submitting-final-patch' (2014-11-19 13:48:01 -0800)\n\nare available in the git repository at:\n\n git://github.com/git-l10n/git-po master\n\nfor you to fetch changes up to 7ba2ba7d12163a8f9a9947d7880bd26f2970d4c5:\n\n l10n: remove a superfluous translation for push.c (2014-11-20 16:23:43 +0800)\n\n----------------------------------------------------------------\nJiang Xin (3):\n l10n: git.pot: v2.2.0 round 2 (1 updated)\n l10n: batch updates for one trivial change\n l10n: remove a superfluous translation for push.c\n\nRalf Thielow (2):\n l10n: de.po: translate 2 new messages\n l10n: de.po: translate 2 messages\n\n po/bg.po | 114 ++++++-----\n po/ca.po | 60 +++---\n po/de.po | 631 +++++++++++++++++++++++++++++++-----------------------------\n po/fr.po | 94 +++++----\n po/git.pot | 48 ++---\n po/sv.po | 80 ++++----\n po/vi.po | 60 +++---\n po/zh_CN.po | 60 +++---\n 8 files changed, 578 insertions(+), 569 deletions(-)\n\n-- \nJiang Xin\n"},{"id":"252360","messageId":"xmqqioi8z6ei.fsf@gitster.dls.corp.google.com","threadId":"38014","inReplyTo":"CANYiYbEa_p6q9iTS6Rys5dmZNhfZYngNFXGK-gYJFfzODg+B5g@mail.gmail.com","subject":"Re: [L10N] please review a batch l10n update for Git 2.2.0 final","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-11-21T19:43:17Z","receivedAt":"2014-11-21T19:43:17Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jiang Xin writes:\n\n> 2014-11-21 7:00 GMT+08:00 Junio C Hamano :\n>> I've pushed out what should be -rc3 minus l10n changes and try to\n>> make sure there will be no N_() and _() changes.\n>>\n>> Let's do a 2.2-rc3 as the last round of this cycle tomorrow. I've\n>> fetched up to your 7ba2ba7 but haven't merged it yet, just in case\n>> you will have further updates. Otherwise, 2.2-rc3 will be what is\n>> at the tip of 'master' today with 7ba2ba7 merged in.\n>\n>\n> Hi Junio,\n>\n> Please pull the following changes since commit\n> ca0107e279df1465946970113d68b4ee26ffbcc4:\n>\n> Merge branch 'sv/submitting-final-patch' (2014-11-19 13:48:01 -0800)\n>\n> are available in the git repository at:\n>\n> git://github.com/git-l10n/git-po master\n>\n> for you to fetch changes up to 7ba2ba7d12163a8f9a9947d7880bd26f2970d4c5:\n>\n> l10n: remove a superfluous translation for push.c (2014-11-20 16:23:43 +0800)\n\nThanks. Done.\n"}]}