[L10N] please review a batch l10n update for Git 2.2.0 final

[L10N] please review a batch l10n update for Git 2.2.0 final

[Jiang Xin]

Hi,

Only two days left for Git 2.2.0 final according to Git calendar
(http://tinyurl.com/gitCal),
but there is a new update for our L10N team to respond.

The change is so small, I can handle it. git-diff shows:

    -msgid "empty trailer token in trailer '%s'"
    +msgid "empty trailer token in trailer '%.*s'"

In order to catch up with Git 2.2.0 final, I update all affected l10n
translations.
If there are errors or you want to update yourself, please send me new
pull request and I will rebase on your commit.  What I have made:

    l10n: batch updates for one trivial change

    In order to catch up with the release of Git 2.2.0 final, make a batch
    l10n update for the new l10n change brought by commit d52adf1 (trailer:
    display a trailer without its trailing newline).

    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

    po/bg.po    | 110 +++++-----
    po/ca.po    |  56 ++---
    po/de.po    | 629 ++++++++++++++++++++++++++++--------------------------
    po/fr.po    |  90 ++++----
    po/sv.po    |  76 +++----
    po/vi.po    |  56 ++---
    po/zh_CN.po |  56 ++---
    7 files changed, 554 insertions(+), 519 deletions(-)

Because I update the .po files with msgmerge, this update also
brings some format changes, so not panic. :)  What I changed are:

    bg.po:msgid "empty trailer token in trailer '%.*s'"
    bg.po-msgstr "празна завършваща лексема в епилога „%.*s“"
    --
    ca.po:msgid "empty trailer token in trailer '%.*s'"
    ca.po-msgstr "fitxa de remolc buida en el remolc '%.*s'"
    --
    de.po:msgid "empty trailer token in trailer '%.*s'"
    de.po-msgstr "leerer Anhang-Token in Anhang '%.*s'"
    --
    fr.po:msgid "empty trailer token in trailer '%.*s'"
    fr.po-msgstr "symbole vide dans la ligne de fin '%.*s'"
    --
    sv.po:msgid "empty trailer token in trailer '%.*s'"
    sv.po-msgstr "tom släpradssymbol i släpraden \"%.*s\""
    --
    vi.po:msgid "empty trailer token in trailer '%.*s'"
    vi.po-msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”"
    --
    zh_CN.po:msgid "empty trailer token in trailer '%.*s'"
    zh_CN.po-msgstr "签名 '%.*s' 的键为空"

NOTE for Ralf:  After I updated de.po, there are 3 fuzzies instead of one.
I can only fix one of them.

-- 
Jiang Xin

Re: [L10N] please review a batch l10n update for Git 2.2.0 final

[Ralf Thielow]

>
> NOTE for Ralf:  After I updated de.po, there are 3 fuzzies instead of one.
> I can only fix one of them.
>

I just send a pull-request to you. It seems I have forgotten one git.pot update.
Sorry

Re: [L10N] please review a batch l10n update for Git 2.2.0 final

[Peter Krefting]

Jiang Xin:

> Because I update the .po files with msgmerge, this update also
> brings some format changes, so not panic. :)  What I changed are:

Swedish (sv) looks fine, thanks!

-- 
\\// Peter - http://www.softwolves.pp.se/

Re: [L10N] please review a batch l10n update for Git 2.2.0 final

[Jiang Xin]

2014-11-20 14:31 GMT+08:00 Ralf Thielow <ralf.thielow@gmail.com>:
>>
>> NOTE for Ralf:  After I updated de.po, there are 3 fuzzies instead of one.
>> I can only fix one of them.
>>
>
> I just send a pull-request to you. It seems I have forgotten one git.pot update.

Merged.  I also see a nice workaround in your commit.  It's a fix for the issue
you reported [1] yesterday on our side. ;-)

     msgid "check"
    +msgstr "check|on-demand"

[1]: http://www.spinics.net/lists/git/msg241964.html

-- 
Jiang Xin

Re: [L10N] please review a batch l10n update for Git 2.2.0 final

[Jiang Xin]

2014-11-20 16:04 GMT+08:00 Jiang Xin <worldhello.net@gmail.com>:
> 2014-11-20 14:31 GMT+08:00 Ralf Thielow <ralf.thielow@gmail.com>:
>>>
>>> NOTE for Ralf:  After I updated de.po, there are 3 fuzzies instead of one.
>>> I can only fix one of them.
>>>
>>
>> I just send a pull-request to you. It seems I have forgotten one git.pot update.
>
> Merged.  I also see a nice workaround in your commit.  It's a fix for the issue
> you reported [1] yesterday on our side. ;-)
>
>      msgid "check"
>     +msgstr "check|on-demand"
>
> [1]: http://www.spinics.net/lists/git/msg241964.html
>

Another batch update:

