l10n: git.pot: v2.18.0 round 3 (1 new, 1 removed)

Generate po/git.pot from v2.18.0-rc2 for git v2.18.0 l10n round 3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Jun 16, 2018 at 22:06 UTC 90d4bec978e773fa07d873b3183ba973d55da35f
1 file changed +17 -17
po/git.pot
+17 -17
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 -"POT-Creation-Date: 2018-06-08 09:03+0800\n"
11 +"POT-Creation-Date: 2018-06-16 22:06+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1189,7 +1189,7 @@ msgid ""
1189 "\"git config advice.graftFileDeprecated false\""
1190 msgstr ""
1191
1192 -#: commit.c:1537
1192 +#: commit.c:1540
1193 msgid ""
1194 "Warning: commit message did not conform to UTF-8.\n"
1195 "You may want to amend it after fixing the message, or set the config\n"
@@ -2177,7 +2177,7 @@ msgstr ""
2177
2178 #: merge-recursive.c:1211 merge-recursive.c:1223
2179 #, c-format
2180 -msgid "Fast-forwarding submodule %s to %s"
2180 +msgid "Fast-forwarding submodule %s"
2181 msgstr ""
2182
2183 #: merge-recursive.c:1245
@@ -8767,7 +8767,7 @@ msgstr ""
8767 #. variable for tweaking threads, currently
8768 #. grep.threads
8769 #.
8770 -#: builtin/grep.c:293 builtin/index-pack.c:1531 builtin/index-pack.c:1723
8770 +#: builtin/grep.c:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727
8771 #, c-format
8772 msgid "no threads support, ignoring %s"
8773 msgstr ""
@@ -8976,7 +8976,7 @@ msgstr ""
8976 msgid "unable to resolve revision: %s"
8977 msgstr ""
8978
8979 -#: builtin/grep.c:1036 builtin/index-pack.c:1527
8979 +#: builtin/grep.c:1036 builtin/index-pack.c:1531
8980 #, c-format
8981 msgid "invalid number of threads specified (%d)"
8982 msgstr ""
@@ -9378,58 +9378,58 @@ msgstr ""
9378 msgid "cannot store index file"
9379 msgstr ""
9380
9381 -#: builtin/index-pack.c:1521
9381 +#: builtin/index-pack.c:1525
9382 #, c-format
9383 msgid "bad pack.indexversion=%<PRIu32>"
9384 msgstr ""
9385
9386 -#: builtin/index-pack.c:1590
9386 +#: builtin/index-pack.c:1594
9387 #, c-format
9388 msgid "Cannot open existing pack file '%s'"
9389 msgstr ""
9390
9391 -#: builtin/index-pack.c:1592
9391 +#: builtin/index-pack.c:1596
9392 #, c-format
9393 msgid "Cannot open existing pack idx file for '%s'"
9394 msgstr ""
9395
9396 -#: builtin/index-pack.c:1640
9396 +#: builtin/index-pack.c:1644
9397 #, c-format
9398 msgid "non delta: %d object"
9399 msgid_plural "non delta: %d objects"
9400 msgstr[0] ""
9401 msgstr[1] ""
9402
9403 -#: builtin/index-pack.c:1647
9403 +#: builtin/index-pack.c:1651
9404 #, c-format
9405 msgid "chain length = %d: %lu object"
9406 msgid_plural "chain length = %d: %lu objects"
9407 msgstr[0] ""
9408 msgstr[1] ""
9409
9410 -#: builtin/index-pack.c:1684
9410 +#: builtin/index-pack.c:1688
9411 msgid "Cannot come back to cwd"
9412 msgstr ""
9413
9414 -#: builtin/index-pack.c:1735 builtin/index-pack.c:1738
9415 -#: builtin/index-pack.c:1754 builtin/index-pack.c:1758
9414 +#: builtin/index-pack.c:1739 builtin/index-pack.c:1742
9415 +#: builtin/index-pack.c:1758 builtin/index-pack.c:1762
9416 #, c-format
9417 msgid "bad %s"
9418 msgstr ""
9419
9420 -#: builtin/index-pack.c:1774
9420 +#: builtin/index-pack.c:1778
9421 msgid "--fix-thin cannot be used without --stdin"
9422 msgstr ""
9423
9424 -#: builtin/index-pack.c:1776
9424 +#: builtin/index-pack.c:1780
9425 msgid "--stdin requires a git repository"
9426 msgstr ""
9427
9428 -#: builtin/index-pack.c:1782
9428 +#: builtin/index-pack.c:1786
9429 msgid "--verify with no packfile name given"
9430 msgstr ""
9431
9432 -#: builtin/index-pack.c:1832 builtin/unpack-objects.c:578
9432 +#: builtin/index-pack.c:1836 builtin/unpack-objects.c:578
9433 msgid "fsck error in pack objects"
9434 msgstr ""
9435