Re: [PATCH] merge: don't translate literal commands
- From
Derrick Stolee <stolee@gmail.com>
- Date
- May 17, 2021, 16:49 UTC
- Message-ID
- <77314c35-281c-38af-c993-32a0c092b1cc@gmail.com>
- In-Reply-To
- <20210515200111.19912-1-alexhenrie24@gmail.com>
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