[PATCH] merge: don't translate literal commands

From: Alex Henrie <hidden>
Date: 2021-05-15 20:01:27

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

Signed-off-by: Alex Henrie <redacted>
---
 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

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

From: Derrick Stolee <hidden>
Date: 2021-05-17 16:51:41

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

quoted hunk

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

Signed-off-by: Alex Henrie <redacted>
---
 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

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help