Am 19.01.22 um 10:44 schrieb Bagas Sanjaya:
> Factor action names (cherry-picking, committing, merging, pulling, and
> reverting) out of the message string.
>
> Signed-off-by: Bagas Sanjaya <bagasdotme@xxxxxxxxx>
> ---
> advice.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/advice.c b/advice.c
> index 1dfc91d176..4c72856478 100644
> --- a/advice.c
> +++ b/advice.c
> @@ -175,15 +175,15 @@ void list_config_advices(struct string_list *list, const char *prefix)
> int error_resolve_conflict(const char *me)
> {
> if (!strcmp(me, "cherry-pick"))
> - error(_("Cherry-picking is not possible because you have unmerged files."));
> + error(_("%s is not possible because you have unmerged files."), "Cherry-picking");
> else if (!strcmp(me, "commit"))
> - error(_("Committing is not possible because you have unmerged files."));
> + error(_("%s is not possible because you have unmerged files."), "Commiting");
> else if (!strcmp(me, "merge"))
> - error(_("Merging is not possible because you have unmerged files."));
> + error(_("%s is not possible because you have unmerged files."), "Merging");
> else if (!strcmp(me, "pull"))
> - error(_("Pulling is not possible because you have unmerged files."));
> + error(_("%s is not possible because you have unmerged files."), "Pulling");
> else if (!strcmp(me, "revert"))
> - error(_("Reverting is not possible because you have unmerged files."));
> + error(_("%s is not possible because you have unmerged files."), "Reverting");
> else
> error(_("It is not possible to %s because you have unmerged files."),
> me);
That effectively reverts 8785c42532 (i18n: advice: internationalize
message for conflicts, 2016-06-17). Why? Having the capitalized
English present participle of the action appear somewhere in a
translated string would sure look quite foreign in some (most?)
languages.
René
