From: Junio C Hamano <gitster@pobox.com>
To: Michael J Gruber <git@grubix.eu>
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood123@gmail.com>
Subject: Re: [PATCH 4/4] po: adjust README to code
Date: Thu, 18 Aug 2022 13:36:42 -0700 [thread overview]
Message-ID: <xmqqilmpnvad.fsf@gitster.g> (raw)
In-Reply-To: <e163c87b3efc1571cb3657df6459583af92f9f2b.1660828108.git.git@grubix.eu> (Michael J. Gruber's message of "Thu, 18 Aug 2022 15:13:29 +0200")
Michael J Gruber <git@grubix.eu> writes:
> When we talk about sequencer action names as such (as opposed to command
> names) we do translate the action name. Adjust the po README to reflect
> this and to match the code base.
>
> Signed-off-by: Michael J Gruber <git@grubix.eu>
> ---
> po/README.md | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/po/README.md b/po/README.md
> index 3e4f897d93..90b8455401 100644
> --- a/po/README.md
> +++ b/po/README.md
> @@ -273,7 +273,7 @@ General advice:
>
> ```c
> /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
> - die(_("%s: Unable to write new index file"), action_name(opts));
> + die(_("%s: Unable to write new index file"), _(action_name(opts)));
> ```
While "revert" and "cherry-pick" may have localized words in our po/
dictionary, the message uses "%s:" placeholder to identify the Git
operation that is reporting the problem, and the way the end-user
who is getting the message triggered the Git operation was by
running a subcommand of "git", isn't it?
Isn't it confusing for a user who typed "git revert" to see an error
from _("revert")? _("Unable to write new index file") is perfectly
fine, though.
next prev parent reply other threads:[~2022-08-18 20:37 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-12 15:38 [RFC/PATCH] sequencer: do not translate reflog messages Michael J Gruber
2022-08-12 17:21 ` Junio C Hamano
2022-08-12 19:21 ` Phillip Wood
2022-08-12 20:43 ` Junio C Hamano
2022-08-15 20:20 ` Johannes Schindelin
2022-08-16 8:59 ` Phillip Wood
2022-08-16 11:02 ` Johannes Schindelin
2022-08-18 13:13 ` [PATCH 0/4] sequencer: clarify translations Michael J Gruber
2022-08-18 13:13 ` [PATCH 1/4] sequencer: do not translate reflog messages Michael J Gruber
2022-08-18 14:55 ` Ævar Arnfjörð Bjarmason
2022-08-19 9:25 ` Johannes Schindelin
2022-08-19 15:12 ` Ævar Arnfjörð Bjarmason
2022-08-19 20:44 ` Junio C Hamano
2022-08-19 21:13 ` Ævar Arnfjörð Bjarmason
2022-08-19 22:42 ` Junio C Hamano
2022-08-19 23:33 ` Ævar Arnfjörð Bjarmason
2022-08-20 8:56 ` Jeff King
2022-08-20 21:20 ` Junio C Hamano
2022-08-18 13:13 ` [PATCH 2/4] sequencer: do not translate parameters to error_resolve_conflict() Michael J Gruber
2022-08-18 15:01 ` Ævar Arnfjörð Bjarmason
2022-08-18 15:23 ` Michael J Gruber
2022-08-18 20:30 ` Junio C Hamano
2022-08-19 9:26 ` Johannes Schindelin
2022-08-19 17:36 ` Junio C Hamano
2022-08-22 13:53 ` Johannes Schindelin
2022-08-22 16:12 ` Junio C Hamano
2022-08-18 13:13 ` [PATCH 3/4] sequencer: do not translate command names Michael J Gruber
2022-08-18 13:13 ` [PATCH 4/4] po: adjust README to code Michael J Gruber
2022-08-18 15:03 ` Ævar Arnfjörð Bjarmason
2022-08-18 20:36 ` Junio C Hamano [this message]
2022-08-19 7:50 ` [PATCH 4/4 v2] sequencer: spell out command names and do not translate them Michael J Gruber
2022-08-19 9:30 ` Johannes Schindelin
2022-08-19 9:32 ` [PATCH 0/4] sequencer: clarify translations Johannes Schindelin
2022-08-19 10:19 ` Michael J Gruber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqilmpnvad.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).