Re: [PATCH] status merge: guarentee space between msg and path

2014-03-12 Thread Junio C Hamano
Duy Nguyen writes: > On Wed, Mar 12, 2014 at 3:26 AM, Junio C Hamano wrote: >> Sandy Carter writes: >> >>> 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.g

Re: [PATCH] status merge: guarentee space between msg and path

2014-03-11 Thread Duy Nguyen
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,

Re: [PATCH] status merge: guarentee space between msg and path

2014-03-11 Thread Junio C Hamano
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 >>> w

Re: [PATCH] status merge: guarentee space between msg and path

2014-03-11 Thread Sandy Carter
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:")

Re: [PATCH] status merge: guarentee space between msg and path

2014-03-11 Thread Junio C Hamano
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 = _("bot

[PATCH] status merge: guarentee space between msg and path

2014-03-11 Thread Sandy Carter
Add space between how and one when printing status of unmerged data. This fixes an appending of the how message when it is longer than 20. This is the case in some translations such as the french one where the colon gets appended to the file: supprimé par nous :wt-status.c modifié des deux