{"thread":{"id":"47300","subject":"[PATCH][l10n-fr] list translated to prune in command","startedAt":"2017-11-22T17:30:22Z","lastAt":"2017-11-22T20:39:35Z","messageCount":6,"participants":["Louis Bettens","Jonathan Nieder","Jean-Noël AVILA"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"333300","messageId":"20171122172440.15106-1-louis@bettens.info","threadId":"47300","inReplyTo":null,"subject":"[PATCH][l10n-fr] list translated to prune in command","fromName":"Louis Bettens","fromEmail":"louis@bettens.info","sentAt":"2017-11-22T17:24:39Z","receivedAt":"2017-11-22T17:30:22Z","isPatch":true,"sender":{"key":"louis@bettens.info","avatar":"https://avatars.githubusercontent.com/u/15657735?v=4"},"body":"\"$ git worktree\" when in a french locale shows an incorrect usage\nsummary. This comes down to this trivial issue in the i18n.\n\n\n"},{"id":"333301","messageId":"20171122172440.15106-2-louis@bettens.info","threadId":"47300","inReplyTo":"20171122172440.15106-1-louis@bettens.info","subject":"[PATCH] fix french translation","fromName":"Louis Bettens","fromEmail":"louis@bettens.info","sentAt":"2017-11-22T17:24:40Z","receivedAt":"2017-11-22T17:30:23Z","isPatch":true,"sender":{"key":"louis@bettens.info","avatar":"https://avatars.githubusercontent.com/u/15657735?v=4"},"body":"Signed-off-by: Louis Bettens \n---\n po/fr.po | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/po/fr.po b/po/fr.po\nindex 4deae3318..a12a2ae37 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -14331,7 +14331,7 @@ msgstr \"git worktree add [] []\"\n \n #: builtin/worktree.c:17\n msgid \"git worktree list []\"\n-msgstr \"git worktree prune []\"\n+msgstr \"git worktree list []\"\n \n #: builtin/worktree.c:18\n msgid \"git worktree lock [] \"\n-- \n2.15.0\n\n"},{"id":"333303","messageId":"1511372458.854.7@machaut.bettens.info","threadId":"47300","inReplyTo":"20171122172440.15106-2-louis@bettens.info","subject":"Re: [PATCH] fix french translation","fromName":"Louis Bettens","fromEmail":"louis@bettens.info","sentAt":"2017-11-22T17:40:58Z","receivedAt":"2017-11-22T17:41:07Z","isPatch":true,"sender":{"key":"louis@bettens.info","avatar":"https://avatars.githubusercontent.com/u/15657735?v=4"},"body":"Also it seems this is the only .po that has this particular quirk:\n\n$ grep -c \"worktree prune\" po/*.po\npo/bg.po:2\npo/ca.po:2\npo/de.po:2\npo/es.po:2\npo/fr.po:3 # outlier\npo/is.po:0\npo/it.po:0\npo/ko.po:2\npo/pt_PT.po:2\npo/ru.po:2\npo/sv.po:2\npo/vi.po:2\npo/zh_CN.po:2\n\nzero lines -> translation missing, OK\ntwo lines -> msgid and msgstr, OK\nthree lines -> something wrong. In this case, the present issue.\n\n\nLe mer 22 nov 2017 à 18:24, Louis Bettens a \nécrit :\n> Signed-off-by: Louis Bettens \n> ---\n> po/fr.po | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/po/fr.po b/po/fr.po\n> index 4deae3318..a12a2ae37 100644\n> --- a/po/fr.po\n> +++ b/po/fr.po\n> @@ -14331,7 +14331,7 @@ msgstr \"git worktree add [] \n> []\"\n> \n> #: builtin/worktree.c:17\n> msgid \"git worktree list []\"\n> -msgstr \"git worktree prune []\"\n> +msgstr \"git worktree list []\"\n> \n> #: builtin/worktree.c:18\n> msgid \"git worktree lock [] \"\n> --\n> 2.15.0\n> \n\n"},{"id":"333309","messageId":"20171122180236.GA11671@aiede.mtv.corp.google.com","threadId":"47300","inReplyTo":"20171122172440.15106-1-louis@bettens.info","subject":"Re: [PATCH][l10n-fr] list translated to prune in command","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2017-11-22T18:02:36Z","receivedAt":"2017-11-22T18:02:48Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nLouis Bettens wrote:\n\n> \"$ git worktree\" when in a french locale shows an incorrect usage\n> summary. This comes down to this trivial issue in the i18n.\n\nGood catch. This comes from v2.7.0-rc3~4^2~7^2~2^2 (l10n: fr v2.7.0\nround 1 (2477t), 2015-12-18).\n\nFor next time, you can send these three emails in a single email:\n\n\tSubject: l10n: fr.po: \"worktree list\" mistranslated as prune\n\n\t\"$ git worktree\" when in a french locale shows an incorrect usage\n\tsummary. This comes down to this trivial issue in the i18n.\n\n\tSigned-off-by: ...\n\t---\n\tAlso it seems this is the only .po that has this particular quirk:\n\n\t$ grep -c \"worktree prune\" po/*.po\n\tpo/bg.po:2\n\tpo/ca.po:2\n\tpo/de.po:2\n\tpo/es.po:2\n\tpo/fr.po:3 # outlier\n\tpo/is.po:0\n\tpo/it.po:0\n\tpo/ko.po:2\n\tpo/pt_PT.po:2\n\tpo/ru.po:2\n\tpo/sv.po:2\n\tpo/vi.po:2\n\tpo/zh_CN.po:2\n\n\tzero lines -> translation missing, OK\n\ttwo lines -> msgid and msgstr, OK\n\tthree lines -> something wrong. In this case, the present issue.\n\n\t po/fr.po | 2 +-\n\t 1 file changed, 1 insertion(+), 1 deletion(-)\n\n\tdiff --git a/po/fr.po b/po/fr.po\n\tindex 4deae3318..a12a2ae37 100644\n\t--- a/po/fr.po\n\t+++ b/po/fr.po\n[...]\n\nThat way, Jean-Noel Avila or Jiang Xin can apply the patch with a\nsingle \"git am\" command and the explanation (above the \"---\" line)\nshows up in \"git log\".\n\nI assume they can handle this one fine as-is. Just pointing it out\nfor the future.\n\nSee the DISCUSSION section in \"git help format-patch\" for more details.\n\nThanks,\nJonathan\n"},{"id":"333319","messageId":"3937091.4fae5A5SOV@cayenne","threadId":"47300","inReplyTo":"20171122172440.15106-2-louis@bettens.info","subject":"Re: [PATCH] fix french translation","fromName":"Jean-Noël AVILA","fromEmail":"jn.avila@free.fr","sentAt":"2017-11-22T20:17:28Z","receivedAt":"2017-11-22T20:17:36Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"On Wednesday, 22 November 2017 18:24:40 CET Louis Bettens wrote:\n> Signed-off-by: Louis Bettens \n> ---\n> po/fr.po | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/po/fr.po b/po/fr.po\n> index 4deae3318..a12a2ae37 100644\n> --- a/po/fr.po\n> +++ b/po/fr.po\n> @@ -14331,7 +14331,7 @@ msgstr \"git worktree add [] []\"\n> \n> #: builtin/worktree.c:17\n> msgid \"git worktree list []\"\n> -msgstr \"git worktree prune []\"\n> +msgstr \"git worktree list []\"\n> \n> #: builtin/worktree.c:18\n> msgid \"git worktree lock [] \"\n> \n\nGood catch! I guess the segment switched directly from fuzzy to translated.\n\nI'll queue it for the next version which we should not wait for long.\n\nThanks\n"},{"id":"333322","messageId":"1511383164.854.8@machaut.bettens.info","threadId":"47300","inReplyTo":"3937091.4fae5A5SOV@cayenne","subject":"Re: [PATCH] fix french translation","fromName":"Louis Bettens","fromEmail":"louis@bettens.info","sentAt":"2017-11-22T20:39:24Z","receivedAt":"2017-11-22T20:39:35Z","isPatch":true,"sender":{"key":"louis@bettens.info","avatar":"https://avatars.githubusercontent.com/u/15657735?v=4"},"body":"Thanks!\n\nBye\n\nLe mer 22 nov 2017 à 21:17, Jean-Noël AVILA a \nécrit :\n> On Wednesday, 22 November 2017 18:24:40 CET Louis Bettens wrote:\n>> Signed-off-by: Louis Bettens \n>> ---\n>> po/fr.po | 2 +-\n>> 1 file changed, 1 insertion(+), 1 deletion(-)\n>> \n>> diff --git a/po/fr.po b/po/fr.po\n>> index 4deae3318..a12a2ae37 100644\n>> --- a/po/fr.po\n>> +++ b/po/fr.po\n>> @@ -14331,7 +14331,7 @@ msgstr \"git worktree add [] \n>> []\"\n>> \n>> #: builtin/worktree.c:17\n>> msgid \"git worktree list []\"\n>> -msgstr \"git worktree prune []\"\n>> +msgstr \"git worktree list []\"\n>> \n>> #: builtin/worktree.c:18\n>> msgid \"git worktree lock [] \"\n>> \n> \n> Good catch! I guess the segment switched directly from fuzzy to \n> translated.\n> \n> I'll queue it for the next version which we should not wait for long.\n> \n> Thanks\n> \n\n"}]}