From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2012 18:57:11 GMT
Subject: Re: [PATCH v3 2/7] i18n: rebase: mark strings for translation
Message-ID: <7vtxwxf0mw.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20120724180138.GF2939@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> Probably it would make sense to do
>
> 	resolvemsg="
> 	$(gettext 'When you have resolved this problem, run "git rebase --continue".
> 	If you prefer to skip this patch, run "git rebase --skip" instead.
> 	To check out the original branch and stop rebasing, run "git rebase --abort".')
> 	"
>
> anyway, so the translators could have fewer newlines at the edges to
> fuss about.

Nice.

> Maybe, to allow changing the commands without having to update
> translations:
>
> 	state_dir_base=...
> 	cmd_live_rebase='git rebase (--continue | --abort | --skip)'
> 	cmd_clear_stale_rebase="rm -fr \"$state_dir\""
> 	die "
> 	$(eval_gettext 'It seems that there is already a $state_dir_base directory, and
> 	I wonder if you ware in the middle of another rebase.  If that is the
> 	case, please try
> 		$cmd_live_rebase
> 	If that is not the case, please
> 		$cmd_clear_stale_rebase
> 	and run me again.  I am stopping in case you still have something
> 	valuable there.')"

Again, nice.

Thanks.