{"thread":{"id":"56811","subject":"[L10N] Kickoff for Git 2.34.0 round #1","startedAt":"2021-10-30T02:09:39Z","lastAt":"2021-11-04T01:27:56Z","messageCount":8,"participants":["Jiang Xin","Junio C Hamano","Bagas Sanjaya","ZheNing Hu"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"440116","messageId":"20211030020917.32132-1-worldhello.net@gmail.com","threadId":"56811","inReplyTo":null,"subject":"[L10N] Kickoff for Git 2.34.0 round #1","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2021-10-30T02:09:17Z","receivedAt":"2021-10-30T02:09:39Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Hi,\n\nGit v2.34.0-rc0 has been released, and it's time to start new round of\ngit l10n. This time there are 134 updated messages need to be translated\nsince last update. Let's start a new round of git l10n based on this\ncommit:\n\n l10n: git.pot: v2.34.0 round 1 (134 new, 154 removed)\n \n Generate po/git.pot from v2.34.0-rc0 for git v2.34.0 l10n round 1.\n \n Signed-off-by: Jiang Xin \n\nYou can get it from the usual place:\n\n https://github.com/git-l10n/git-po/\n\nAs how to update your XX.po and help to translate Git, please see\n\"Updating a XX.po file\" and other sections in \"po/README\" file.\n\nThere is a helper program hosted on https://github.com/git-l10n/git-po-helper\nfor git l10n coordinator and git l10n contributors to verify their commits.\n\n\n--\nJiang Xin\n"},{"id":"440188","messageId":"20211031052156.5237-1-worldhello.net@gmail.com","threadId":"56811","inReplyTo":"20211030020917.32132-1-worldhello.net@gmail.com","subject":"[PATCH] i18n: fix typos found during l10n for git 2.34.0","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2021-10-31T05:21:56Z","receivedAt":"2021-10-31T05:22:17Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Emir reported typos in some i18n messages in the pull request[1] of\nTurkish language l10n for git 2.34.0.\n\n* Use stable spelling for config variable \"gpg.ssh.defaultKeyCommand\".\n* Add missing space between \"with\" and \"--python\".\n\n[1] https://github.com/git-l10n/git-po/pull/567\n\nReported-by: Emir Sarı \nSigned-off-by: Jiang Xin \n---\n gpg-interface.c | 2 +-\n ref-filter.c | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/gpg-interface.c b/gpg-interface.c\nindex 800d8caa67..68d2f29be7 100644\n--- a/gpg-interface.c\n+++ b/gpg-interface.c\n@@ -775,7 +775,7 @@ static const char *get_default_ssh_signing_key(void)\n \t\tif (keys[0] && starts_with(keys[0]->buf, \"ssh-\")) {\n \t\t\tdefault_key = strbuf_detach(keys[0], NULL);\n \t\t} else {\n-\t\t\twarning(_(\"gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s\"),\n+\t\t\twarning(_(\"gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s\"),\n \t\t\t\tkey_stderr.buf, key_stdout.buf);\n \t\t}\n \ndiff --git a/ref-filter.c b/ref-filter.c\nindex 282cdad103..08a3f839c9 100644\n--- a/ref-filter.c\n+++ b/ref-filter.c\n@@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)\n \t\t format->quote_style == QUOTE_TCL) &&\n \t\t used_atom[at].atom_type == ATOM_RAW &&\n \t\t used_atom[at].u.raw_data.option == RAW_BARE)\n-\t\t\tdie(_(\"--format=%.*s cannot be used with\"\n+\t\t\tdie(_(\"--format=%.*s cannot be used with \"\n \t\t\t \"--python, --shell, --tcl\"), (int)(ep - sp - 2), sp + 2);\n \t\tcp = ep + 1;\n \n-- \n2.34.0.rc0.8.g1f511a9b56\n\n"},{"id":"440207","messageId":"20211101021417.9549-1-worldhello.net@gmail.com","threadId":"56811","inReplyTo":"20211031052156.5237-1-worldhello.net@gmail.com","subject":"[PATCH v2] i18n: fix typos found during l10n for git 2.34.0","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2021-11-01T02:14:17Z","receivedAt":"2021-11-01T02:14:43Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Emir and Jean-Noël reported typos in some i18n messages when preparing\nl10n for git 2.34.0.\n\n* Fix unstable spelling of config variable \"gpg.ssh.defaultKeyCommand\"\n which was introduced in commit fd9e226776 (ssh signing: retrieve a\n default key from ssh-agent, 2021-09-10).\n\n* Add missing space between \"with\" and \"--python\" which was introduced\n in commit bd0708c7eb (ref-filter: add %(raw) atom, 2021-07-26).\n\n* Fix unmatched single quote in 'builtin/index-pack.c' which was\n introduced in commit 8737dab346 (index-pack: refactor renaming in\n final(), 2021-09-09)\n\n[1] https://github.com/git-l10n/git-po/pull/567\n\nReported-by: Emir Sarı \nReported-by: Jean-Noël Avila \nSigned-off-by: Jiang Xin \n---\n builtin/index-pack.c | 2 +-\n gpg-interface.c | 2 +-\n ref-filter.c | 2 +-\n 3 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/index-pack.c b/builtin/index-pack.c\nindex 15ae406e6b..c23d01de7d 100644\n--- a/builtin/index-pack.c\n+++ b/builtin/index-pack.c\n@@ -1486,7 +1486,7 @@ static void rename_tmp_packfile(const char **final_name,\n \t\tif (!*final_name)\n \t\t\t*final_name = odb_pack_name(name, hash, ext);\n \t\tif (finalize_object_file(curr_name, *final_name))\n-\t\t\tdie(_(\"unable to rename temporary '*.%s' file to '%s\"),\n+\t\t\tdie(_(\"unable to rename temporary '*.%s' file to '%s'\"),\n \t\t\t ext, *final_name);\n \t} else if (make_read_only_if_same) {\n \t\tchmod(*final_name, 0444);\ndiff --git a/gpg-interface.c b/gpg-interface.c\nindex 800d8caa67..68d2f29be7 100644\n--- a/gpg-interface.c\n+++ b/gpg-interface.c\n@@ -775,7 +775,7 @@ static const char *get_default_ssh_signing_key(void)\n \t\tif (keys[0] && starts_with(keys[0]->buf, \"ssh-\")) {\n \t\t\tdefault_key = strbuf_detach(keys[0], NULL);\n \t\t} else {\n-\t\t\twarning(_(\"gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s\"),\n+\t\t\twarning(_(\"gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s\"),\n \t\t\t\tkey_stderr.buf, key_stdout.buf);\n \t\t}\n \ndiff --git a/ref-filter.c b/ref-filter.c\nindex 282cdad103..08a3f839c9 100644\n--- a/ref-filter.c\n+++ b/ref-filter.c\n@@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)\n \t\t format->quote_style == QUOTE_TCL) &&\n \t\t used_atom[at].atom_type == ATOM_RAW &&\n \t\t used_atom[at].u.raw_data.option == RAW_BARE)\n-\t\t\tdie(_(\"--format=%.*s cannot be used with\"\n+\t\t\tdie(_(\"--format=%.*s cannot be used with \"\n \t\t\t \"--python, --shell, --tcl\"), (int)(ep - sp - 2), sp + 2);\n \t\tcp = ep + 1;\n \n-- \n2.34.0.rc0.8.g1f511a9b56\n\n"},{"id":"440210","messageId":"xmqq8ry8e850.fsf@gitster.g","threadId":"56811","inReplyTo":"20211101021417.9549-1-worldhello.net@gmail.com","subject":"Re: [PATCH v2] i18n: fix typos found during l10n for git 2.34.0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-01T05:51:07Z","receivedAt":"2021-11-01T06:01:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jiang Xin writes:\n\n> Emir and Jean-Noël reported typos in some i18n messages when preparing\n> l10n for git 2.34.0.\n>\n> * Fix unstable spelling of config variable \"gpg.ssh.defaultKeyCommand\"\n> which was introduced in commit fd9e226776 (ssh signing: retrieve a\n> default key from ssh-agent, 2021-09-10).\n>\n> * Add missing space between \"with\" and \"--python\" which was introduced\n> in commit bd0708c7eb (ref-filter: add %(raw) atom, 2021-07-26).\n>\n> * Fix unmatched single quote in 'builtin/index-pack.c' which was\n> introduced in commit 8737dab346 (index-pack: refactor renaming in\n> final(), 2021-09-09)\n>\n> [1] https://github.com/git-l10n/git-po/pull/567\n>\n> Reported-by: Emir Sarı \n> Reported-by: Jean-Noël Avila \n> Signed-off-by: Jiang Xin \n> ---\n> builtin/index-pack.c | 2 +-\n> gpg-interface.c | 2 +-\n> ref-filter.c | 2 +-\n> 3 files changed, 3 insertions(+), 3 deletions(-)\n\nAll three hunks look sensible.\n\nWill directly apply on 'master'.\n\nThanks. \n"},{"id":"440289","messageId":"7d9a893e-5dad-bd21-4ef7-6d47303abdc1@gmail.com","threadId":"56811","inReplyTo":"20211101021417.9549-1-worldhello.net@gmail.com","subject":"Re: [PATCH v2] i18n: fix typos found during l10n for git 2.34.0","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2021-11-02T10:17:22Z","receivedAt":"2021-11-02T10:17:46Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"> diff --git a/builtin/index-pack.c b/builtin/index-pack.c\n> index 15ae406e6b..c23d01de7d 100644\n> --- a/builtin/index-pack.c\n> +++ b/builtin/index-pack.c\n> @@ -1486,7 +1486,7 @@ static void rename_tmp_packfile(const char **final_name,\n> \t\tif (!*final_name)\n> \t\t\t*final_name = odb_pack_name(name, hash, ext);\n> \t\tif (finalize_object_file(curr_name, *final_name))\n> -\t\t\tdie(_(\"unable to rename temporary '*.%s' file to '%s\"),\n> +\t\t\tdie(_(\"unable to rename temporary '*.%s' file to '%s'\"),\n> \t\t\t ext, *final_name);\n> \t} else if (make_read_only_if_same) {\n> \t\tchmod(*final_name, 0444);\n> diff --git a/gpg-interface.c b/gpg-interface.c\n> index 800d8caa67..68d2f29be7 100644\n> --- a/gpg-interface.c\n> +++ b/gpg-interface.c\n> @@ -775,7 +775,7 @@ static const char *get_default_ssh_signing_key(void)\n> \t\tif (keys[0] && starts_with(keys[0]->buf, \"ssh-\")) {\n> \t\t\tdefault_key = strbuf_detach(keys[0], NULL);\n> \t\t} else {\n> -\t\t\twarning(_(\"gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s\"),\n> +\t\t\twarning(_(\"gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s\"),\n> \t\t\t\tkey_stderr.buf, key_stdout.buf);\n> \t\t}\n> \n\nLooks OK.\n\n> diff --git a/ref-filter.c b/ref-filter.c\n> index 282cdad103..08a3f839c9 100644\n> --- a/ref-filter.c\n> +++ b/ref-filter.c\n> @@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)\n> \t\t format->quote_style == QUOTE_TCL) &&\n> \t\t used_atom[at].atom_type == ATOM_RAW &&\n> \t\t used_atom[at].u.raw_data.option == RAW_BARE)\n> -\t\t\tdie(_(\"--format=%.*s cannot be used with\"\n> +\t\t\tdie(_(\"--format=%.*s cannot be used with \"\n> \t\t\t \"--python, --shell, --tcl\"), (int)(ep - sp - 2), sp + 2);\n> \t\tcp = ep + 1;\n> \n> \n\nWhy not using \\n?\n\n-- \nAn old man doll... just what I always wanted! - Clara\n"},{"id":"440290","messageId":"CAOLTT8Rv8jqWazJoKA0qTTRfQUxRny2b6XG+YsvXkT4D1xZ6_A@mail.gmail.com","threadId":"56811","inReplyTo":"20211031052156.5237-1-worldhello.net@gmail.com","subject":"Re: [PATCH] i18n: fix typos found during l10n for git 2.34.0","fromName":"ZheNing Hu","fromEmail":"adlternative@gmail.com","sentAt":"2021-11-02T11:28:45Z","receivedAt":"2021-11-02T11:29:13Z","isPatch":true,"sender":{"key":"adlternative@gmail.com","avatar":"https://avatars.githubusercontent.com/u/58138461?v=4"},"body":"Jiang Xin 于2021年10月31日周日 下午1:25写道：\n>\n> Emir reported typos in some i18n messages in the pull request[1] of\n> Turkish language l10n for git 2.34.0.\n>\n> * Use stable spelling for config variable \"gpg.ssh.defaultKeyCommand\".\n> * Add missing space between \"with\" and \"--python\".\n>\n> [1] https://github.com/git-l10n/git-po/pull/567\n>\n> Reported-by: Emir Sarı \n> Signed-off-by: Jiang Xin \n> ---\n> gpg-interface.c | 2 +-\n> ref-filter.c | 2 +-\n> 2 files changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/gpg-interface.c b/gpg-interface.c\n> index 800d8caa67..68d2f29be7 100644\n> --- a/gpg-interface.c\n> +++ b/gpg-interface.c\n> @@ -775,7 +775,7 @@ static const char *get_default_ssh_signing_key(void)\n> if (keys[0] && starts_with(keys[0]->buf, \"ssh-\")) {\n> default_key = strbuf_detach(keys[0], NULL);\n> } else {\n> - warning(_(\"gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s\"),\n> + warning(_(\"gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s\"),\n> key_stderr.buf, key_stdout.buf);\n> }\n>\n> diff --git a/ref-filter.c b/ref-filter.c\n> index 282cdad103..08a3f839c9 100644\n> --- a/ref-filter.c\n> +++ b/ref-filter.c\n> @@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)\n> format->quote_style == QUOTE_TCL) &&\n> used_atom[at].atom_type == ATOM_RAW &&\n> used_atom[at].u.raw_data.option == RAW_BARE)\n> - die(_(\"--format=%.*s cannot be used with\"\n> + die(_(\"--format=%.*s cannot be used with \"\n> \"--python, --shell, --tcl\"), (int)(ep - sp - 2), sp + 2);\n> cp = ep + 1;\n>\n\nIt is my negligence. Thanks.\n\n> --\n> 2.34.0.rc0.8.g1f511a9b56\n>\n\n--\nZheNing Hu\n"},{"id":"440381","messageId":"xmqqpmrh8atl.fsf@gitster.g","threadId":"56811","inReplyTo":"7d9a893e-5dad-bd21-4ef7-6d47303abdc1@gmail.com","subject":"Re: [PATCH v2] i18n: fix typos found during l10n for git 2.34.0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-03T16:26:30Z","receivedAt":"2021-11-03T16:33:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Bagas Sanjaya writes:\n\n>> diff --git a/ref-filter.c b/ref-filter.c\n>> index 282cdad103..08a3f839c9 100644\n>> --- a/ref-filter.c\n>> +++ b/ref-filter.c\n>> @@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)\n>> \t\t format->quote_style == QUOTE_TCL) &&\n>> \t\t used_atom[at].atom_type == ATOM_RAW &&\n>> \t\t used_atom[at].u.raw_data.option == RAW_BARE)\n>> -\t\t\tdie(_(\"--format=%.*s cannot be used with\"\n>> +\t\t\tdie(_(\"--format=%.*s cannot be used with \"\n>> \t\t\t \"--python, --shell, --tcl\"), (int)(ep - sp - 2), sp + 2);\n>> \t\tcp = ep + 1;\n>> \n>\n> Why not using \\n?\n\nIt is not quite clear to me why it should.\n\nAmong the possible string that is (ep - sp - 2) bytes long (i.e.\n--python, --shell, --tcl, --raw), even with the longest, the\nresulting message would become\n\n fatal: --format=--python cannot be used with\n --python, --shell, --tcl.\n\nthat is unusually short with such a newline in the middle.\n"},{"id":"440420","messageId":"CANYiYbE9=HZk2wD0u4uPGT9Mv2nZZis-s31fvG0QzhM7HmRisg@mail.gmail.com","threadId":"56811","inReplyTo":"xmqqpmrh8atl.fsf@gitster.g","subject":"Re: [PATCH v2] i18n: fix typos found during l10n for git 2.34.0","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2021-11-04T01:27:31Z","receivedAt":"2021-11-04T01:27:56Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"On Thu, Nov 4, 2021 at 12:26 AM Junio C Hamano wrote:\n>\n> Bagas Sanjaya writes:\n>\n> >> diff --git a/ref-filter.c b/ref-filter.c\n> >> index 282cdad103..08a3f839c9 100644\n> >> --- a/ref-filter.c\n> >> +++ b/ref-filter.c\n> >> @@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)\n> >> format->quote_style == QUOTE_TCL) &&\n> >> used_atom[at].atom_type == ATOM_RAW &&\n> >> used_atom[at].u.raw_data.option == RAW_BARE)\n> >> - die(_(\"--format=%.*s cannot be used with\"\n> >> + die(_(\"--format=%.*s cannot be used with \"\n> >> \"--python, --shell, --tcl\"), (int)(ep - sp - 2), sp + 2);\n> >> cp = ep + 1;\n> >>\n> >\n> > Why not using \\n?\n>\n> It is not quite clear to me why it should.\n>\n> Among the possible string that is (ep - sp - 2) bytes long (i.e.\n> --python, --shell, --tcl, --raw), even with the longest, the\n> resulting message would become\n>\n> fatal: --format=--python cannot be used with\n> --python, --shell, --tcl.\n>\n> that is unusually short with such a newline in the middle.\n\nIn order to detect typos in new i18n messages added upstream in time,\na new CI workflow has been added in the \"pot/CI\" branch. See:\n\n https://github.com/git-l10n/git-po/blob/pot/CI/.github/workflows/git-pot.yml\n\nThis workflow will be triggered several times a day, and changes of\ni18n messages will be saved as \"YYYY-mm-dd.diff\" in the following\nbranches:\n\n* https://github.com/git-l10n/git-po/tree/pot/master\n* https://github.com/git-l10n/git-po/tree/pot/next\n* https://github.com/git-l10n/git-po/tree/pot/seen\n\nL10n contributors can also refer to the \"po/git.pot\" file in the\n\"pot/master\" branch to prepare translations in advance.\n\n--\nJiang Xin\n"}]}