commit 7ba2ba7d12163a8f9a9947d7880bd26f2970d4c5
Author: Jiang Xin <worldhello.net@gmail.com>
Date:   Thu Nov 20 16:12:34 2014 +0800

    l10n: remove a superfluous translation for push.c

    Ralf reported that '--recurse-submodules' option in push.c should not be
    translated [1].  Before his commit is merged, remove superfluous
    translations for push.c.

    [1] http://www.spinics.net/lists/git/msg241964.html

    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

diff --git a/po/bg.po b/po/bg.po
index 4394eef..ccdd11e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -131,7 +131,7 @@ msgstr ""
 "Project-Id-Version: git master\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 "POT-Creation-Date: 2014-11-20 09:42+0800\n"
-"PO-Revision-Date: 2014-11-20 10:15+0800\n"
+"PO-Revision-Date: 2014-11-20 16:09+0800\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -8676,10 +8676,6 @@ msgstr "УКАЗАТЕЛ>:<ОЧАКВАНА_СТОЙНОСТ"
 msgid "require old value of ref to be at this value"
 msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ"

-#: builtin/push.c:506
-msgid "check"
-msgstr "проверка"
-
 #: builtin/push.c:507
 msgid "control recursive pushing of submodules"
 msgstr "управление на рекурсивното изтласкване на подмодулите"
diff --git a/po/ca.po b/po/ca.po
index b30c611..1fea047 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 "POT-Creation-Date: 2014-11-20 09:42+0800\n"
-"PO-Revision-Date: 2014-11-20 10:23+0800\n"
+"PO-Revision-Date: 2014-11-20 16:10+0800\n"
 "Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
 "Language-Team: Catalan\n"
 "Language: ca\n"
@@ -8320,10 +8320,6 @@ msgstr "nom-de-referència>:<esperat"
 msgid "require old value of ref to be at this value"
 msgstr "requereix que el valor antic de la referència sigui d'aquest valor"

-#: builtin/push.c:506
-msgid "check"
-msgstr "comprova"
-
 #: builtin/push.c:507
 msgid "control recursive pushing of submodules"
 msgstr "controla la pujada recursiva dels submòduls"
diff --git a/po/fr.po b/po/fr.po
index 172796d..fc31831 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -74,7 +74,7 @@ msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 "POT-Creation-Date: 2014-11-20 09:42+0800\n"
-"PO-Revision-Date: 2014-11-20 10:21+0800\n"
+"PO-Revision-Date: 2014-11-20 16:10+0800\n"
 "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
 "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
 "Language: fr\n"
@@ -8472,10 +8472,6 @@ msgstr "nom de référence>:<attendu"
 msgid "require old value of ref to be at this value"
 msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"

-#: builtin/push.c:506
-msgid "check"
-msgstr "check"
-
 #: builtin/push.c:507
 msgid "control recursive pushing of submodules"
 msgstr "contrôler la poussée récursive des sous-modules"
diff --git a/po/sv.po b/po/sv.po
index 5a4bd2e..d601027 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: git 2.0.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 "POT-Creation-Date: 2014-11-20 09:42+0800\n"
-"PO-Revision-Date: 2014-11-20 10:19+0800\n"
+"PO-Revision-Date: 2014-11-20 16:10+0800\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -8245,10 +8245,6 @@ msgstr "refnamn>:<förvänta"
 msgid "require old value of ref to be at this value"
 msgstr "kräv att ref:s tidigare värde är detta"

-#: builtin/push.c:506
-msgid "check"
-msgstr "kontrollera"
-
 #: builtin/push.c:507
 msgid "control recursive pushing of submodules"
 msgstr "styr rekursiv insändning av undermoduler"
diff --git a/po/vi.po b/po/vi.po
index 054190b..1430666 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: git v2.2.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 "POT-Creation-Date: 2014-11-20 09:42+0800\n"
-"PO-Revision-Date: 2014-11-20 10:17+0800\n"
+"PO-Revision-Date: 2014-11-20 16:10+0800\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
@@ -8368,10 +8368,6 @@ msgstr "tên-tham-chiếu>:<cần"
 msgid "require old value of ref to be at this value"
 msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này"

-#: builtin/push.c:506
-msgid "check"
-msgstr "kiểm tra"
-
 #: builtin/push.c:507
 msgid "control recursive pushing of submodules"
 msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 37a044b..4b0e9ee 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 "POT-Creation-Date: 2014-11-20 09:42+0800\n"
-"PO-Revision-Date: 2014-11-20 10:05+0800\n"
+"PO-Revision-Date: 2014-11-20 16:10+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
 "Language: zh_CN\n"
@@ -8191,10 +8191,6 @@ msgstr "引用名>:<期望值"
 msgid "require old value of ref to be at this value"
 msgstr "要求引用旧的取值为设定值"

