git-l10n-2.11.0-rnd2.diff

commit 275588f93eedd8d7a556c38b75944b858e704dce
Author: Jiang Xin <[email protected]>
Date:   Tue Nov 22 22:24:59 2016 +0800

    l10n: Fixed typo of git fetch-pack command
    
    Git 2.11.0-rc2 introduced one small l10n update, and this commit fixed
    the affected translations all in one batch.
    
    Signed-off-by: Jiang Xin <[email protected]>

diff --git a/po/fr.po b/po/fr.po
index 6f2ce0cc40..6db68932b3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -72,8 +72,8 @@
 msgid   ""
 msgstr  "Project-Id-Version: git\n"
         "Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
-        "POT-Creation-Date: 2016-11-01 21:35+0800\n"
-        "PO-Revision-Date: 2016-11-06 20:21+0100\n"
+        "POT-Creation-Date: 2016-11-22 22:10+0800\n"
+        "PO-Revision-Date: 2016-11-22 22:16+0800\n"
         "Last-Translator: Jean-Noël Avila <[email protected]>\n"
         "Language-Team: Jean-Noël Avila <[email protected]>\n"
         "Language: fr\n"
@@ -7715,6 +7715,10 @@ msgstr  "git fetch [<options>] <groupe>"
 msgid   "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr  "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
 #
+#, c-format
+msgid   "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr  "git fetch-pack : ACK/NACK attendu, '%s' reçu"
+#
 msgid   "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr  "git fetch-pack : ACK/NACK attendu, EOF reçu"
 #
@@ -7724,10 +7728,6 @@ msgstr  "git fetch-pack : list courte attendue"
 msgid   "git fetch-pack: fetch failed."
 msgstr  "git fetch-pack : échec de le récupération."
 #
-#, c-format
-msgid   "git fetch_pack: expected ACK/NAK, got '%s'"
-msgstr  "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#
 msgid   "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file "
         "<file>]"
 msgstr  "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file "
diff --git a/po/ko.po b/po/ko.po
index e8f0da4bd9..41c016e280 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -57,8 +57,8 @@
 msgid   ""
 msgstr  "Project-Id-Version: git\n"
         "Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
-        "POT-Creation-Date: 2016-11-01 21:35+0800\n"
-        "PO-Revision-Date: 2016-11-03 19:47+0900\n"
+        "POT-Creation-Date: 2016-11-22 22:10+0800\n"
+        "PO-Revision-Date: 2016-11-22 22:16+0800\n"
         "Last-Translator: Changwoo Ryu <[email protected]>\n"
         "Language-Team: Git Korean translation <http://github.com/changwoo/"
         "git-l10n-ko>\n"
@@ -7449,6 +7449,10 @@ msgstr  "git fetch [<옵션>] <그룹>"
 msgid   "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr  "git fetch [<옵션>] [<저장소> [<레퍼런스명세>...]]"
 #
+#, c-format
+msgid   "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr  "git fetch-pack: ACK/NAK가 와야 하지만, '%s'을(를) 받았습니다"
+#
 msgid   "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr  "git fetch-pack: ACK/NAK가 와야 하지만, EOF를 받았습니다"
 #
@@ -7458,10 +7462,6 @@ msgstr  "git fetch-pack: 얕은 목록을 예상함"
 msgid   "git fetch-pack: fetch failed."
 msgstr  "git fetch-pack: 가져오기 실패."
 #
-#, c-format
-msgid   "git fetch_pack: expected ACK/NAK, got '%s'"
-msgstr  "git fetch_pack: ACK/NAK가 와야 하지만, '%s'을(를) 받았습니다"
-#
 msgid   "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file "
         "<file>]"
 msgstr  "git fmt-merge-msg [-m <메시지>] [--log[=<n>] | --no-log] [--file <파"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 7f523f678c..59d8ef1eec 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: Git\n"
         "Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
-        "POT-Creation-Date: 2016-11-01 21:35+0800\n"
+        "POT-Creation-Date: 2016-11-22 22:10+0800\n"
         "PO-Revision-Date: 2016-11-13 16:37+0000\n"
         "Last-Translator: Vasco Almeida <[email protected]>\n"
         "Language-Team: Portuguese\n"
