{"thread":{"id":"36003","subject":"[PATCH] i18n: proposed command missing leading dash","startedAt":"2014-02-28T20:52:46Z","lastAt":"2014-03-11T11:40:54Z","messageCount":11,"participants":["Sandy Carter","Jonathan Nieder","Junio C Hamano","Jiang Xin","Duy Nguyen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"235667","messageId":"1393620766-17582-1-git-send-email-sandy.carter@savoirfairelinux.com","threadId":"36003","inReplyTo":null,"subject":"[PATCH] i18n: proposed command missing leading dash","fromName":"Sandy Carter","fromEmail":"sandy.carter@savoirfairelinux.com","sentAt":"2014-02-28T20:52:46Z","receivedAt":"2014-02-28T20:52:46Z","isPatch":true,"sender":{"key":"sandy.carter@savoirfairelinux.com","avatar":"https://gravatar.com/avatar/f7200eeb1d898456afeba0045b3db9fc44992c1a1472c467883d32528048cd3e?d=mp&s=160"},"body":"Add missing leading dash to proposed commands in french output when\nusing the command:\ngit branch --set-upstream remotename/branchname\n\nSigned-off-by: Sandy Carter \n---\n po/fr.po | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/po/fr.po b/po/fr.po\nindex e10263f..7b44229 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -3266,7 +3266,7 @@ msgstr \" git branch -d %s\\n\"\n #: builtin/branch.c:1027\n #, c-format\n msgid \" git branch --set-upstream-to %s\\n\"\n-msgstr \" git branch -set-upstream-to %s\\n\"\n+msgstr \" git branch --set-upstream-to %s\\n\"\n \n #: builtin/bundle.c:47\n #, c-format\n-- \n1.9.0\n"},{"id":"235671","messageId":"20140228214140.GP7855@google.com","threadId":"36003","inReplyTo":"1393620766-17582-1-git-send-email-sandy.carter@savoirfairelinux.com","subject":"Re: [PATCH] i18n: proposed command missing leading dash","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2014-02-28T21:41:40Z","receivedAt":"2014-02-28T21:41:40Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nSandy Carter wrote:\n\n> Add missing leading dash to proposed commands in french output when\n> using the command:\n\nThanks!\n\n[...]\n> --- a/po/fr.po\n> +++ b/po/fr.po\n> @@ -3266,7 +3266,7 @@ msgstr \" git branch -d %s\\n\"\n> #: builtin/branch.c:1027\n> #, c-format\n> msgid \" git branch --set-upstream-to %s\\n\"\n> -msgstr \" git branch -set-upstream-to %s\\n\"\n> +msgstr \" git branch --set-upstream-to %s\\n\"\n\nTo make life saner for translators, this should be either\nuntranslatable or a single multi-line string, I suspect:\n\ndiff --git i/builtin/branch.c w/builtin/branch.c\nindex b4d7716..972040c 100644\n--- i/builtin/branch.c\n+++ w/builtin/branch.c\n@@ -1022,11 +1022,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n \t\t */\n \t\tif (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&\n \t\t !branch_existed && remote_tracking) {\n-\t\t\tfprintf(stderr, _(\"\\nIf you wanted to make '%s' track '%s', do this:\\n\\n\"), head, branch->name);\n-\t\t\tfprintf(stderr, _(\" git branch -d %s\\n\"), branch->name);\n-\t\t\tfprintf(stderr, _(\" git branch --set-upstream-to %s\\n\"), branch->name);\n+\t\t\tfprintf(stderr, \"\\n\");\n+\t\t\tfprintf(stderr, _(\"If you wanted to make '%s' track '%s', do this:\\n\\n\"\n+\t\t\t\t\t \" git branch -d %s\\n\"\n+\t\t\t\t\t \" git branch --set-upstream-to %s\"),\n+\t\t\t\t\thead, branch->name, branch->name, branch->name);\n+\t\t\tfprintf(stderr, \"\\n\");\n \t\t}\n-\n \t} else\n \t\tusage_with_options(builtin_branch_usage, options);\n \nWhat do you think?\n\nJonathan\n"},{"id":"235679","messageId":"xmqq38j2u84r.fsf@gitster.dls.corp.google.com","threadId":"36003","inReplyTo":"20140228214140.GP7855@google.com","subject":"Re: [PATCH] i18n: proposed command missing leading dash","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-02-28T23:31:32Z","receivedAt":"2014-02-28T23:31:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> To make life saner for translators, this should be either\n> untranslatable or a single multi-line string, I suspect:\n>\n> diff --git i/builtin/branch.c w/builtin/branch.c\n> index b4d7716..972040c 100644\n> --- i/builtin/branch.c\n> +++ w/builtin/branch.c\n> @@ -1022,11 +1022,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n> \t\t */\n> \t\tif (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&\n> \t\t !branch_existed && remote_tracking) {\n> -\t\t\tfprintf(stderr, _(\"\\nIf you wanted to make '%s' track '%s', do this:\\n\\n\"), head, branch->name);\n> -\t\t\tfprintf(stderr, _(\" git branch -d %s\\n\"), branch->name);\n> -\t\t\tfprintf(stderr, _(\" git branch --set-upstream-to %s\\n\"), branch->name);\n> +\t\t\tfprintf(stderr, \"\\n\");\n> +\t\t\tfprintf(stderr, _(\"If you wanted to make '%s' track '%s', do this:\\n\\n\"\n> +\t\t\t\t\t \" git branch -d %s\\n\"\n> +\t\t\t\t\t \" git branch --set-upstream-to %s\"),\n> +\t\t\t\t\thead, branch->name, branch->name, branch->name);\n> +\t\t\tfprintf(stderr, \"\\n\");\n> \t\t}\n> -\n> \t} else\n> \t\tusage_with_options(builtin_branch_usage, options);\n> \n> What do you think?\n\nYes, I think it is sensible to make sure that the command examples\nare not corrupted by the _() process.\n"},{"id":"235684","messageId":"1960754503.587182.1393634176189.JavaMail.root@mail","threadId":"36003","inReplyTo":"xmqq38j2u84r.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] i18n: proposed command missing leading dash","fromName":"Sandy Carter","fromEmail":"sandy.carter@savoirfairelinux.com","sentAt":"2014-03-01T00:36:16Z","receivedAt":"2014-03-01T00:36:16Z","isPatch":true,"sender":{"key":"sandy.carter@savoirfairelinux.com","avatar":"https://gravatar.com/avatar/f7200eeb1d898456afeba0045b3db9fc44992c1a1472c467883d32528048cd3e?d=mp&s=160"},"body":"Should I also update the relevant git.pot and *.po sections?\n\n----- Original Message -----\nFrom: \"Junio C Hamano\" \nTo: \"Jonathan Nieder\" \nCc: \"Sandy Carter\" , git@vger.kernel.org, \"jn avila\" , \"Carlos Martín Nieto\" \nSent: Friday, February 28, 2014 6:31:32 PM\nSubject: Re: [PATCH] i18n: proposed command missing leading dash\n\nJonathan Nieder writes:\n\n> To make life saner for translators, this should be either\n> untranslatable or a single multi-line string, I suspect:\n>\n> diff --git i/builtin/branch.c w/builtin/branch.c\n> index b4d7716..972040c 100644\n> --- i/builtin/branch.c\n> +++ w/builtin/branch.c\n> @@ -1022,11 +1022,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n> \t\t */\n> \t\tif (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&\n> \t\t !branch_existed && remote_tracking) {\n> -\t\t\tfprintf(stderr, _(\"\\nIf you wanted to make '%s' track '%s', do this:\\n\\n\"), head, branch->name);\n> -\t\t\tfprintf(stderr, _(\" git branch -d %s\\n\"), branch->name);\n> -\t\t\tfprintf(stderr, _(\" git branch --set-upstream-to %s\\n\"), branch->name);\n> +\t\t\tfprintf(stderr, \"\\n\");\n> +\t\t\tfprintf(stderr, _(\"If you wanted to make '%s' track '%s', do this:\\n\\n\"\n> +\t\t\t\t\t \" git branch -d %s\\n\"\n> +\t\t\t\t\t \" git branch --set-upstream-to %s\"),\n> +\t\t\t\t\thead, branch->name, branch->name, branch->name);\n> +\t\t\tfprintf(stderr, \"\\n\");\n> \t\t}\n> -\n> \t} else\n> \t\tusage_with_options(builtin_branch_usage, options);\n> \n> What do you think?\n\nYes, I think it is sensible to make sure that the command examples\nare not corrupted by the _() process.\n"},{"id":"235875","messageId":"1393858554-4392-1-git-send-email-sandy.carter@savoirfairelinux.com","threadId":"36003","inReplyTo":"1393620766-17582-1-git-send-email-sandy.carter@savoirfairelinux.com","subject":"[PATCH v2 1/2] i18n: proposed command missing leading dash","fromName":"Sandy Carter","fromEmail":"sandy.carter@savoirfairelinux.com","sentAt":"2014-03-03T14:55:53Z","receivedAt":"2014-03-03T14:55:53Z","isPatch":true,"sender":{"key":"sandy.carter@savoirfairelinux.com","avatar":"https://gravatar.com/avatar/f7200eeb1d898456afeba0045b3db9fc44992c1a1472c467883d32528048cd3e?d=mp&s=160"},"body":"Add missing leading dash to proposed commands in french output when\nusing the command:\n git branch --set-upstream remotename/branchname\nand when upstream is gone\n\nSigned-off-by: Sandy Carter \n---\n po/fr.po | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/po/fr.po b/po/fr.po\nindex e10263f..0b9d59e 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -1075,7 +1075,7 @@ msgstr \"Votre branche est basée sur '%s', mais la branche amont a disparu.\\n\"\n \n #: remote.c:1875\n msgid \" (use \\\"git branch --unset-upstream\\\" to fixup)\\n\"\n-msgstr \" (utilisez \\\"git branch -unset-upstream\\\" pour corriger)\\n\"\n+msgstr \" (utilisez \\\"git branch --unset-upstream\\\" pour corriger)\\n\"\n \n #: remote.c:1878\n #, c-format\n@@ -3266,7 +3266,7 @@ msgstr \" git branch -d %s\\n\"\n #: builtin/branch.c:1027\n #, c-format\n msgid \" git branch --set-upstream-to %s\\n\"\n-msgstr \" git branch -set-upstream-to %s\\n\"\n+msgstr \" git branch --set-upstream-to %s\\n\"\n \n #: builtin/bundle.c:47\n #, c-format\n-- \n1.9.0\n"},{"id":"235876","messageId":"1393858554-4392-2-git-send-email-sandy.carter@savoirfairelinux.com","threadId":"36003","inReplyTo":"1393858554-4392-1-git-send-email-sandy.carter@savoirfairelinux.com","subject":"[PATCH v2 2/2] i18n: assure command not corrupted by _() process","fromName":"Sandy Carter","fromEmail":"sandy.carter@savoirfairelinux.com","sentAt":"2014-03-03T14:55:54Z","receivedAt":"2014-03-03T14:55:54Z","isPatch":true,"sender":{"key":"sandy.carter@savoirfairelinux.com","avatar":"https://gravatar.com/avatar/f7200eeb1d898456afeba0045b3db9fc44992c1a1472c467883d32528048cd3e?d=mp&s=160"},"body":"Separate message from command examples to avoid translation issues\nsuch as a dash being omitted in a translation.\n\nSigned-off-by: Sandy Carter \n---\n builtin/branch.c | 10 ++++++----\n 1 file changed, 6 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex b4d7716..b304da8 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -1022,11 +1022,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n \t\t */\n \t\tif (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&\n \t\t !branch_existed && remote_tracking) {\n-\t\t\tfprintf(stderr, _(\"\\nIf you wanted to make '%s' track '%s', do this:\\n\\n\"), head, branch->name);\n-\t\t\tfprintf(stderr, _(\" git branch -d %s\\n\"), branch->name);\n-\t\t\tfprintf(stderr, _(\" git branch --set-upstream-to %s\\n\"), branch->name);\n+\t\t\tfprintf(stderr, \"\\n\");\n+\t\t\tfprintf(stderr, _(\"If you wanted to make '%s' track '%s', do this:\"), head, branch->name);\n+\t\t\tfprintf(stderr, \"\\n\\n\");\n+\t\t\tfprintf(stderr, \" git branch -d %s\\n\", branch->name);\n+\t\t\tfprintf(stderr, \" git branch --set-upstream-to %s\\n\", branch->name);\n+\t\t\tfprintf(stderr, \"\\n\");\n \t\t}\n-\n \t} else\n \t\tusage_with_options(builtin_branch_usage, options);\n \n-- \n1.9.0\n"},{"id":"236018","messageId":"xmqqa9d5lsdb.fsf@gitster.dls.corp.google.com","threadId":"36003","inReplyTo":"1393858554-4392-1-git-send-email-sandy.carter@savoirfairelinux.com","subject":"Re: [PATCH v2 1/2] i18n: proposed command missing leading dash","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-03-04T18:40:32Z","receivedAt":"2014-03-04T18:40:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"From: Sandy Carter \nDate: Mon, 3 Mar 2014 09:55:53 -0500\n\nAdd missing leading dash to proposed commands in french output when\nusing the command:\n git branch --set-upstream remotename/branchname\nand when upstream is gone\n\nSigned-off-by: Sandy Carter \nSigned-off-by: Junio C Hamano \n---\n\n * Forwarding to the i18n coordinator. I don't do French, but this\n seems trivially correct.\n\n po/fr.po | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/po/fr.po b/po/fr.po\nindex e10263f..0b9d59e 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -1075,7 +1075,7 @@ msgstr \"Votre branche est basée sur '%s', mais la branche amont a disparu.\\n\"\n \n #: remote.c:1875\n msgid \" (use \\\"git branch --unset-upstream\\\" to fixup)\\n\"\n-msgstr \" (utilisez \\\"git branch -unset-upstream\\\" pour corriger)\\n\"\n+msgstr \" (utilisez \\\"git branch --unset-upstream\\\" pour corriger)\\n\"\n \n #: remote.c:1878\n #, c-format\n@@ -3266,7 +3266,7 @@ msgstr \" git branch -d %s\\n\"\n #: builtin/branch.c:1027\n #, c-format\n msgid \" git branch --set-upstream-to %s\\n\"\n-msgstr \" git branch -set-upstream-to %s\\n\"\n+msgstr \" git branch --set-upstream-to %s\\n\"\n \n #: builtin/bundle.c:47\n #, c-format\n-- \n1.9.0\n"},{"id":"236087","messageId":"CANYiYbEZEYwrOh0VZAGiX_sMB3z+6ntv3_UgbLkvsU6FvH07Dg@mail.gmail.com","threadId":"36003","inReplyTo":"xmqqa9d5lsdb.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v2 1/2] i18n: proposed command missing leading dash","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2014-03-05T14:14:44Z","receivedAt":"2014-03-05T14:14:44Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"2014-03-05 2:40 GMT+08:00 Junio C Hamano :\n> From: Sandy Carter \n> Date: Mon, 3 Mar 2014 09:55:53 -0500\n>\n> Add missing leading dash to proposed commands in french output when\n> using the command:\n> git branch --set-upstream remotename/branchname\n> and when upstream is gone\n>\n> Signed-off-by: Sandy Carter \n> Signed-off-by: Junio C Hamano \n> ---\n>\n> * Forwarding to the i18n coordinator. I don't do French, but this\n> seems trivially correct.\n\nApplied to maint branch of git://github.com/git-l10n/git-po, and can be\nmerged to master directly.\n\n-- \nJiang Xin\n"},{"id":"236134","messageId":"xmqqbnxkfgw4.fsf@gitster.dls.corp.google.com","threadId":"36003","inReplyTo":"CANYiYbEZEYwrOh0VZAGiX_sMB3z+6ntv3_UgbLkvsU6FvH07Dg@mail.gmail.com","subject":"Re: [PATCH v2 1/2] i18n: proposed command missing leading dash","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-03-05T21:57:15Z","receivedAt":"2014-03-05T21:57:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jiang Xin writes:\n\n> 2014-03-05 2:40 GMT+08:00 Junio C Hamano :\n>> From: Sandy Carter \n>> Date: Mon, 3 Mar 2014 09:55:53 -0500\n>>\n>> Add missing leading dash to proposed commands in french output when\n>> using the command:\n>> git branch --set-upstream remotename/branchname\n>> and when upstream is gone\n>>\n>> Signed-off-by: Sandy Carter \n>> Signed-off-by: Junio C Hamano \n>> ---\n>>\n>> * Forwarding to the i18n coordinator. I don't do French, but this\n>> seems trivially correct.\n>\n> Applied to maint branch of git://github.com/git-l10n/git-po, and can be\n> merged to master directly.\n\nThanks.\n"},{"id":"236400","messageId":"531DB549.5060304@savoirfairelinux.com","threadId":"36003","inReplyTo":"1393858554-4392-2-git-send-email-sandy.carter@savoirfairelinux.com","subject":"Re: [PATCH v2 2/2] i18n: assure command not corrupted by _() process","fromName":"Sandy Carter","fromEmail":"sandy.carter@savoirfairelinux.com","sentAt":"2014-03-10T12:51:21Z","receivedAt":"2014-03-10T12:51:21Z","isPatch":true,"sender":{"key":"sandy.carter@savoirfairelinux.com","avatar":"https://gravatar.com/avatar/f7200eeb1d898456afeba0045b3db9fc44992c1a1472c467883d32528048cd3e?d=mp&s=160"},"body":"Is there any update on this patch?\n\nLe 2014-03-03 09:55, Sandy Carter a écrit :\n> Separate message from command examples to avoid translation issues\n> such as a dash being omitted in a translation.\n>\n> Signed-off-by: Sandy Carter \n> ---\n> builtin/branch.c | 10 ++++++----\n> 1 file changed, 6 insertions(+), 4 deletions(-)\n>\n> diff --git a/builtin/branch.c b/builtin/branch.c\n> index b4d7716..b304da8 100644\n> --- a/builtin/branch.c\n> +++ b/builtin/branch.c\n> @@ -1022,11 +1022,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n> \t\t */\n> \t\tif (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&\n> \t\t !branch_existed && remote_tracking) {\n> -\t\t\tfprintf(stderr, _(\"\\nIf you wanted to make '%s' track '%s', do this:\\n\\n\"), head, branch->name);\n> -\t\t\tfprintf(stderr, _(\" git branch -d %s\\n\"), branch->name);\n> -\t\t\tfprintf(stderr, _(\" git branch --set-upstream-to %s\\n\"), branch->name);\n> +\t\t\tfprintf(stderr, \"\\n\");\n> +\t\t\tfprintf(stderr, _(\"If you wanted to make '%s' track '%s', do this:\"), head, branch->name);\n> +\t\t\tfprintf(stderr, \"\\n\\n\");\n> +\t\t\tfprintf(stderr, \" git branch -d %s\\n\", branch->name);\n> +\t\t\tfprintf(stderr, \" git branch --set-upstream-to %s\\n\", branch->name);\n> +\t\t\tfprintf(stderr, \"\\n\");\n> \t\t}\n> -\n> \t} else\n> \t\tusage_with_options(builtin_branch_usage, options);\n>\n>\n"},{"id":"236497","messageId":"CACsJy8DvuuiKXB4XUACJzhoibL8Hmk-3_GNxh9t1OF412b97vw@mail.gmail.com","threadId":"36003","inReplyTo":"531DB549.5060304@savoirfairelinux.com","subject":"Re: [PATCH v2 2/2] i18n: assure command not corrupted by _() process","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2014-03-11T11:40:54Z","receivedAt":"2014-03-11T11:40:54Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Mon, Mar 10, 2014 at 7:51 PM, Sandy Carter\n wrote:\n> Is there any update on this patch?\n\nThe patch looks good. Maybe Junio missed it.\n\n>\n> Le 2014-03-03 09:55, Sandy Carter a écrit :\n>\n>> Separate message from command examples to avoid translation issues\n>> such as a dash being omitted in a translation.\n>>\n>> Signed-off-by: Sandy Carter \n>> ---\n>> builtin/branch.c | 10 ++++++----\n>> 1 file changed, 6 insertions(+), 4 deletions(-)\n>>\n>> diff --git a/builtin/branch.c b/builtin/branch.c\n>> index b4d7716..b304da8 100644\n>> --- a/builtin/branch.c\n>> +++ b/builtin/branch.c\n>> @@ -1022,11 +1022,13 @@ int cmd_branch(int argc, const char **argv, const\n>> char *prefix)\n>> */\n>> if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&\n>> !branch_existed && remote_tracking) {\n>> - fprintf(stderr, _(\"\\nIf you wanted to make '%s'\n>> track '%s', do this:\\n\\n\"), head, branch->name);\n>> - fprintf(stderr, _(\" git branch -d %s\\n\"),\n>> branch->name);\n>> - fprintf(stderr, _(\" git branch\n>> --set-upstream-to %s\\n\"), branch->name);\n>> + fprintf(stderr, \"\\n\");\n>> + fprintf(stderr, _(\"If you wanted to make '%s'\n>> track '%s', do this:\"), head, branch->name);\n>> + fprintf(stderr, \"\\n\\n\");\n>> + fprintf(stderr, \" git branch -d %s\\n\",\n>> branch->name);\n>> + fprintf(stderr, \" git branch --set-upstream-to\n>> %s\\n\", branch->name);\n>> + fprintf(stderr, \"\\n\");\n>> }\n>> -\n>> } else\n>> usage_with_options(builtin_branch_usage, options);\n>>\n>>\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n\n\n\n-- \nDuy\n"}]}