{"thread":{"id":"55698","subject":"[PATCH] merge: don't translate literal commands","startedAt":"2021-05-15T20:01:27Z","lastAt":"2021-05-17T16:51:41Z","messageCount":3,"participants":["Alex Henrie","Junio C Hamano","Derrick Stolee"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"424663","messageId":"20210515200111.19912-1-alexhenrie24@gmail.com","threadId":"55698","inReplyTo":null,"subject":"[PATCH] merge: don't translate literal commands","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2021-05-15T20:01:11Z","receivedAt":"2021-05-15T20:01:27Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"These strings have not been modified in any translation, nor should they\nbe.\n\nSigned-off-by: Alex Henrie <alexhenrie24@gmail.com>\n---\n builtin/merge.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex eddb8ae70d..a8a843b1f5 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -56,8 +56,8 @@ struct strategy {\n \n static const char * const builtin_merge_usage[] = {\n \tN_(\"git merge [<options>] [<commit>...]\"),\n-\tN_(\"git merge --abort\"),\n-\tN_(\"git merge --continue\"),\n+\t\"git merge --abort\",\n+\t\"git merge --continue\",\n \tNULL\n };\n \n-- \n2.31.1\n\n"},{"id":"424672","messageId":"xmqqfsyn72gr.fsf@gitster.g","threadId":"55698","inReplyTo":"20210515200111.19912-1-alexhenrie24@gmail.com","subject":"Re: [PATCH] merge: don't translate literal commands","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-05-16T04:00:04Z","receivedAt":"2021-05-16T04:00:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alex Henrie <alexhenrie24@gmail.com> writes:\n\n> These strings have not been modified in any translation, nor should they\n> be.\n>\n> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>\n> ---\n>  builtin/merge.c | 4 ++--\n>  1 file changed, 2 insertions(+), 2 deletions(-)\n\nLooks correct.\n\nI wish we could mark only parts of a single string for translation,\nso that we can just ask translaters to translate \"options\" and\n\"commit\", without having to teach them that \"<>\", \"[]\" and \"...\"\nmust be left intact because they have specific meanings as notation\n(namely, \"<>\" are used to mark the words as placeholders, \"[]\" are\nused to mark optional parts, and \"...\" means zero or more\nrepetitions).\n\nThanks.\n\n> diff --git a/builtin/merge.c b/builtin/merge.c\n> index eddb8ae70d..a8a843b1f5 100644\n> --- a/builtin/merge.c\n> +++ b/builtin/merge.c\n> @@ -56,8 +56,8 @@ struct strategy {\n>  \n>  static const char * const builtin_merge_usage[] = {\n>  \tN_(\"git merge [<options>] [<commit>...]\"),\n> -\tN_(\"git merge --abort\"),\n> -\tN_(\"git merge --continue\"),\n> +\t\"git merge --abort\",\n> +\t\"git merge --continue\",\n>  \tNULL\n>  };\n"},{"id":"424764","messageId":"77314c35-281c-38af-c993-32a0c092b1cc@gmail.com","threadId":"55698","inReplyTo":"20210515200111.19912-1-alexhenrie24@gmail.com","subject":"Re: [PATCH] merge: don't translate literal commands","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2021-05-17T16:49:56Z","receivedAt":"2021-05-17T16:51:41Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 5/15/2021 4:01 PM, Alex Henrie wrote:\n> These strings have not been modified in any translation, nor should they\n> be.\n> \n> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>\n> ---\n>  builtin/merge.c | 4 ++--\n>  1 file changed, 2 insertions(+), 2 deletions(-)\n> \n> diff --git a/builtin/merge.c b/builtin/merge.c\n> index eddb8ae70d..a8a843b1f5 100644\n> --- a/builtin/merge.c\n> +++ b/builtin/merge.c\n> @@ -56,8 +56,8 @@ struct strategy {\n>  \n>  static const char * const builtin_merge_usage[] = {\n>  \tN_(\"git merge [<options>] [<commit>...]\"),\n> -\tN_(\"git merge --abort\"),\n> -\tN_(\"git merge --continue\"),\n> +\t\"git merge --abort\",\n> +\t\"git merge --continue\",\n\nI just commented on your other patch wondering if there\nwere other examples that needed update. I think these\nwould be better suited to be grouped as a patch series\nthat describes the effort to remove unnecessary translation\nas a unified whole.\n\nThanks,\n-Stolee\n"}]}