threads / discuss / 56811

[L10N] Kickoff for Git 2.34.0 round #1

Subject: [L10N] Kickoff for Git 2.34.0 round #1

## tl;dr

8 messages between Oct 30, 2021 and Nov 4, 2021.

replies: 7people: 4as markdown or json

Jiang Xin· Oct 30, 2021, 02:09 UTC · lore
Hi,

Git v2.34.0-rc0 has been released, and it's time to start new round of git l10n. This time there are 134 updated messages need to be translated since last update. Let's start a new round of git l10n based on this commit:

    l10n: git.pot: v2.34.0 round 1 (134 new, 154 removed)
    
    Generate po/git.pot from v2.34.0-rc0 for git v2.34.0 l10n round 1.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
You can get it from the usual place:
    https://github.com/git-l10n/git-po/

As how to update your XX.po and help to translate Git, please see "Updating a XX.po file" and other sections in "po/README" file.

There is a helper program hosted on https://github.com/git-l10n/git-po-helper for git l10n coordinator and git l10n contributors to verify their commits.

-- Jiang Xin

Jiang Xin· Oct 31, 2021, 05:21 UTC · re: Jiang Xin · lore

[PATCH] i18n: fix typos found during l10n for git 2.34.0

Emir reported typos in some i18n messages in the pull request[1] of Turkish language l10n for git 2.34.0.

* Use stable spelling for config variable "gpg.ssh.defaultKeyCommand".
* Add missing space between "with" and "--python".
[1] https://github.com/git-l10n/git-po/pull/567
Reported-by: Emir Sarı <bitigchi@me.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 gpg-interface.c | 2 +-
 ref-filter.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gpg-interface.c b/gpg-interface.c
index 800d8caa67..68d2f29be7 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -775,7 +775,7 @@ static const char *get_default_ssh_signing_key(void)
 		if (keys[0] && starts_with(keys[0]->buf, "ssh-")) {
 			default_key = strbuf_detach(keys[0], NULL);
 		} else {
-			warning(_("gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"),
+			warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"),
 				key_stderr.buf, key_stdout.buf);
 		}
 
diff --git a/ref-filter.c b/ref-filter.c
index 282cdad103..08a3f839c9 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)
 		     format->quote_style == QUOTE_TCL) &&
 		     used_atom[at].atom_type == ATOM_RAW &&
 		     used_atom[at].u.raw_data.option == RAW_BARE)
