Johannes Sixt writes:
> Am 6/20/2013 20:11, schrieb Junio C Hamano:
>> Johannes Sixt writes:
>>> But you can't have this string:
>>>
>>> "Splitting a commit while rebasing branch '%2$s' on '%3$s'."
>>>
>>> neither in the template nor in the translation, because the numbers must
>>> begin at 1
Am 6/20/2013 20:11, schrieb Junio C Hamano:
> Johannes Sixt writes:
>> But you can't have this string:
>>
>> "Splitting a commit while rebasing branch '%2$s' on '%3$s'."
>>
>> neither in the template nor in the translation, because the numbers must
>> begin at 1 (and must be used without gaps).
Johannes Sixt writes:
> Am 6/20/2013 9:56, schrieb Peter Krefting:
>> Junio C Hamano:
>>
>>> But my understanding is that the reordering using printf() is the
>>> mechanism we suggest l10n folks to use when the order of parameters
>>> given to printf does not match the preferred word order in th
Am 6/20/2013 9:56, schrieb Peter Krefting:
> Junio C Hamano:
>
>> But my understanding is that the reordering using printf() is the
>> mechanism we suggest l10n folks to use when the order of parameters
>> given to printf does not match the preferred word order in the message
>> in their language.
Junio C Hamano:
But my understanding is that the reordering using printf() is the
mechanism we suggest l10n folks to use when the order of parameters
given to printf does not match the preferred word order in the
message in their language.
It's documented in the gettext manual, and seems to
Mathieu Liénard--Mayor writes:
> Le 2013-06-17 20:37, Junio C Hamano a écrit :
> ...
>> Extend wt_status_state structure to hold the necessary info, query
>> the state from the filesystem in that function, and display the info
>> (but not collect info) in show_rebase_in_progress(), to keep the
>>
Le 2013-06-17 20:37, Junio C Hamano a écrit :
Mathieu Lienard--Mayor
writes:
When in the middle of a rebase, it can be annoying to go in .git
in order to find the SHA1 of the commit where the rebase stopped.
git-status now includes this information in its default output.
With this new informa
Mathieu Lienard--Mayor
writes:
> When in the middle of a rebase, it can be annoying to go in .git
> in order to find the SHA1 of the commit where the rebase stopped.
>
> git-status now includes this information in its default output.
> With this new information, the message is now shorter, to avo
Johannes Sixt writes:
> Am 6/17/2013 15:57, schrieb Mathieu Liénard--Mayor:
>> Le 2013-06-17 15:54, Peter Krefting a écrit :
>>> Mathieu Liénard--Mayor:
>>>
Actually, at first I dealt with it this way:
status_printf_ln(s, color,
_("Splitting %s while rebasing b
Am 6/17/2013 15:57, schrieb Mathieu Liénard--Mayor:
> Le 2013-06-17 15:54, Peter Krefting a écrit :
>> Mathieu Liénard--Mayor:
>>
>>> Actually, at first I dealt with it this way:
>>>
>>> status_printf_ln(s, color,
>>> _("Splitting %s while rebasing branch '%s' on '%s'."),
>>>
Le 2013-06-17 15:54, Peter Krefting a écrit :
Mathieu Liénard--Mayor:
Actually, at first I dealt with it this way:
status_printf_ln(s, color,
_("Splitting %s while rebasing branch '%s' on
'%s'."),
stopped_sha ? stopped_sha : _("a commit"),
..
Mathieu Liénard--Mayor:
Actually, at first I dealt with it this way:
status_printf_ln(s, color,
_("Splitting %s while rebasing branch '%s' on '%s'."),
stopped_sha ? stopped_sha : _("a commit"),
);
Would this be more suitable for translators
Le 2013-06-17 15:10, Peter Krefting a écrit :
Mathieu Lienard--Mayor:
+ /*
+* If the file stopped-sha does not exist
+* we go back to the old output saying "a commit"
+* instead of providing the commit's SHA1.
+*/
+ if (!stopped_sha) {
+
Mathieu Lienard--Mayor:
+ /*
+* If the file stopped-sha does not exist
+* we go back to the old output saying "a commit"
+* instead of providing the commit's SHA1.
+*/
+ if (!stopped_sha) {
+ stopped_sha = "a commit";
+ must
Hi,
[I rarely do reviews on this list, so feel free to ignore this.]
On 17 June 2013 13:10, Mathieu Lienard--Mayor
wrote:
> diff --git a/wt-status.c b/wt-status.c
> index bf84a86..5f5cddf 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -885,8 +885,19 @@ static void show_rebase_in_progress(st
15 matches
Mail list logo
