Thread (218 messages) flat view 218 messages, 9 authors, 2016-11-06

Re: [PATCH 10/22] sequencer: avoid completely different messages for different actions

From: Johannes Schindelin <hidden>
Date: 2016-09-09 14:23:28

Hi Kuba,

On Fri, 2 Sep 2016, Jakub Narębski wrote:
W dniu 01.09.2016 o 09:52, Johannes Schindelin pisze:
quoted
On Wed, 31 Aug 2016, Jakub Narębski wrote:
quoted
CC-ed to Jiang Xin, L10N coordinator.
W dniu 29.08.2016 o 10:05, Johannes Schindelin pisze:
[...]
quoted
quoted
quoted
-	/* Different translation strings for cherry-pick and revert */
-	if (opts->action == REPLAY_PICK)
-		error(_("Your local changes would be overwritten by cherry-pick."));
-	else
-		error(_("Your local changes would be overwritten by revert."));
+	error(_("Your local changes would be overwritten by %s."),
+		action_name(opts));
If I understand it correctly, it would make "revert" or "cherry-pick"
untranslated part of error message.  You would need to use translation
on the result with "_(action_name(opts))", you would have to mark
todo_command_strings elements for gettext lexicon with N_(...).
Okay, that is easy enough.

Ciao,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help