* [PATCH][l10n-fr] list translated to prune in command
@ 2017-11-22 17:24 Louis Bettens
2017-11-22 17:24 ` [PATCH] fix french translation Louis Bettens
2017-11-22 18:02 ` [PATCH][l10n-fr] list translated to prune in command Jonathan Nieder
0 siblings, 2 replies; 6+ messages in thread
From: Louis Bettens @ 2017-11-22 17:24 UTC (permalink / raw)
To: git; +Cc: jn.avila, worldhello.net
"$ git worktree" when in a french locale shows an incorrect usage
summary. This comes down to this trivial issue in the i18n.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] fix french translation
2017-11-22 17:24 [PATCH][l10n-fr] list translated to prune in command Louis Bettens
@ 2017-11-22 17:24 ` Louis Bettens
2017-11-22 17:40 ` Louis Bettens
2017-11-22 20:17 ` Jean-Noël AVILA
2017-11-22 18:02 ` [PATCH][l10n-fr] list translated to prune in command Jonathan Nieder
1 sibling, 2 replies; 6+ messages in thread
From: Louis Bettens @ 2017-11-22 17:24 UTC (permalink / raw)
To: git; +Cc: jn.avila, worldhello.net, Louis Bettens
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] fix french translation
2017-11-22 17:24 ` [PATCH] fix french translation Louis Bettens
@ 2017-11-22 17:40 ` Louis Bettens
2017-11-22 20:17 ` Jean-Noël AVILA
1 sibling, 0 replies; 6+ messages in thread
From: Louis Bettens @ 2017-11-22 17:40 UTC (permalink / raw)
To: git; +Cc: jn.avila, worldhello.net
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 :
> 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][l10n-fr] list translated to prune in command
2017-11-22 17:24 [PATCH][l10n-fr] list translated to prune in command Louis Bettens
2017-11-22 17:24 ` [PATCH] fix french translation Louis Bettens
@ 2017-11-22 18:02 ` Jonathan Nieder
1 sibling, 0 replies; 6+ messages in thread
From: Jonathan Nieder @ 2017-11-22 18:02 UTC (permalink / raw)
To: Louis Bettens; +Cc: git, jn.avila, worldhello.net, Nicolas Cornu
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fix french translation
2017-11-22 17:24 ` [PATCH] fix french translation Louis Bettens
2017-11-22 17:40 ` Louis Bettens
@ 2017-11-22 20:17 ` Jean-Noël AVILA
2017-11-22 20:39 ` Louis Bettens
1 sibling, 1 reply; 6+ messages in thread
From: Jean-Noël AVILA @ 2017-11-22 20:17 UTC (permalink / raw)
To: Louis Bettens; +Cc: git, worldhello.net
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fix french translation
2017-11-22 20:17 ` Jean-Noël AVILA
@ 2017-11-22 20:39 ` Louis Bettens
0 siblings, 0 replies; 6+ messages in thread
From: Louis Bettens @ 2017-11-22 20:39 UTC (permalink / raw)
To: Jean-Noël AVILA; +Cc: git, worldhello.net
Thanks!
Bye
Le mer 22 nov 2017 à 21:17, Jean-Noël AVILA <jn.avila@free.fr> a
écrit :
> 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-11-22 20:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-22 17:24 [PATCH][l10n-fr] list translated to prune in command Louis Bettens
2017-11-22 17:24 ` [PATCH] fix french translation Louis Bettens
2017-11-22 17:40 ` Louis Bettens
2017-11-22 20:17 ` Jean-Noël AVILA
2017-11-22 20:39 ` Louis Bettens
2017-11-22 18:02 ` [PATCH][l10n-fr] list translated to prune in command Jonathan Nieder
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.