Re: [PATCH] merge-recursive: separate message for common ancestors

2012-08-06 Thread Jiang Xin
2012/8/6 Jiang Xin : > 2012/8/6 Junio C Hamano : >> OK, so there was no hidden message behind "At least for better >> translation". Will apply this so 1.7.12 can have it. > > So I will not wait for Ralf's update on "de.po", he will catch up with next > round of l10n with this fix. Pull request for

Re: [PATCH] merge-recursive: separate message for common ancestors

2012-08-05 Thread Jiang Xin
2012/8/6 Junio C Hamano : > Ralf Thielow writes: > >> It would be nicer for translators to have two messages. >> In the end it's just a separation for singular and plural as it's >> done in diff.c (e.g. Q_(" %d file changed", " %d files changed", files)). > > OK, so there was no hidden message beh

Re: [PATCH] merge-recursive: separate message for common ancestors

2012-08-05 Thread Junio C Hamano
Ralf Thielow writes: > It would be nicer for translators to have two messages. > In the end it's just a separation for singular and plural as it's > done in diff.c (e.g. Q_(" %d file changed", " %d files changed", files)). OK, so there was no hidden message behind "At least for better translatio

Re: [PATCH] merge-recursive: separate message for common ancestors

2012-08-05 Thread Ralf Thielow
It would be nicer for translators to have two messages. In the end it's just a separation for singular and plural as it's done in diff.c (e.g. Q_(" %d file changed", " %d files changed", files)). On Sun, Aug 5, 2012 at 8:44 PM, Junio C Hamano wrote: > Ralf Thielow writes: > >> The function "merg

Re: [PATCH] merge-recursive: separate message for common ancestors

2012-08-05 Thread Junio C Hamano
Ralf Thielow writes: > The function "merge_recursive" prints the count of common > ancestors as "found %u common ancestor(s):". At least for > better translation, we should use a singular and a plural > form of this message. > > Signed-off-by: Ralf Thielow > --- Thanks. In your "At least" abov

[PATCH] merge-recursive: separate message for common ancestors

2012-08-05 Thread Ralf Thielow
The function "merge_recursive" prints the count of common ancestors as "found %u common ancestor(s):". At least for better translation, we should use a singular and a plural form of this message. Signed-off-by: Ralf Thielow --- merge-recursive.c | 5 - 1 file changed, 4 insertions(+), 1 dele