Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: git.pot: v2.7.0 round 2 (2 new, 2 removed)
author
Jiang Xin
<worldhello.net@gmail.com>
Tue, 22 Dec 2015 14:51:43 +0000
(22:51 +0800)
committer
Jiang Xin
<worldhello.net@gmail.com>
Tue, 22 Dec 2015 14:51:43 +0000
(22:51 +0800)
Generate po/git.pot from
v2.7.0-rc1-44-g1d88dab
for git v2.7.0 l10n round 2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
po/git.pot
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
076ab2b
)
diff --git
a/po/git.pot
b/po/git.pot
index 168feac8d7955585f952f54e4f05da85c812fd69..068f4bbd109c48303d396bff76dc2f4b61d68933 100644
(file)
--- 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"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-12-
11 23:36
+0800\n"
+"POT-Creation-Date: 2015-12-
22 22:50
+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"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-71,7
+71,7
@@
msgstr ""
msgid "archive format"
msgstr ""
msgid "archive format"
msgstr ""
-#: archive.c:430 builtin/log.c:122
8
+#: archive.c:430 builtin/log.c:122
9
msgid "prefix"
msgstr ""
msgid "prefix"
msgstr ""
@@
-264,7
+264,7
@@
msgstr ""
#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:849 builtin/log.c:14
56 builtin/log.c:1689
builtin/merge.c:358
+#: builtin/log.c:849 builtin/log.c:14
61 builtin/log.c:1694
builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr ""
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr ""
@@
-304,7
+304,7
@@
msgstr ""
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:136
6
builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:136
9
builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
@@
-1209,16
+1209,16
@@
msgstr[1] ""
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: revision.c:219
1
+#: revision.c:219
3
msgid "your current branch appears to be broken"
msgstr ""
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:219
4
+#: revision.c:219
6
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:23
88
+#: revision.c:23
90
msgid "--first-parent is incompatible with --bisect"
msgstr ""
msgid "--first-parent is incompatible with --bisect"
msgstr ""
@@
-1614,30
+1614,21
@@
msgstr ""
msgid "unable to access '%s'"
msgstr ""
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:611
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr ""
-
-#: wrapper.c:612
-msgid "no such user"
-msgstr ""
-
-#: wrapper.c:620
+#: wrapper.c:608
msgid "unable to get current working directory"
msgstr ""
msgid "unable to get current working directory"
msgstr ""
-#: wrapper.c:6
47
+#: wrapper.c:6
35
#, c-format
msgid "could not open %s for writing"
msgstr ""
#, c-format
msgid "could not open %s for writing"
msgstr ""
-#: wrapper.c:6
58
builtin/am.c:425
+#: wrapper.c:6
46
builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr ""
#, c-format
msgid "could not write to %s"
msgstr ""
-#: wrapper.c:6
64
+#: wrapper.c:6
52
#, c-format
msgid "could not close %s"
msgstr ""
#, c-format
msgid "could not close %s"
msgstr ""
@@
-2142,14
+2133,14
@@
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
msgstr ""
#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:54
5
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:54
3
#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr ""
#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr ""
#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:164
0
builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/log.c:164
5
builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr ""
msgid "be verbose"
msgstr ""
@@
-2334,7
+2325,7
@@
msgstr ""
msgid "Patch is empty. Was it split wrong?"
msgstr ""
msgid "Patch is empty. Was it split wrong?"
msgstr ""
-#: builtin/am.c:1417 builtin/log.c:134
4
+#: builtin/am.c:1417 builtin/log.c:134
7
#, c-format
msgid "invalid ident line: %s"
msgstr ""
#, c-format
msgid "invalid ident line: %s"
msgstr ""
@@
-4079,7
+4070,7
@@
msgstr ""
msgid "update ignored files (default)"
msgstr ""
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1151 builtin/log.c:126
3
parse-options.h:250
+#: builtin/checkout.c:1151 builtin/log.c:126
6
parse-options.h:250
msgid "style"
msgstr ""
msgid "style"
msgstr ""
@@
-4100,7
+4091,7
@@
msgid "do not check if another worktree is holding the given ref"
msgstr ""
#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
msgstr ""
#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
-#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:5
60
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:5
58
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr ""
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr ""
@@
-4897,7
+4888,7
@@
msgstr ""
msgid "show branch information"
msgstr ""
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:54
6
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:54
4
#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr ""
#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr ""
@@
-5019,7
+5010,7
@@
msgstr ""
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1588 builtin/log.c:121
5
builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:121
6
builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr ""
msgid "add Signed-off-by:"
msgstr ""
@@
-5573,7
+5564,7
@@
msgstr ""
msgid "convert to a complete repository"
msgstr ""
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:118 builtin/log.c:123
2
+#: builtin/fetch.c:118 builtin/log.c:123
3
msgid "dir"
msgstr ""
msgid "dir"
msgstr ""
@@
-6861,187
+6852,191
@@
msgstr ""
msgid "Two output directories?"
msgstr ""
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:121
0
+#: builtin/log.c:121
1
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:121
3
+#: builtin/log.c:121
4
msgid "use [PATCH] even with multiple patches"
msgstr ""
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:121
7
+#: builtin/log.c:121
8
msgid "print patches to standard out"
msgstr ""
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:12
19
+#: builtin/log.c:12
20
msgid "generate a cover letter"
msgstr ""
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:122
1
+#: builtin/log.c:122
2
msgid "use simple number sequence for output file names"
msgstr ""
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:122
2
+#: builtin/log.c:122
3
msgid "sfx"
msgstr ""
msgid "sfx"
msgstr ""
-#: builtin/log.c:122
3
+#: builtin/log.c:122
4
msgid "use <sfx> instead of '.patch'"
msgstr ""
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:122
5
+#: builtin/log.c:122
6
msgid "start numbering patches at <n> instead of 1"
msgstr ""
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:122
7
+#: builtin/log.c:122
8
msgid "mark the series as Nth re-roll"
msgstr ""
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:12
29
+#: builtin/log.c:12
30
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:123
2
+#: builtin/log.c:123
3
msgid "store resulting files in <dir>"
msgstr ""
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:123
5
+#: builtin/log.c:123
6
msgid "don't strip/add [PATCH]"
msgstr ""
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:123
8
+#: builtin/log.c:123
9
msgid "don't output binary diffs"
msgstr ""
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1240
+#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr ""
+
+#: builtin/log.c:1243
msgid "don't include a patch matching a commit upstream"
msgstr ""
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:124
2
+#: builtin/log.c:124
5
msgid "show patch format instead of default (patch + stat)"
msgstr ""
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:124
4
+#: builtin/log.c:124
7
msgid "Messaging"
msgstr ""
msgid "Messaging"
msgstr ""
-#: builtin/log.c:124
5
+#: builtin/log.c:124
8
msgid "header"
msgstr ""
msgid "header"
msgstr ""
-#: builtin/log.c:124
6
+#: builtin/log.c:124
9
msgid "add email header"
msgstr ""
msgid "add email header"
msgstr ""
-#: builtin/log.c:12
47 builtin/log.c:1249
+#: builtin/log.c:12
50 builtin/log.c:1252
msgid "email"
msgstr ""
msgid "email"
msgstr ""
-#: builtin/log.c:12
47
+#: builtin/log.c:12
50
msgid "add To: header"
msgstr ""
msgid "add To: header"
msgstr ""
-#: builtin/log.c:12
49
+#: builtin/log.c:12
52
msgid "add Cc: header"
msgstr ""
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:125
1
+#: builtin/log.c:125
4
msgid "ident"
msgstr ""
msgid "ident"
msgstr ""
-#: builtin/log.c:125
2
+#: builtin/log.c:125
5
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:125
4
+#: builtin/log.c:125
7
msgid "message-id"
msgstr ""
msgid "message-id"
msgstr ""
-#: builtin/log.c:125
5
+#: builtin/log.c:125
8
msgid "make first mail a reply to <message-id>"
msgstr ""
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:125
6 builtin/log.c:1259
+#: builtin/log.c:125
9 builtin/log.c:1262
msgid "boundary"
msgstr ""
msgid "boundary"
msgstr ""
-#: builtin/log.c:12
57
+#: builtin/log.c:12
60
msgid "attach the patch"
msgstr ""
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:126
0
+#: builtin/log.c:126
3
msgid "inline the patch"
msgstr ""
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:126
4
+#: builtin/log.c:126
7
msgid "enable message threading, styles: shallow, deep"
msgstr ""
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:126
6
+#: builtin/log.c:126
9
msgid "signature"
msgstr ""
msgid "signature"
msgstr ""
-#: builtin/log.c:12
67
+#: builtin/log.c:12
70
msgid "add a signature"
msgstr ""
msgid "add a signature"
msgstr ""
-#: builtin/log.c:12
69
+#: builtin/log.c:12
72
msgid "add a signature from a file"
msgstr ""
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:127
0
+#: builtin/log.c:127
3
msgid "don't print the patch filenames"
msgstr ""
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:13
59
+#: builtin/log.c:13
62
msgid "-n and -k are mutually exclusive."
msgstr ""
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:136
1
+#: builtin/log.c:136
4
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:13
69
+#: builtin/log.c:13
72
msgid "--name-only does not make sense"
msgstr ""
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:137
1
+#: builtin/log.c:137
4
msgid "--name-status does not make sense"
msgstr ""
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:137
3
+#: builtin/log.c:137
6
msgid "--check does not make sense"
msgstr ""
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1
396
+#: builtin/log.c:1
401
msgid "standard output, or directory, which one?"
msgstr ""
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1
398
+#: builtin/log.c:1
403
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1
495
+#: builtin/log.c:1
500
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:15
58
+#: builtin/log.c:15
63
msgid "Failed to create output files"
msgstr ""
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:16
06
+#: builtin/log.c:16
11
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:166
0
+#: builtin/log.c:166
5
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/log.c:167
1 builtin/log.c:1673 builtin/log.c:1685
+#: builtin/log.c:167
6 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr ""
#, c-format
msgid "Unknown commit %s"
msgstr ""
@@
-8398,25
+8393,25
@@
msgstr ""
msgid "Cannot rebase onto multiple branches."
msgstr ""
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/push.c:1
5
+#: builtin/push.c:1
6
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/push.c:8
6
+#: builtin/push.c:8
8
msgid "tag shorthand without <tag>"
msgstr ""
msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/push.c:9
6
+#: builtin/push.c:9
8
msgid "--delete only accepts plain target ref names"
msgstr ""
msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/push.c:14
0
+#: builtin/push.c:14
2
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/push.c:14
3
+#: builtin/push.c:14
5
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@
-8431,7
+8426,7
@@
msgid ""
"%s"
msgstr ""
"%s"
msgstr ""
-#: builtin/push.c:1
58
+#: builtin/push.c:1
60
#, c-format
msgid ""
"You are not currently on a branch.\n"
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@
-8441,7
+8436,7
@@
msgid ""
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/push.c:17
2
+#: builtin/push.c:17
4
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@
-8450,12
+8445,12
@@
msgid ""
" git push --set-upstream %s %s\n"
msgstr ""
" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/push.c:18
0
+#: builtin/push.c:18
2
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/push.c:18
3
+#: builtin/push.c:18
5
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@
-8463,7
+8458,7
@@
msgid ""
"to update which remote branch."
msgstr ""
"to update which remote branch."
msgstr ""
-#: builtin/push.c:20
6
+#: builtin/push.c:20
8
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@
-8488,12
+8483,12
@@
msgid ""
"'current' instead of 'simple' if you sometimes use older versions of Git)"
msgstr ""
"'current' instead of 'simple' if you sometimes use older versions of Git)"
msgstr ""
-#: builtin/push.c:27
3
+#: builtin/push.c:27
5
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/push.c:28
0
+#: builtin/push.c:28
2
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@
-8501,7
+8496,7
@@
msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:28
6
+#: builtin/push.c:28
8
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@
-8509,7
+8504,7
@@
msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:29
2
+#: builtin/push.c:29
4
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@
-8518,33
+8513,33
@@
msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:
299
+#: builtin/push.c:
301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/push.c:30
2
+#: builtin/push.c:30
4
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr ""
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr ""
-#: builtin/push.c:36
1
+#: builtin/push.c:36
3
#, c-format
msgid "Pushing to %s\n"
msgstr ""
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:36
5
+#: builtin/push.c:36
7
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:39
5
+#: builtin/push.c:39
7
#, c-format
msgid "bad repository '%s'"
msgstr ""
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:39
6
+#: builtin/push.c:39
8
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@
-8557,100
+8552,104
@@
msgid ""
" git push <name>\n"
msgstr ""
" git push <name>\n"
msgstr ""
-#: builtin/push.c:41
1
+#: builtin/push.c:41
3
msgid "--all and --tags are incompatible"
msgstr ""
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:41
2
+#: builtin/push.c:41
4
msgid "--all can't be combined with refspecs"
msgstr ""
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:41
7
+#: builtin/push.c:41
9
msgid "--mirror and --tags are incompatible"
msgstr ""
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:4
18
+#: builtin/push.c:4
20
msgid "--mirror can't be combined with refspecs"
msgstr ""
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:42
3
+#: builtin/push.c:42
5
msgid "--all and --mirror are incompatible"
msgstr ""
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:53
9
+#: builtin/push.c:53
7
msgid "repository"
msgstr ""
msgid "repository"
msgstr ""
-#: builtin/push.c:5
40
builtin/send-pack.c:161
+#: builtin/push.c:5
38
builtin/send-pack.c:161
msgid "push all refs"
msgstr ""
msgid "push all refs"
msgstr ""
-#: builtin/push.c:5
41
builtin/send-pack.c:163
+#: builtin/push.c:5
39
builtin/send-pack.c:163
msgid "mirror all refs"
msgstr ""
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:54
3
+#: builtin/push.c:54
1
msgid "delete refs"
msgstr ""
msgid "delete refs"
msgstr ""
-#: builtin/push.c:54
4
+#: builtin/push.c:54
2
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:54
7
builtin/send-pack.c:164
+#: builtin/push.c:54
5
builtin/send-pack.c:164
msgid "force updates"
msgstr ""
msgid "force updates"
msgstr ""
-#: builtin/push.c:54
9
builtin/send-pack.c:175
+#: builtin/push.c:54
7
builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr ""
msgid "refname>:<expect"
msgstr ""
-#: builtin/push.c:5
50
builtin/send-pack.c:176
+#: builtin/push.c:5
48
builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr ""
msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/push.c:553
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr ""
+
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr ""
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:55
5
builtin/send-pack.c:169
+#: builtin/push.c:55
3
builtin/send-pack.c:169
msgid "use thin pack"
msgstr ""
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:55
6 builtin/push.c:557
builtin/send-pack.c:158
+#: builtin/push.c:55
4 builtin/push.c:555
builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr ""
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:55
8
+#: builtin/push.c:55
6
msgid "set upstream for git pull/status"
msgstr ""
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:5
61
+#: builtin/push.c:5
59
msgid "prune locally removed refs"
msgstr ""
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:56
3
+#: builtin/push.c:56
1
msgid "bypass pre-push hook"
msgstr ""
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:56
4
+#: builtin/push.c:56
2
msgid "push missing but relevant tags"
msgstr ""
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:56
7
builtin/send-pack.c:166
+#: builtin/push.c:56
5
builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr ""
msgid "GPG sign the push"
msgstr ""
-#: builtin/push.c:56
9
builtin/send-pack.c:170
+#: builtin/push.c:56
7
builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr ""
msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/push.c:57
9
+#: builtin/push.c:57
7
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:5
81
+#: builtin/push.c:5
79
msgid "--delete doesn't make sense without any refs"
msgstr ""
msgid "--delete doesn't make sense without any refs"
msgstr ""