[L10N] Kickoff for Git 2.34.0 round #1

5 messages, 3 authors, 2021-11-02 · open the first message on its own page

[L10N] Kickoff for Git 2.34.0 round #1

From: Jiang Xin <hidden>
Date: 2021-10-30 02:09:39

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 [off-list ref]

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

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

From: Jiang Xin <hidden>
Date: 2021-10-31 05:22:17

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ı <redacted>
Signed-off-by: Jiang Xin <redacted>
---
 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

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

From: Jiang Xin <hidden>
Date: 2021-11-01 02:14:43

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ı <redacted>
Reported-by: Jean-Noël Avila <redacted>
Signed-off-by: Jiang Xin <redacted>
---
 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

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

From: Bagas Sanjaya <hidden>
Date: 2021-11-02 10:17:46

quoted hunk

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.

quoted hunk

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

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

From: ZheNing Hu <hidden>
Date: 2021-11-02 11:29:13

Jiang Xin [off-list ref] 于2021年10月31日周日 下午1:25写道：

quoted hunk

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ı <redacted>
Signed-off-by: Jiang Xin <redacted>
---
 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

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help