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

From: Jiang Xin <worldhello.net@gmail.com>
Date: Aug 6, 2012, 01:34 UTC
Message-ID: <CANYiYbFe6LUL+2m-X+Ek8ehFw6D5tvh+FwoGjF_zipcUe_MtMw@mail.gmail.com>
In-Reply-To: <7v628x3zjt.fsf@alter.siamese.dyndns.org>

2012/8/6 Junio C Hamano <gitster@pobox.com>:

Show 8 quoted lines

> Ralf Thielow <ralf.thielow@gmail.com> 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
> translation".  Will apply this so 1.7.12 can have it.

[resend to the list again, for last mail is rich text format and is rejected by the list]

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 this round of l10n:

The following changes since commit 05a20c87abd08441c98dfcca0606bc0f8432ab26:

  Merge git://github.com/git-l10n/git-po (2012-08-01 15:59:08 -0700)

are available in the git repository at:

  git://github.com/git-l10n/git-po master

for you to fetch changes up to 649900bc126edf59aaae49ba025880dc948980f0:

  l10n: zh_CN.po: translate 76 new messages (2012-08-05 07:12:27 +0800)

----------------------------------------------------------------
Jiang Xin (2):
      l10n: Update git.pot (76 new, 4 removed messages)
      l10n: zh_CN.po: translate 76 new messages

Tran Ngoc Quan (1):
      l10n: vi.po update to follow POT in 3b613

 po/git.pot  | 433 +++++++++++++++++++++++++++++---
 po/vi.po    | 464 ++++++++++++++++++++++++++++++----
 po/zh_CN.po | 817 +++++++++++++++++++++++++++++++++---------------------------
 3 files changed, 1265 insertions(+), 449 deletions(-)

-- 
Jiang Xin