2014-11-20 16:04 GMT+08:00 Jiang Xin <worldhello.net@xxxxxxxxx>: > 2014-11-20 14:31 GMT+08:00 Ralf Thielow <ralf.thielow@xxxxxxxxx>: >>> >>> 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@xxxxxxxxx> 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@xxxxxxxxx> 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@xxxxxxxxxxxxxxx>\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@xxxxxxxxxxxxxx>\n" "Language-Team: Bulgarian <dict@xxxxxxxxxx>\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@xxxxxxxxxxxxxxx>\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@xxxxxxxxx>\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@xxxxxxxxxxxxxxx>\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@xxxxxxx>\n" "Language-Team: Jean-Noël Avila <jn.avila@xxxxxxx>\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@xxxxxxxxxxxxxxx>\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@xxxxxxxxxxxxxxxx>\n" "Language-Team: Swedish <tp-sv@xxxxxxxxxxxxxxx>\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@xxxxxxxxxxxxxxx>\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@xxxxxxxxx>\n" "Language-Team: Vietnamese <translation-team-vi@xxxxxxxxxxxxxxxxxxxxx>\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@xxxxxxxxxxxxxxx>\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@xxxxxxxxx>\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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html