-			die(_("--format=%.*s cannot be used with"
+			die(_("--format=%.*s cannot be used with "
 			      "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
 		cp = ep + 1;
 
-- 
2.34.0.rc0.8.g1f511a9b56
Jiang Xin· Nov 1, 2021, 02:14 UTC · re: Jiang Xin · lore

[PATCH v2] i18n: fix typos found during l10n for git 2.34.0

Emir and Jean-Noël reported typos in some i18n messages when preparing l10n for git 2.34.0.

* Fix unstable spelling of config variable "gpg.ssh.defaultKeyCommand"
  which was introduced in commit fd9e226776 (ssh signing: retrieve a
  default key from ssh-agent, 2021-09-10).
* Add missing space between "with" and "--python" which was introduced
  in commit bd0708c7eb (ref-filter: add %(raw) atom, 2021-07-26).
* Fix unmatched single quote in 'builtin/index-pack.c' which was
  introduced in commit 8737dab346 (index-pack: refactor renaming in
  final(), 2021-09-09)
[1] https://github.com/git-l10n/git-po/pull/567
Reported-by: Emir Sarı <bitigchi@me.com>
Reported-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 builtin/index-pack.c | 2 +-
 gpg-interface.c      | 2 +-
 ref-filter.c         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 15ae406e6b..c23d01de7d 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1486,7 +1486,7 @@ static void rename_tmp_packfile(const char **final_name,
 		if (!*final_name)
 			*final_name = odb_pack_name(name, hash, ext);
 		if (finalize_object_file(curr_name, *final_name))
-			die(_("unable to rename temporary '*.%s' file to '%s"),
+			die(_("unable to rename temporary '*.%s' file to '%s'"),
 			    ext, *final_name);
 	} else if (make_read_only_if_same) {
 		chmod(*final_name, 0444);
diff --git a/gpg-interface.c b/gpg-interface.c
index 800d8caa67..68d2f29be7 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -775,7 +775,7 @@ static const char *get_default_ssh_signing_key(void)
 		if (keys[0] && starts_with(keys[0]->buf, "ssh-")) {
 			default_key = strbuf_detach(keys[0], NULL);
 		} else {
-			warning(_("gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"),
+			warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"),
 				key_stderr.buf, key_stdout.buf);
 		}
 
diff --git a/ref-filter.c b/ref-filter.c
index 282cdad103..08a3f839c9 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)
 		     format->quote_style == QUOTE_TCL) &&
 		     used_atom[at].atom_type == ATOM_RAW &&
 		     used_atom[at].u.raw_data.option == RAW_BARE)
-			die(_("--format=%.*s cannot be used with"
+			die(_("--format=%.*s cannot be used with "
 			      "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
 		cp = ep + 1;
 
-- 
2.34.0.rc0.8.g1f511a9b56
Junio C Hamano· Nov 1, 2021, 05:51 UTC · re: Jiang Xin · lore

Re: [PATCH v2] i18n: fix typos found during l10n for git 2.34.0

Jiang Xin <worldhello.net@gmail.com> writes:
Show 24 quoted lines
> Emir and Jean-Noël reported typos in some i18n messages when preparing
> l10n for git 2.34.0.
>
> * Fix unstable spelling of config variable "gpg.ssh.defaultKeyCommand"
>   which was introduced in commit fd9e226776 (ssh signing: retrieve a
>   default key from ssh-agent, 2021-09-10).
>
> * Add missing space between "with" and "--python" which was introduced
>   in commit bd0708c7eb (ref-filter: add %(raw) atom, 2021-07-26).
>
> * Fix unmatched single quote in 'builtin/index-pack.c' which was
>   introduced in commit 8737dab346 (index-pack: refactor renaming in
>   final(), 2021-09-09)
>
> [1] https://github.com/git-l10n/git-po/pull/567
>
> Reported-by: Emir Sarı <bitigchi@me.com>
> Reported-by: Jean-Noël Avila <jn.avila@free.fr>
> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
> ---
>  builtin/index-pack.c | 2 +-
>  gpg-interface.c      | 2 +-
>  ref-filter.c         | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
All three hunks look sensible.
Will directly apply on 'master'.
Thanks.  
Bagas Sanjaya· Nov 2, 2021, 10:17 UTC · re: Jiang Xin · lore

Re: [PATCH v2] i18n: fix typos found during l10n for git 2.34.0

Show 26 quoted lines
> diff --git a/builtin/index-pack.c b/builtin/index-pack.c
> index 15ae406e6b..c23d01de7d 100644
> --- a/builtin/index-pack.c
> +++ b/builtin/index-pack.c
> @@ -1486,7 +1486,7 @@ static void rename_tmp_packfile(const char **final_name,
>   		if (!*final_name)
>   			*final_name = odb_pack_name(name, hash, ext);
>   		if (finalize_object_file(curr_name, *final_name))
> -			die(_("unable to rename temporary '*.%s' file to '%s"),
> +			die(_("unable to rename temporary '*.%s' file to '%s'"),
>   			    ext, *final_name);
>   	} else if (make_read_only_if_same) {
>   		chmod(*final_name, 0444);
> diff --git a/gpg-interface.c b/gpg-interface.c
> index 800d8caa67..68d2f29be7 100644
> --- a/gpg-interface.c
> +++ b/gpg-interface.c
> @@ -775,7 +775,7 @@ static const char *get_default_ssh_signing_key(void)
>   		if (keys[0] && starts_with(keys[0]->buf, "ssh-")) {
>   			default_key = strbuf_detach(keys[0], NULL);
>   		} else {
> -			warning(_("gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"),
> +			warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"),
>   				key_stderr.buf, key_stdout.buf);
>   		}
>   
Looks OK.
Show 14 quoted lines
> diff --git a/ref-filter.c b/ref-filter.c
> index 282cdad103..08a3f839c9 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)
>   		     format->quote_style == QUOTE_TCL) &&
>   		     used_atom[at].atom_type == ATOM_RAW &&
>   		     used_atom[at].u.raw_data.option == RAW_BARE)
> -			die(_("--format=%.*s cannot be used with"
> +			die(_("--format=%.*s cannot be used with "
>   			      "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
>   		cp = ep + 1;
>   
> 
Why not using \n?
-- 
An old man doll... just what I always wanted! - Clara
Junio C Hamano· Nov 3, 2021, 16:26 UTC · re: Bagas Sanjaya · lore

Re: [PATCH v2] i18n: fix typos found during l10n for git 2.34.0

Bagas Sanjaya <bagasdotme@gmail.com> writes:
Show 15 quoted lines
>> diff --git a/ref-filter.c b/ref-filter.c
>> index 282cdad103..08a3f839c9 100644
>> --- a/ref-filter.c
>> +++ b/ref-filter.c
>> @@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)
>>   		     format->quote_style == QUOTE_TCL) &&
>>   		     used_atom[at].atom_type == ATOM_RAW &&
>>   		     used_atom[at].u.raw_data.option == RAW_BARE)
>> -			die(_("--format=%.*s cannot be used with"
>> +			die(_("--format=%.*s cannot be used with "
>>   			      "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
>>   		cp = ep + 1;
>>   
>
> Why not using \n?
It is not quite clear to me why it should.

Among the possible string that is (ep - sp - 2) bytes long (i.e. --python, --shell, --tcl, --raw), even with the longest, the resulting message would become

    fatal: --format=--python cannot be used with
    --python, --shell, --tcl.
that is unusually short with such a newline in the middle.
Jiang Xin· Nov 4, 2021, 01:27 UTC · re: Junio C Hamano · lore

Re: [PATCH v2] i18n: fix typos found during l10n for git 2.34.0

On Thu, Nov 4, 2021 at 12:26 AM Junio C Hamano <gitster@pobox.com> wrote:
Show 29 quoted lines
>
> Bagas Sanjaya <bagasdotme@gmail.com> writes:
>
> >> diff --git a/ref-filter.c b/ref-filter.c
> >> index 282cdad103..08a3f839c9 100644
> >> --- a/ref-filter.c
> >> +++ b/ref-filter.c
> >> @@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)
> >>                   format->quote_style == QUOTE_TCL) &&
> >>                   used_atom[at].atom_type == ATOM_RAW &&
> >>                   used_atom[at].u.raw_data.option == RAW_BARE)
> >> -                    die(_("--format=%.*s cannot be used with"
> >> +                    die(_("--format=%.*s cannot be used with "
> >>                            "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
> >>              cp = ep + 1;
> >>
> >
> > Why not using \n?
>
> It is not quite clear to me why it should.
>
> Among the possible string that is (ep - sp - 2) bytes long (i.e.
> --python, --shell, --tcl, --raw), even with the longest, the
> resulting message would become
>
>     fatal: --format=--python cannot be used with
>     --python, --shell, --tcl.
>
> that is unusually short with such a newline in the middle.

In order to detect typos in new i18n messages added upstream in time, a new CI workflow has been added in the "pot/CI" branch. See:

    https://github.com/git-l10n/git-po/blob/pot/CI/.github/workflows/git-pot.yml

This workflow will be triggered several times a day, and changes of i18n messages will be saved as "YYYY-mm-dd.diff" in the following branches:

* https://github.com/git-l10n/git-po/tree/pot/master
* https://github.com/git-l10n/git-po/tree/pot/next
* https://github.com/git-l10n/git-po/tree/pot/seen

L10n contributors can also refer to the "po/git.pot" file in the "pot/master" branch to prepare translations in advance.

-- Jiang Xin

ZheNing Hu· Nov 2, 2021, 11:28 UTC · re: Jiang Xin · lore

Re: [PATCH] i18n: fix typos found during l10n for git 2.34.0

Jiang Xin <worldhello.net@gmail.com> 于2021年10月31日周日 下午1:25写道:
Show 42 quoted lines
>
> Emir reported typos in some i18n messages in the pull request[1] of
> Turkish language l10n for git 2.34.0.
>
> * Use stable spelling for config variable "gpg.ssh.defaultKeyCommand".
> * Add missing space between "with" and "--python".
>
> [1] https://github.com/git-l10n/git-po/pull/567
>
> Reported-by: Emir Sarı <bitigchi@me.com>
> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
> ---
>  gpg-interface.c | 2 +-
>  ref-filter.c    | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gpg-interface.c b/gpg-interface.c
> index 800d8caa67..68d2f29be7 100644
> --- a/gpg-interface.c
> +++ b/gpg-interface.c
> @@ -775,7 +775,7 @@ static const char *get_default_ssh_signing_key(void)
>                 if (keys[0] && starts_with(keys[0]->buf, "ssh-")) {
>                         default_key = strbuf_detach(keys[0], NULL);
>                 } else {
> -                       warning(_("gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"),
> +                       warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"),
>                                 key_stderr.buf, key_stdout.buf);
>                 }
>
> diff --git a/ref-filter.c b/ref-filter.c
> index 282cdad103..08a3f839c9 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)
>                      format->quote_style == QUOTE_TCL) &&
>                      used_atom[at].atom_type == ATOM_RAW &&
>                      used_atom[at].u.raw_data.option == RAW_BARE)
> -                       die(_("--format=%.*s cannot be used with"
> +                       die(_("--format=%.*s cannot be used with "
>                               "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
>                 cp = ep + 1;
>
It is my negligence. Thanks.
> --
> 2.34.0.rc0.8.g1f511a9b56
>

-- ZheNing Hu

← back to recent threads