From: Duy Nguyen Date: Tue, 11 Mar 2014 23:33:25 GMT Subject: Re: [PATCH] status merge: guarentee space between msg and path Message-ID: In-Reply-To: On Wed, Mar 12, 2014 at 3:26 AM, Junio C Hamano wrote: > Sandy Carter writes: > >> Le 2014-03-11 15:59, Junio C Hamano a écrit : >>> Sandy Carter writes: >>> >>>> diff --git a/wt-status.c b/wt-status.c >>>> index a452407..69e0dfc 100644 >>>> --- a/wt-status.c >>>> +++ b/wt-status.c >>>> @@ -264,7 +264,7 @@ static void wt_status_print_unmerged_data(struct wt_status *s, >>>> case 6: how = _("both added:"); break; >>>> case 7: how = _("both modified:"); break; >>>> } >>>> - status_printf_more(s, c, "%-20s%s\n", how, one); >>>> + status_printf_more(s, c, "%-19s %s\n", how, one); >>>> strbuf_release(&onebuf); >>>> } >>> >>> Thanks; I have to wonder if we would want to do something similar to >>> what 3651e45c (wt-status: take the alignment burden off translators, >>> 2013-11-05) to the other parts of the output, though. >>> >> >> I could, do this. It would be cleaner, but there's just the issue of >> the colon (:) which requires a space before it in the french >> language[1]. As you can see in po/fr.po, the french translators have >> done a good job at including it [2]. >> >> 3651e45c takes the colon out of the control of the translators. > > That is a separate bug we would need to address, then. Duy Cc'ed. We went through this before http://thread.gmane.org/gmane.linux.debian.devel.bugs.general/1109239/focus=239560 If the colon needs language specific treatment then it should be part of the translatable strings. -- Duy