summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2018-06-16 14:06:45 (GMT)
committerJiang Xin <worldhello.net@gmail.com>2018-06-16 14:06:45 (GMT)
commit90d4bec978e773fa07d873b3183ba973d55da35f (patch)
treeac871abb7801a3b88c03b77b7c0818eb06146aa7 /po
parent19926351bcfaf8d524cbc350c09707018e782609 (diff)
downloadgit-90d4bec978e773fa07d873b3183ba973d55da35f.zip
git-90d4bec978e773fa07d873b3183ba973d55da35f.tar.gz
git-90d4bec978e773fa07d873b3183ba973d55da35f.tar.bz2
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>
Diffstat (limited to 'po')
-rw-r--r--po/git.pot34
1 files changed, 17 insertions, 17 deletions
diff --git a/po/git.pot b/po/git.pot
index 8b8228f..d4c7f0b 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-06-08 09:03+0800\n"
+"POT-Creation-Date: 2018-06-16 22:06+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1189,7 +1189,7 @@ msgid ""
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1537
+#: commit.c:1540
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2177,7 +2177,7 @@ msgstr ""
#: merge-recursive.c:1211 merge-recursive.c:1223
#, c-format
-msgid "Fast-forwarding submodule %s to %s"
+msgid "Fast-forwarding submodule %s"
msgstr ""
#: merge-recursive.c:1245
@@ -8767,7 +8767,7 @@ msgstr ""
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:293 builtin/index-pack.c:1531 builtin/index-pack.c:1723
+#: builtin/grep.c:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
@@ -8976,7 +8976,7 @@ msgstr ""
msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/grep.c:1036 builtin/index-pack.c:1527
+#: builtin/grep.c:1036 builtin/index-pack.c:1531
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
@@ -9378,58 +9378,58 @@ msgstr ""
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1521
+#: builtin/index-pack.c:1525
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1590
+#: builtin/index-pack.c:1594
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1592
+#: builtin/index-pack.c:1596
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1640
+#: builtin/index-pack.c:1644
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1651
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1684
+#: builtin/index-pack.c:1688
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1735 builtin/index-pack.c:1738
-#: builtin/index-pack.c:1754 builtin/index-pack.c:1758
+#: builtin/index-pack.c:1739 builtin/index-pack.c:1742
+#: builtin/index-pack.c:1758 builtin/index-pack.c:1762
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1774
+#: builtin/index-pack.c:1778
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1776
+#: builtin/index-pack.c:1780
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1782
+#: builtin/index-pack.c:1786
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/index-pack.c:1832 builtin/unpack-objects.c:578
+#: builtin/index-pack.c:1836 builtin/unpack-objects.c:578
msgid "fsck error in pack objects"
msgstr ""