threads / patch / 55698

patchmerge: don't translate literal commands

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

## tl;dr

3 messages between May 15, 2021 and May 17, 2021. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Alex Henrie· May 15, 2021, 20:01 UTC · lore

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(-)

Show changes to builtin/merge.c +2 −2

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· May 16, 2021, 04:00 UTC · re: Alex Henrie · lore

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

Alex Henrie <alexhenrie24@gmail.com> writes:

Show 7 quoted lines

> 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.

Show 14 quoted lines

> 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· May 17, 2021, 16:49 UTC · re: Alex Henrie · lore

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

On 5/15/2021 4:01 PM, Alex Henrie wrote:

Show 20 quoted lines

> 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