threads / patch / 47300

patch[l10n-fr] list translated to prune in command

Subject: [PATCH][l10n-fr] list translated to prune in command

## tl;dr

6 messages between Nov 22, 2017 and Nov 22, 2017. Diffs are folded; open one to read it.

replies: 5people: 3as markdown or json

Louis Bettens· Nov 22, 2017, 17:24 UTC · re: Louis Bettens · lore

[PATCH] fix french translation

Signed-off-by: Louis Bettens <louis@bettens.info>
---
 po/fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to po/fr.po +1 −1
diff --git a/po/fr.po b/po/fr.po
index 4deae3318..a12a2ae37 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14331,7 +14331,7 @@ msgstr "git worktree add [<options>] <chemin> [<branche>]"
 
 #: builtin/worktree.c:17
 msgid "git worktree list [<options>]"
-msgstr "git worktree prune [<options>]"
+msgstr "git worktree list [<options>]"
 
 #: builtin/worktree.c:18
 msgid "git worktree lock [<options>] <path>"

-- 
2.15.0
Louis Bettens· Nov 22, 2017, 17:40 UTC · re: Louis Bettens · lore

Re: [PATCH] fix french translation

Also it seems this is the only .po that has this particular quirk:

$ grep -c "worktree prune" po/*.po po/bg.po:2 po/ca.po:2 po/de.po:2 po/es.po:2 po/fr.po:3 # outlier po/is.po:0 po/it.po:0 po/ko.po:2 po/pt_PT.po:2 po/ru.po:2 po/sv.po:2 po/vi.po:2 po/zh_CN.po:2

zero lines -> translation missing, OK two lines -> msgid and msgstr, OK three lines -> something wrong. In this case, the present issue.

Le mer 22 nov 2017 à 18:24, Louis Bettens <louis@bettens.info> a écrit :

Show 22 quoted lines
> Signed-off-by: Louis Bettens <louis@bettens.info>
> ---
>  po/fr.po | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/po/fr.po b/po/fr.po
> index 4deae3318..a12a2ae37 100644
> --- a/po/fr.po
> +++ b/po/fr.po
> @@ -14331,7 +14331,7 @@ msgstr "git worktree add [<options>] <chemin> 
> [<branche>]"
> 
>  #: builtin/worktree.c:17
>  msgid "git worktree list [<options>]"
> -msgstr "git worktree prune [<options>]"
> +msgstr "git worktree list [<options>]"
> 
>  #: builtin/worktree.c:18
>  msgid "git worktree lock [<options>] <path>"
> --
> 2.15.0
>
Jean-Noël AVILA· Nov 22, 2017, 20:17 UTC · re: Louis Bettens · lore

Re: [PATCH] fix french translation

On Wednesday, 22 November 2017 18:24:40 CET Louis Bettens wrote:
Show 19 quoted lines
> Signed-off-by: Louis Bettens <louis@bettens.info>
> ---
>  po/fr.po | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/po/fr.po b/po/fr.po
> index 4deae3318..a12a2ae37 100644
> --- a/po/fr.po
> +++ b/po/fr.po
> @@ -14331,7 +14331,7 @@ msgstr "git worktree add [<options>] <chemin> [<branche>]"
>  
>  #: builtin/worktree.c:17
>  msgid "git worktree list [<options>]"
> -msgstr "git worktree prune [<options>]"
> +msgstr "git worktree list [<options>]"
>  
>  #: builtin/worktree.c:18
>  msgid "git worktree lock [<options>] <path>"
> 
Good catch! I guess the segment switched directly from fuzzy to translated.
I'll queue it for the next version which we should not wait for long.
Thanks
Louis Bettens· Nov 22, 2017, 20:39 UTC · re: Jean-Noël AVILA · lore

Re: [PATCH] fix french translation

Thanks!
Bye

Le mer 22 nov 2017 à 21:17, Jean-Noël AVILA <jn.avila@free.fr> a écrit :

Show 29 quoted lines
> On Wednesday, 22 November 2017 18:24:40 CET Louis Bettens wrote:
>>  Signed-off-by: Louis Bettens <louis@bettens.info>
>>  ---
>>   po/fr.po | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>>  diff --git a/po/fr.po b/po/fr.po
>>  index 4deae3318..a12a2ae37 100644
>>  --- a/po/fr.po
>>  +++ b/po/fr.po
>>  @@ -14331,7 +14331,7 @@ msgstr "git worktree add [<options>] 
>> <chemin> [<branche>]"
>> 
>>   #: builtin/worktree.c:17
>>   msgid "git worktree list [<options>]"
>>  -msgstr "git worktree prune [<options>]"
>>  +msgstr "git worktree list [<options>]"
>> 
>>   #: builtin/worktree.c:18
>>   msgid "git worktree lock [<options>] <path>"
>> 
> 
> Good catch! I guess the segment switched directly from fuzzy to 
> translated.
> 
> I'll queue it for the next version which we should not wait for long.
> 
> Thanks
>
Jonathan Nieder· Nov 22, 2017, 18:02 UTC · re: Louis Bettens · lore

Re: [PATCH][l10n-fr] list translated to prune in command

Hi,
Louis Bettens wrote:
> "$ git worktree" when in a french locale shows an incorrect usage
> summary.  This comes down to this trivial issue in the i18n.

Good catch. This comes from v2.7.0-rc3~4^2~7^2~2^2 (l10n: fr v2.7.0 round 1 (2477t), 2015-12-18).

For next time, you can send these three emails in a single email:
	Subject: l10n: fr.po: "worktree list" mistranslated as prune
	"$ git worktree" when in a french locale shows an incorrect usage
	summary.  This comes down to this trivial issue in the i18n.
	Signed-off-by: ...
	---
	Also it seems this is the only .po that has this particular quirk:
	$ grep -c "worktree prune" po/*.po
	po/bg.po:2
	po/ca.po:2
	po/de.po:2
	po/es.po:2
	po/fr.po:3  # outlier
	po/is.po:0
	po/it.po:0
	po/ko.po:2
	po/pt_PT.po:2
	po/ru.po:2
	po/sv.po:2
	po/vi.po:2
	po/zh_CN.po:2
	zero lines -> translation missing, OK
	two lines -> msgid and msgstr, OK
	three lines -> something wrong. In this case, the present issue.
	 po/fr.po | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)
	diff --git a/po/fr.po b/po/fr.po
	index 4deae3318..a12a2ae37 100644
	--- a/po/fr.po
	+++ b/po/fr.po
[...]

That way, Jean-Noel Avila or Jiang Xin can apply the patch with a single "git am" command and the explanation (above the "---" line) shows up in "git log".

I assume they can handle this one fine as-is. Just pointing it out for the future.

See the DISCUSSION section in "git help format-patch" for more details.

Thanks, Jonathan

← back to recent threads