-#: builtin/push.c:506
-msgid "check"
-msgstr "检查"
-
 #: builtin/push.c:507
 msgid "control recursive pushing of submodules"
 msgstr "控制子模组的递归推送"




-- 
Jiang Xin

Re: [L10N] please review a batch l10n update for Git 2.2.0 final

[Junio C Hamano]

Jiang Xin <worldhello.net@gmail.com> writes:

> 2014-11-20 16:04 GMT+08:00 Jiang Xin <worldhello.net@gmail.com>:
>> 2014-11-20 14:31 GMT+08:00 Ralf Thielow <ralf.thielow@gmail.com>:
>>>>
>>>> NOTE for Ralf:  After I updated de.po, there are 3 fuzzies instead of one.
>>>> I can only fix one of them.
>>>>
>>>
>>> I just send a pull-request to you. It seems I have forgotten one git.pot update.
>>
>> Merged.  I also see a nice workaround in your commit.  It's a fix for the issue
>> you reported [1] yesterday on our side. ;-)
>>
>>      msgid "check"
>>     +msgstr "check|on-demand"
>>
>> [1]: http://www.spinics.net/lists/git/msg241964.html
>
> Another batch update:
>
> commit 7ba2ba7d12163a8f9a9947d7880bd26f2970d4c5
> ...

I've pushed out what should be -rc3 minus l10n changes and try to
make sure there will be no N_() and _() changes.

Let's do a 2.2-rc3 as the last round of this cycle tomorrow.  I've
fetched up to your 7ba2ba7 but haven't merged it yet, just in case
you will have further updates.  Otherwise, 2.2-rc3 will be what is
at the tip of 'master' today with 7ba2ba7 merged in.

Thanks.

Re: [L10N] please review a batch l10n update for Git 2.2.0 final

[Jiang Xin]

2014-11-21 7:00 GMT+08:00 Junio C Hamano <gitster@pobox.com>:
> I've pushed out what should be -rc3 minus l10n changes and try to
> make sure there will be no N_() and _() changes.
>
> Let's do a 2.2-rc3 as the last round of this cycle tomorrow.  I've
> fetched up to your 7ba2ba7 but haven't merged it yet, just in case
> you will have further updates.  Otherwise, 2.2-rc3 will be what is
> at the tip of 'master' today with 7ba2ba7 merged in.


Hi Junio,

Please pull the following changes since commit
ca0107e279df1465946970113d68b4ee26ffbcc4:

  Merge branch 'sv/submitting-final-patch' (2014-11-19 13:48:01 -0800)

are available in the git repository at:

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

for you to fetch changes up to 7ba2ba7d12163a8f9a9947d7880bd26f2970d4c5:

  l10n: remove a superfluous translation for push.c (2014-11-20 16:23:43 +0800)

----------------------------------------------------------------
Jiang Xin (3):
      l10n: git.pot: v2.2.0 round 2 (1 updated)
      l10n: batch updates for one trivial change
      l10n: remove a superfluous translation for push.c

Ralf Thielow (2):
      l10n: de.po: translate 2 new messages
      l10n: de.po: translate 2 messages

 po/bg.po    | 114 ++++++-----
 po/ca.po    |  60 +++---
 po/de.po    | 631 +++++++++++++++++++++++++++++++-----------------------------
 po/fr.po    |  94 +++++----
 po/git.pot  |  48 ++---
 po/sv.po    |  80 ++++----
 po/vi.po    |  60 +++---
 po/zh_CN.po |  60 +++---
 8 files changed, 578 insertions(+), 569 deletions(-)

-- 
Jiang Xin

Re: [L10N] please review a batch l10n update for Git 2.2.0 final

[Junio C Hamano]

Jiang Xin <worldhello.net@gmail.com> writes:

> 2014-11-21 7:00 GMT+08:00 Junio C Hamano <gitster@pobox.com>:
>> I've pushed out what should be -rc3 minus l10n changes and try to
>> make sure there will be no N_() and _() changes.
>>
>> Let's do a 2.2-rc3 as the last round of this cycle tomorrow.  I've
>> fetched up to your 7ba2ba7 but haven't merged it yet, just in case
>> you will have further updates.  Otherwise, 2.2-rc3 will be what is
>> at the tip of 'master' today with 7ba2ba7 merged in.
>
>
> Hi Junio,
>
> Please pull the following changes since commit
> ca0107e279df1465946970113d68b4ee26ffbcc4:
>
>   Merge branch 'sv/submitting-final-patch' (2014-11-19 13:48:01 -0800)
>
> are available in the git repository at:
>
>   git://github.com/git-l10n/git-po master
>
> for you to fetch changes up to 7ba2ba7d12163a8f9a9947d7880bd26f2970d4c5:
>
>   l10n: remove a superfluous translation for push.c (2014-11-20 16:23:43 +0800)

Thanks.  Done.