{"thread":{"id":"31190","subject":"[PATCH] merge-recursive: separate message for common ancestors","startedAt":"2012-08-05T17:56:38Z","lastAt":"2012-08-06T17:31:04Z","messageCount":7,"participants":["Ralf Thielow","Junio C Hamano","Jiang Xin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"196488","messageId":"1344189398-27127-1-git-send-email-ralf.thielow@gmail.com","threadId":"31190","inReplyTo":null,"subject":"[PATCH] merge-recursive: separate message for common ancestors","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2012-08-05T17:56:38Z","receivedAt":"2012-08-05T17:56:38Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"The function \"merge_recursive\" prints the count of common\nancestors as \"found %u common ancestor(s):\". At least for\nbetter translation, we should use a singular and a plural\nform of this message.\n\nSigned-off-by: Ralf Thielow \n---\n merge-recursive.c | 5 ++++-\n 1 file changed, 4 insertions(+), 1 deletion(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 8903a73..39b2e16 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -1915,7 +1915,10 @@ int merge_recursive(struct merge_options *o,\n \t}\n \n \tif (show(o, 5)) {\n-\t\toutput(o, 5, _(\"found %u common ancestor(s):\"), commit_list_count(ca));\n+\t\tunsigned cnt = commit_list_count(ca);\n+\n+\t\toutput(o, 5, Q_(\"found %u common ancestor:\",\n+\t\t\t\t\"found %u common ancestors:\", cnt), cnt);\n \t\tfor (iter = ca; iter; iter = iter->next)\n \t\t\toutput_commit_title(o, iter->item);\n \t}\n-- \n1.7.12.rc1\n"},{"id":"196490","messageId":"7vehnl41r2.fsf@alter.siamese.dyndns.org","threadId":"31190","inReplyTo":"1344189398-27127-1-git-send-email-ralf.thielow@gmail.com","subject":"Re: [PATCH] merge-recursive: separate message for common ancestors","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-08-05T18:44:49Z","receivedAt":"2012-08-05T18:44:49Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ralf Thielow writes:\n\n> The function \"merge_recursive\" prints the count of common\n> ancestors as \"found %u common ancestor(s):\". At least for\n> better translation, we should use a singular and a plural\n> form of this message.\n>\n> Signed-off-by: Ralf Thielow \n> ---\n\nThanks.\n\nIn your \"At least\" above, I am getting an impression that either (1)\nyou think the updated two-message solution is still not ideal for\nsome reason, or (2) you think the change not only helps translation,\nit also helps something else. But I cannot quite guess which. If\nit is (1) I am not sure what you are not exactly happy about, if it\nis (2) I am not sure what other problem the change helps.\n\nI am a bit puzzled by the log message, but the change makes sense to\nme otherwise.\n\n> merge-recursive.c | 5 ++++-\n> 1 file changed, 4 insertions(+), 1 deletion(-)\n>\n> diff --git a/merge-recursive.c b/merge-recursive.c\n> index 8903a73..39b2e16 100644\n> --- a/merge-recursive.c\n> +++ b/merge-recursive.c\n> @@ -1915,7 +1915,10 @@ int merge_recursive(struct merge_options *o,\n> \t}\n> \n> \tif (show(o, 5)) {\n> -\t\toutput(o, 5, _(\"found %u common ancestor(s):\"), commit_list_count(ca));\n> +\t\tunsigned cnt = commit_list_count(ca);\n> +\n> +\t\toutput(o, 5, Q_(\"found %u common ancestor:\",\n> +\t\t\t\t\"found %u common ancestors:\", cnt), cnt);\n> \t\tfor (iter = ca; iter; iter = iter->next)\n> \t\t\toutput_commit_title(o, iter->item);\n> \t}\n"},{"id":"196494","messageId":"CAN0XMO+j08fV-5+nNrVQAteB3VStBjqvvjMzRq=6wcbg8OR+xg@mail.gmail.com","threadId":"31190","inReplyTo":"7vehnl41r2.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] merge-recursive: separate message for common ancestors","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2012-08-05T18:55:57Z","receivedAt":"2012-08-05T18:55:57Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"It would be nicer for translators to have two messages.\nIn the end it's just a separation for singular and plural as it's\ndone in diff.c (e.g. Q_(\" %d file changed\", \" %d files changed\", files)).\n\nOn Sun, Aug 5, 2012 at 8:44 PM, Junio C Hamano wrote:\n> Ralf Thielow writes:\n>\n>> The function \"merge_recursive\" prints the count of common\n>> ancestors as \"found %u common ancestor(s):\". At least for\n>> better translation, we should use a singular and a plural\n>> form of this message.\n>>\n>> Signed-off-by: Ralf Thielow \n>> ---\n>\n> Thanks.\n>\n> In your \"At least\" above, I am getting an impression that either (1)\n> you think the updated two-message solution is still not ideal for\n> some reason, or (2) you think the change not only helps translation,\n> it also helps something else. But I cannot quite guess which. If\n> it is (1) I am not sure what you are not exactly happy about, if it\n> is (2) I am not sure what other problem the change helps.\n>\n> I am a bit puzzled by the log message, but the change makes sense to\n> me otherwise.\n>\n>> merge-recursive.c | 5 ++++-\n>> 1 file changed, 4 insertions(+), 1 deletion(-)\n>>\n>> diff --git a/merge-recursive.c b/merge-recursive.c\n>> index 8903a73..39b2e16 100644\n>> --- a/merge-recursive.c\n>> +++ b/merge-recursive.c\n>> @@ -1915,7 +1915,10 @@ int merge_recursive(struct merge_options *o,\n>> }\n>>\n>> if (show(o, 5)) {\n>> - output(o, 5, _(\"found %u common ancestor(s):\"), commit_list_count(ca));\n>> + unsigned cnt = commit_list_count(ca);\n>> +\n>> + output(o, 5, Q_(\"found %u common ancestor:\",\n>> + \"found %u common ancestors:\", cnt), cnt);\n>> for (iter = ca; iter; iter = iter->next)\n>> output_commit_title(o, iter->item);\n>> }\n"},{"id":"196496","messageId":"7v628x3zjt.fsf@alter.siamese.dyndns.org","threadId":"31190","inReplyTo":"CAN0XMO+j08fV-5+nNrVQAteB3VStBjqvvjMzRq=6wcbg8OR+xg@mail.gmail.com","subject":"Re: [PATCH] merge-recursive: separate message for common ancestors","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-08-05T19:32:22Z","receivedAt":"2012-08-05T19:32:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ralf Thielow writes:\n\n> It would be nicer for translators to have two messages.\n> In the end it's just a separation for singular and plural as it's\n> done in diff.c (e.g. Q_(\" %d file changed\", \" %d files changed\", files)).\n\nOK, so there was no hidden message behind \"At least for better\ntranslation\". Will apply this so 1.7.12 can have it.\n\nThanks.\n\n>\n> On Sun, Aug 5, 2012 at 8:44 PM, Junio C Hamano wrote:\n>> Ralf Thielow writes:\n>>\n>>> The function \"merge_recursive\" prints the count of common\n>>> ancestors as \"found %u common ancestor(s):\". At least for\n>>> better translation, we should use a singular and a plural\n>>> form of this message.\n>>>\n>>> Signed-off-by: Ralf Thielow \n>>> ---\n>>\n>> Thanks.\n>>\n>> In your \"At least\" above, I am getting an impression that either (1)\n>> you think the updated two-message solution is still not ideal for\n>> some reason, or (2) you think the change not only helps translation,\n>> it also helps something else. But I cannot quite guess which. If\n>> it is (1) I am not sure what you are not exactly happy about, if it\n>> is (2) I am not sure what other problem the change helps.\n>>\n>> I am a bit puzzled by the log message, but the change makes sense to\n>> me otherwise.\n>>\n>>> merge-recursive.c | 5 ++++-\n>>> 1 file changed, 4 insertions(+), 1 deletion(-)\n>>>\n>>> diff --git a/merge-recursive.c b/merge-recursive.c\n>>> index 8903a73..39b2e16 100644\n>>> --- a/merge-recursive.c\n>>> +++ b/merge-recursive.c\n>>> @@ -1915,7 +1915,10 @@ int merge_recursive(struct merge_options *o,\n>>> }\n>>>\n>>> if (show(o, 5)) {\n>>> - output(o, 5, _(\"found %u common ancestor(s):\"), commit_list_count(ca));\n>>> + unsigned cnt = commit_list_count(ca);\n>>> +\n>>> + output(o, 5, Q_(\"found %u common ancestor:\",\n>>> + \"found %u common ancestors:\", cnt), cnt);\n>>> for (iter = ca; iter; iter = iter->next)\n>>> output_commit_title(o, iter->item);\n>>> }\n"},{"id":"196521","messageId":"CANYiYbFe6LUL+2m-X+Ek8ehFw6D5tvh+FwoGjF_zipcUe_MtMw@mail.gmail.com","threadId":"31190","inReplyTo":"7v628x3zjt.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] merge-recursive: separate message for common ancestors","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2012-08-06T01:34:03Z","receivedAt":"2012-08-06T01:34:03Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"2012/8/6 Junio C Hamano :\n> Ralf Thielow writes:\n>\n>> It would be nicer for translators to have two messages.\n>> In the end it's just a separation for singular and plural as it's\n>> done in diff.c (e.g. Q_(\" %d file changed\", \" %d files changed\", files)).\n>\n> OK, so there was no hidden message behind \"At least for better\n> translation\". Will apply this so 1.7.12 can have it.\n\n[resend to the list again, for last mail is rich text format and is\nrejected by the list]\n\nSo I will not wait for Ralf's update on \"de.po\", he will catch up with next\nround of l10n with this fix. Pull request for this round of l10n:\n\nThe following changes since commit 05a20c87abd08441c98dfcca0606bc0f8432ab26:\n\n Merge git://github.com/git-l10n/git-po (2012-08-01 15:59:08 -0700)\n\nare available in the git repository at:\n\n\n git://github.com/git-l10n/git-po master\n\nfor you to fetch changes up to 649900bc126edf59aaae49ba025880dc948980f0:\n\n l10n: zh_CN.po: translate 76 new messages (2012-08-05 07:12:27 +0800)\n\n----------------------------------------------------------------\nJiang Xin (2):\n l10n: Update git.pot (76 new, 4 removed messages)\n l10n: zh_CN.po: translate 76 new messages\n\nTran Ngoc Quan (1):\n l10n: vi.po update to follow POT in 3b613\n\n po/git.pot | 433 +++++++++++++++++++++++++++++---\n po/vi.po | 464 ++++++++++++++++++++++++++++++----\n po/zh_CN.po | 817 +++++++++++++++++++++++++++++++++---------------------------\n 3 files changed, 1265 insertions(+), 449 deletions(-)\n\n-- \nJiang Xin\n"},{"id":"196548","messageId":"CANYiYbE-q82-BmbQ15o8S=0mS2GgURZ1qpX6E1NG80ZNgax_ow@mail.gmail.com","threadId":"31190","inReplyTo":"CANYiYbFe6LUL+2m-X+Ek8ehFw6D5tvh+FwoGjF_zipcUe_MtMw@mail.gmail.com","subject":"Re: [PATCH] merge-recursive: separate message for common ancestors","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2012-08-06T17:04:47Z","receivedAt":"2012-08-06T17:04:47Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"2012/8/6 Jiang Xin :\n> 2012/8/6 Junio C Hamano :\n>> OK, so there was no hidden message behind \"At least for better\n>> translation\". Will apply this so 1.7.12 can have it.\n>\n> So I will not wait for Ralf's update on \"de.po\", he will catch up with next\n> round of l10n with this fix. Pull request for this round of l10n:\n\nNext round (maybe last) of translation for git v1.7.12 begins. This time\nonly 1 message is updated in commit bb2ba06:\n\n l10n: Update one message in git.pot\n\n This update comes from commit v1.7.12-rc1-18-ge0453\n (merge-recursive: separate message for common ancestors).\n\n Signed-off-by: Jiang Xin \n\nFetch this update from the usual place:\n\n $ git fetch git://github.com/git-l10n/git-po master\n\n-- \nJiang Xin\n"},{"id":"196550","messageId":"1344274264-11368-1-git-send-email-ralf.thielow@gmail.com","threadId":"31190","inReplyTo":"CANYiYbE-q82-BmbQ15o8S=0mS2GgURZ1qpX6E1NG80ZNgax_ow@mail.gmail.com","subject":"[PATCH] l10n: de.po: translate one new message","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2012-08-06T17:31:04Z","receivedAt":"2012-08-06T17:31:04Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"Translate one new message came from git.pot update\nin bb2ba06 (l10n: Update one message in git.pot).\n\nSigned-off-by: Ralf Thielow \n---\nHi German l10n team,\n\nplease review also this small update of German\ntranslation. I'll squash it with the last update\nand merge the commit messages together.\n\nThanks,\nRalf\n\n po/de.po | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex 2f56f3f..2739bc0 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -594,11 +594,11 @@ msgid \"Merging:\"\n msgstr \"Zusammenführung:\"\n \n #: merge-recursive.c:1920\n-#, fuzzy, c-format\n+#, c-format\n msgid \"found %u common ancestor:\"\n msgid_plural \"found %u common ancestors:\"\n-msgstr[0] \"%u gemeinsame(n) Vorfahren gefunden\"\n-msgstr[1] \"%u gemeinsame(n) Vorfahren gefunden\"\n+msgstr[0] \"%u gemeinsamen Vorfahren gefunden\"\n+msgstr[1] \"%u gemeinsame Vorfahren gefunden\"\n \n #: merge-recursive.c:1957\n msgid \"merge returned no commit\"\n-- \n1.7.12.rc1\n"}]}