{"thread":{"id":"48829","subject":"Two small l10n/i18n patches (resend)","startedAt":"2018-07-04T15:44:18Z","lastAt":"2018-07-06T19:14:28Z","messageCount":5,"participants":["Raphaël Hertzog","Jean-Noël Avila","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"351696","messageId":"20180704154357.26964-1-hertzog@debian.org","threadId":"48829","inReplyTo":null,"subject":"Two small l10n/i18n patches (resend)","fromName":"Raphaël Hertzog","fromEmail":"hertzog@debian.org","sentAt":"2018-07-04T15:43:55Z","receivedAt":"2018-07-04T15:44:18Z","isPatch":false,"sender":{"key":"hertzog@debian.org","avatar":"https://avatars.githubusercontent.com/u/1013915?v=4"},"body":"(I'm not subscribed, please keep me in CC. Resending as suggested by Duy\nNguyen in the hope that my patches get picked this time)\n\nHello,\n\nI was reviewing the output of \"git bisect\" with my French locale\nand I saw a clear mistake in the French translation (fixed\nin the first commit) and I also noticed that the last message\nwas still in English. After review of the code, it's not a missing\ntranslation, the problem comes down to two strings which\nare not marked for translation.\n\nSo the second commit marks those strings for translation. I ensured\nthat \"make test\" is still working after those two commits.\n\nThank you for considering my patches. I leave it to the regular\ntranslators to add translations for the newly added strings.\n\nCheers,\n Raphael Hertzog.\n\n"},{"id":"351697","messageId":"20180704154357.26964-2-hertzog@debian.org","threadId":"48829","inReplyTo":"20180704154357.26964-1-hertzog@debian.org","subject":"[PATCH 1/2] l10n: fr: fix a message seen in git bisect","fromName":"Raphaël Hertzog","fromEmail":"hertzog@debian.org","sentAt":"2018-07-04T15:43:56Z","receivedAt":"2018-07-04T15:44:28Z","isPatch":true,"sender":{"key":"hertzog@debian.org","avatar":"https://avatars.githubusercontent.com/u/1013915?v=4"},"body":"\"cette\" can be only be used before a word (like in \"cette bouteille\" for\n\"this bottle\"), but here \"this\" refers to the current step and we have\nto use \"ceci\" in French.\n\nSigned-off-by: Raphaël Hertzog \n---\n po/fr.po | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/po/fr.po b/po/fr.po\nindex 2bae75360..eb760686a 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -1062,8 +1062,8 @@ msgstr[1] \"(à peu près %d étapes)\"\n #, c-format\n msgid \"Bisecting: %d revision left to test after this %s\\n\"\n msgid_plural \"Bisecting: %d revisions left to test after this %s\\n\"\n-msgstr[0] \"Bissection : %d révision à tester après cette %s\\n\"\n-msgstr[1] \"Bissection : %d révisions à tester après cette %s\\n\"\n+msgstr[0] \"Bissection : %d révision à tester après ceci %s\\n\"\n+msgstr[1] \"Bissection : %d révisions à tester après ceci %s\\n\"\n \n #: blame.c:1756\n msgid \"--contents and --reverse do not blend well.\"\n-- \n2.18.0\n\n"},{"id":"351698","messageId":"20180704154357.26964-3-hertzog@debian.org","threadId":"48829","inReplyTo":"20180704154357.26964-1-hertzog@debian.org","subject":"[PATCH 2/2] i18n: bisect: mark three supplementary strings for translation","fromName":"Raphaël Hertzog","fromEmail":"hertzog@debian.org","sentAt":"2018-07-04T15:43:57Z","receivedAt":"2018-07-04T15:44:34Z","isPatch":true,"sender":{"key":"hertzog@debian.org","avatar":"https://avatars.githubusercontent.com/u/1013915?v=4"},"body":"The whole bisect procedure is translated but the last message that the\nuser will see in the process is not translated. Let's fix this.\n\nAlso mark the \"revision walk setup failed\" error message for\ntranslation. It's already used in other files so will not generate\nany new string to translate.\n\nSigned-off-by: Raphaël Hertzog \n---\n bisect.c | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/bisect.c b/bisect.c\nindex 6de1abd40..678df54cc 100644\n--- a/bisect.c\n+++ b/bisect.c\n@@ -653,7 +653,7 @@ static void bisect_rev_setup(struct rev_info *revs, const char *prefix,\n static void bisect_common(struct rev_info *revs)\n {\n \tif (prepare_revision_walk(revs))\n-\t\tdie(\"revision walk setup failed\");\n+\t\tdie(_(\"revision walk setup failed\"));\n \tif (revs->tree_objects)\n \t\tmark_edges_uninteresting(revs, NULL);\n }\n@@ -664,8 +664,8 @@ static void exit_if_skipped_commits(struct commit_list *tried,\n \tif (!tried)\n \t\treturn;\n \n-\tprintf(\"There are only 'skip'ped commits left to test.\\n\"\n-\t \"The first %s commit could be any of:\\n\", term_bad);\n+\tprintf(_(\"There are only 'skip'ped commits left to test.\\n\"\n+\t\t \"The first %s commit could be any of:\\n\"), term_bad);\n \n \tfor ( ; tried; tried = tried->next)\n \t\tprintf(\"%s\\n\", oid_to_hex(&tried->item->object.oid));\n@@ -990,7 +990,7 @@ int bisect_next_all(const char *prefix, int no_checkout)\n \n \tif (!oidcmp(bisect_rev, current_bad_oid)) {\n \t\texit_if_skipped_commits(tried, current_bad_oid);\n-\t\tprintf(\"%s is the first %s commit\\n\", oid_to_hex(bisect_rev),\n+\t\tprintf(_(\"%s is the first %s commit\\n\"), oid_to_hex(bisect_rev),\n \t\t\tterm_bad);\n \t\tshow_diff_tree(prefix, revs.commits->item);\n \t\t/* This means the bisection process succeeded. */\n-- \n2.18.0\n\n"},{"id":"351699","messageId":"e5233798-eefc-5c8d-937b-659726ab2a6a@free.fr","threadId":"48829","inReplyTo":"20180704154357.26964-2-hertzog@debian.org","subject":"Re: [PATCH 1/2] l10n: fr: fix a message seen in git bisect","fromName":"Jean-Noël Avila","fromEmail":"jn.avila@free.fr","sentAt":"2018-07-04T15:45:52Z","receivedAt":"2018-07-04T15:46:02Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"OK, Will queue this patch for next round of translation\n"},{"id":"351792","messageId":"xmqqd0w0kwhd.fsf@gitster-ct.c.googlers.com","threadId":"48829","inReplyTo":"e5233798-eefc-5c8d-937b-659726ab2a6a@free.fr","subject":"Re: [PATCH 1/2] l10n: fr: fix a message seen in git bisect","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-06T19:14:22Z","receivedAt":"2018-07-06T19:14:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jean-Noël Avila writes:\n\n> OK, Will queue this patch for next round of translation\n\nThanks for an Ack.\n"}]}