* [PATCH] merge: don't translate literal commands
@ 2021-05-15 20:01 Alex Henrie
2021-05-16 4:00 ` Junio C Hamano
2021-05-17 16:49 ` Derrick Stolee
0 siblings, 2 replies; 3+ messages in thread
From: Alex Henrie @ 2021-05-15 20:01 UTC (permalink / raw)
To: git, pclouds, judge.packham, gitster; +Cc: Alex Henrie
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] merge: don't translate literal commands
2021-05-15 20:01 [PATCH] merge: don't translate literal commands Alex Henrie
@ 2021-05-16 4:00 ` Junio C Hamano
2021-05-17 16:49 ` Derrick Stolee
1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2021-05-16 4:00 UTC (permalink / raw)
To: Alex Henrie; +Cc: git, pclouds, judge.packham
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
> };
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] merge: don't translate literal commands
2021-05-15 20:01 [PATCH] merge: don't translate literal commands Alex Henrie
2021-05-16 4:00 ` Junio C Hamano
@ 2021-05-17 16:49 ` Derrick Stolee
1 sibling, 0 replies; 3+ messages in thread
From: Derrick Stolee @ 2021-05-17 16:49 UTC (permalink / raw)
To: Alex Henrie, git, pclouds, judge.packham, gitster
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-17 16:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-15 20:01 [PATCH] merge: don't translate literal commands Alex Henrie
2021-05-16 4:00 ` Junio C Hamano
2021-05-17 16:49 ` Derrick Stolee
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).