# [PATCH] merge: don't translate literal commands

3 messages from 2021-05-15 to 2021-05-17. Participants: Alex Henrie, Junio C Hamano, Derrick Stolee.
Thread: https://gitlist.dev/t/55698

## Alex Henrie, 2021-05-15 20:01

Subject: [PATCH] merge: don't translate literal commands
Message-ID: <20210515200111.19912-1-alexhenrie24@gmail.com>
URL: https://gitlist.dev/e/20210515200111.19912-1-alexhenrie24%40gmail.com

```
These strings have not been modified in any translation, nor should they
be.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
 builtin/merge.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/merge.c b/builtin/merge.c
index eddb8ae70d..a8a843b1f5 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -56,8 +56,8 @@ struct strategy {
 
 static const char * const builtin_merge_usage[] = {
 	N_("git merge [<options>] [<commit>...]"),
-	N_("git merge --abort"),
-	N_("git merge --continue"),
+	"git merge --abort",
+	"git merge --continue",
 	NULL
 };
 
-- 
2.31.1


```

## Junio C Hamano, 2021-05-16 04:00

Subject: Re: [PATCH] merge: don't translate literal commands
Message-ID: <xmqqfsyn72gr.fsf@gitster.g>
URL: https://gitlist.dev/e/xmqqfsyn72gr.fsf%40gitster.g
In-Reply-To: <20210515200111.19912-1-alexhenrie24@gmail.com>

```
Alex Henrie <alexhenrie24@gmail.com> writes:

> These strings have not been modified in any translation, nor should they
> be.
>
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
>  builtin/merge.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Looks correct.

I wish we could mark only parts of a single string for translation,
so that we can just ask translaters to translate "options" and
"commit", without having to teach them that "<>", "[]" and "..."
must be left intact because they have specific meanings as notation
(namely, "<>" are used to mark the words as placeholders, "[]" are
used to mark optional parts, and "..." means zero or more
repetitions).

Thanks.

> diff --git a/builtin/merge.c b/builtin/merge.c
> index eddb8ae70d..a8a843b1f5 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -56,8 +56,8 @@ struct strategy {
>  
>  static const char * const builtin_merge_usage[] = {
>  	N_("git merge [<options>] [<commit>...]"),
> -	N_("git merge --abort"),
> -	N_("git merge --continue"),
> +	"git merge --abort",
> +	"git merge --continue",
>  	NULL
>  };

```

## Derrick Stolee, 2021-05-17 16:49

Subject: Re: [PATCH] merge: don't translate literal commands
Message-ID: <77314c35-281c-38af-c993-32a0c092b1cc@gmail.com>
URL: https://gitlist.dev/e/77314c35-281c-38af-c993-32a0c092b1cc%40gmail.com
In-Reply-To: <20210515200111.19912-1-alexhenrie24@gmail.com>

```
On 5/15/2021 4:01 PM, Alex Henrie wrote:
> These strings have not been modified in any translation, nor should they
> be.
> 
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
>  builtin/merge.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/builtin/merge.c b/builtin/merge.c
> index eddb8ae70d..a8a843b1f5 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -56,8 +56,8 @@ struct strategy {
>  
>  static const char * const builtin_merge_usage[] = {
>  	N_("git merge [<options>] [<commit>...]"),
> -	N_("git merge --abort"),
> -	N_("git merge --continue"),
> +	"git merge --abort",
> +	"git merge --continue",

I just commented on your other patch wondering if there
were other examples that needed update. I think these
would be better suited to be grouped as a patch series
that describes the effort to remove unnecessary translation
as a unified whole.

Thanks,
-Stolee

```