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

2014-11-21 Thread Jiang Xin
2014-11-21 7:00 GMT+08:00 Junio C Hamano gits...@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
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

2014-11-21 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes:

 2014-11-21 7:00 GMT+08:00 Junio C Hamano gits...@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.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

2014-11-20 Thread Jiang Xin
2014-11-20 14:31 GMT+08:00 Ralf Thielow ralf.thie...@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
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

2014-11-20 Thread Jiang Xin
2014-11-20 16:04 GMT+08:00 Jiang Xin worldhello@gmail.com:
 2014-11-20 14:31 GMT+08:00 Ralf Thielow ralf.thie...@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@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@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 a...@kambanaria.org\n
 Language-Team: Bulgarian d...@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 alexhenri...@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.av...@free.fr\n
 Language-Team: Jean-Noël Avila jn.av...@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 pe...@softwolves.pp.se\n
 Language-Team: Swedish tp...@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 vnwild...@gmail.com\n
 Language-Team: Vietnamese translation-team...@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
-
 #: 

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

2014-11-20 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes:

 2014-11-20 16:04 GMT+08:00 Jiang Xin worldhello@gmail.com:
 2014-11-20 14:31 GMT+08:00 Ralf Thielow ralf.thie...@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.

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

2014-11-19 Thread 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
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

2014-11-19 Thread 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/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html