@@ -7550,6 +7550,10 @@ msgid   "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr  "git fetch [<opções>] [<repositório> [<especificador-de-"
         "referência>...]]"
 #
+#, c-format
+msgid   "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr  "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
+#
 msgid   "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr  "git fetch-pack: esperava-se ACK/NAK, obteve-se EOF"
 #
@@ -7560,10 +7564,6 @@ msgstr  "git fetch-pack: esperava-se lista rasa"
 msgid   "git fetch-pack: fetch failed."
 msgstr  "git fetch-pack: falha ao obter."
 #
-#, c-format
-msgid   "git fetch_pack: expected ACK/NAK, got '%s'"
-msgstr  "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
-#
 msgid   "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file "
         "<file>]"
 msgstr  "git fmt-merge-msg [-m <mensagem>] [--log[=<n>] | --no-log] [--file "
diff --git a/po/sv.po b/po/sv.po
index e783680573..ceea7c7a51 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,8 +6,8 @@
 msgid   ""
 msgstr  "Project-Id-Version: git 2.11.0\n"
         "Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
-        "POT-Creation-Date: 2016-11-01 21:35+0800\n"
-        "PO-Revision-Date: 2016-11-05 16:01+0100\n"
+        "POT-Creation-Date: 2016-11-22 22:10+0800\n"
+        "PO-Revision-Date: 2016-11-22 22:16+0800\n"
         "Last-Translator: Peter Krefting <[email protected]>\n"
         "Language-Team: Svenska <[email protected]>\n"
         "Language: sv\n"
@@ -7536,6 +7536,10 @@ msgstr  "git fetch [<flaggor>] <grupp>"
 msgid   "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr  "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
 #
+#, c-format
+msgid   "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr  "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
+#
 msgid   "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr  "git fetch-patch: förväntade ACK/NAK, fick EOF"
 #
@@ -7545,10 +7549,6 @@ msgstr  "git fetch-pack: förväntade grund lista"
 msgid   "git fetch-pack: fetch failed."
 msgstr  "git fetch-patch: hämtning misslyckades."
 #
-#, c-format
-msgid   "git fetch_pack: expected ACK/NAK, got '%s'"
-msgstr  "git fetch_pack: förväntade ACK/NAK, fick \"%s\""
-#
 msgid   "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file "
         "<file>]"
 msgstr  "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file "
diff --git a/po/vi.po b/po/vi.po
index aa06cbf3fa..ccba691365 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,8 +7,8 @@
 msgid   ""
 msgstr  "Project-Id-Version: git v2.11.0\n"
         "Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
-        "POT-Creation-Date: 2016-11-01 21:35+0800\n"
-        "PO-Revision-Date: 2016-11-04 08:07+0700\n"
+        "POT-Creation-Date: 2016-11-22 22:10+0800\n"
+        "PO-Revision-Date: 2016-11-22 22:17+0800\n"
         "Last-Translator: Trần Ngọc Quân <[email protected]>\n"
         "Language-Team: Vietnamese <[email protected]."
         "net>\n"
@@ -7565,6 +7565,10 @@ msgstr  "git fetch [<các-tùy-chọn>] [<nhóm>"
 msgid   "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr  "git fetch [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]"
 #
+#, c-format
+msgid   "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr  "git fetch-pack: cần ACK/NAK, nhưng lại nhận được “%s”"
+#
 msgid   "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr  "git fetch-pack: cần ACK/NAK, nhưng lại nhận được EOF"
 #
@@ -7574,10 +7578,6 @@ msgstr  "git fetch-pack: cần danh sách shallow"
 msgid   "git fetch-pack: fetch failed."
 msgstr  "git fetch-pack: fetch gặp lỗi."
 #
-#, c-format
-msgid   "git fetch_pack: expected ACK/NAK, got '%s'"
-msgstr  "git fetch_pack: cần ACK/NAK, nhưng lại nhận được “%s”"
-#
 msgid   "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file "
         "<file>]"
 msgstr  "git fmt-merge-msg [-m <chú_thích>] [--log[=<n>] | --no-log] [--file "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bfd5bbf598..1ce25337ec 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -134,8 +134,8 @@
 msgid   ""
 msgstr  "Project-Id-Version: Git\n"
         "Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
-        "POT-Creation-Date: 2016-11-01 21:35+0800\n"
-        "PO-Revision-Date: 2016-11-21 23:14+0800\n"
+        "POT-Creation-Date: 2016-11-22 22:10+0800\n"
+        "PO-Revision-Date: 2016-11-22 22:15+0800\n"
         "Last-Translator: Jiang Xin <[email protected]>\n"
         "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
         "Language: zh_CN\n"
@@ -7475,6 +7475,10 @@ msgstr  "git fetch [<选项>] <组>"
 msgid   "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr  "git fetch [<选项>] [<仓库> [<引用规格>...]]"
 #
+#, c-format
+msgid   "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr  "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
+#
 msgid   "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr  "git fetch-pack：应为 ACK/NAK，却得到 EOF"
 #
@@ -7484,10 +7488,6 @@ msgstr  "git fetch-pack：应为 shallow 列表"
 msgid   "git fetch-pack: fetch failed."
 msgstr  "git fetch-pack：获取失败。"
 #
-#, c-format
-msgid   "git fetch_pack: expected ACK/NAK, got '%s'"
-msgstr  "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#
 msgid   "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file "
         "<file>]"
 msgstr  "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件"

Diff driver for my .po and .pot file is:

[diff "gettext-uniq"]
    textconv = "msguniq -i --no-location --strict -s"
    cachetextconv = true