| Message ID | 20210515200111.19912-1-alexhenrie24@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e26a60d624c6a2bf4f78f9ae2c42c64d237e5f84 |
| Headers | show |
| Series | merge: don't translate literal commands | expand |
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 > };
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
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 };
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(-)