Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: Update git.pot (3 new, 6 removed messages)
author
Jiang Xin
<worldhello.net@gmail.com>
Tue, 16 Oct 2012 00:39:10 +0000
(08:39 +0800)
committer
Jiang Xin
<worldhello.net@gmail.com>
Tue, 16 Oct 2012 00:39:10 +0000
(08:39 +0800)
This po/git.pot update is generated from v1.8.0-rc2-4-g42e55.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
po/git.pot
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
6de030d
)
diff --git
a/po/git.pot
b/po/git.pot
index 05177d6c8ed1eb06c31632ad7795adc239be4626..e5611581e65c561cfd90de0a0fec5f22043f21f0 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: 2012-
09-15 10:21
+0800\n"
+"POT-Creation-Date: 2012-
10-16 08:38
+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"
@@
-68,11
+68,11
@@
msgstr ""
msgid "prepend prefix to each pathname in the archive"
msgstr ""
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:325 builtin/archive.c:91 builtin/blame.c:23
32
-#: builtin/blame.c:23
33
builtin/config.c:56 builtin/fast-export.c:642
-#: builtin/fast-export.c:644 builtin/grep.c:80
0
builtin/hash-object.c:77
-#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:5
37
-#: builtin/notes.c:69
4
builtin/read-tree.c:107 parse-options.h:149
+#: archive.c:325 builtin/archive.c:91 builtin/blame.c:23
89
+#: builtin/blame.c:23
90
builtin/config.c:56 builtin/fast-export.c:642
+#: builtin/fast-export.c:644 builtin/grep.c:80
1
builtin/hash-object.c:77
+#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:5
40
+#: builtin/notes.c:69
7
builtin/read-tree.c:107 parse-options.h:149
msgid "file"
msgstr ""
msgid "file"
msgstr ""
@@
-112,7
+112,7
@@
msgstr ""
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:346 builtin/archive.c:95 builtin/notes.c:61
6
+#: archive.c:346 builtin/archive.c:95 builtin/notes.c:61
9
msgid "command"
msgstr ""
msgid "command"
msgstr ""
@@
-130,7
+130,7
@@
msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:89 builtin/commit.c:
714
+#: bundle.c:89 builtin/commit.c:
672
#, c-format
msgid "could not open '%s'"
msgstr ""
#, c-format
msgid "could not open '%s'"
msgstr ""
@@
-139,7
+139,7
@@
msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:164 sequencer.c:5
57 sequencer.c:989
builtin/log.c:290
+#: bundle.c:164 sequencer.c:5
62 sequencer.c:994
builtin/log.c:290
#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
@@
-198,12
+198,12
@@
msgstr ""
msgid "index-pack died"
msgstr ""
msgid "index-pack died"
msgstr ""
-#: commit.c:
48
+#: commit.c:
50
#, c-format
msgid "could not parse %s"
msgstr ""
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:5
0
+#: commit.c:5
2
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
@@
-310,32
+310,7
@@
msgid ""
"%s"
msgstr ""
"%s"
msgstr ""
-#: diff.c:1401
-msgid " 0 files changed"
-msgstr ""
-
-#: diff.c:1405
-#, c-format
-msgid " %d file changed"
-msgid_plural " %d files changed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: diff.c:1422
-#, c-format
-msgid ", %d insertion(+)"
-msgid_plural ", %d insertions(+)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: diff.c:1433
-#, c-format
-msgid ", %d deletion(-)"
-msgid_plural ", %d deletions(-)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: diff.c:3460
+#: diff.c:3458
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@
-354,17
+329,17
@@
msgstr ""
msgid "gpg failed to sign the data"
msgstr ""
msgid "gpg failed to sign the data"
msgstr ""
-#: grep.c:1
320
+#: grep.c:1
441
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1
337
+#: grep.c:1
458
#, c-format
msgid "'%s': %s"
msgstr ""
#, c-format
msgid "'%s': %s"
msgstr ""
-#: grep.c:1
348
+#: grep.c:1
469
#, c-format
msgid "'%s': short read %s"
msgstr ""
#, c-format
msgid "'%s': short read %s"
msgstr ""
@@
-709,239
+684,239
@@
msgid_plural ""
msgstr[0] ""
msgstr[1] ""
msgstr[0] ""
msgstr[1] ""
-#: sequencer.c:12
1
builtin/merge.c:864 builtin/merge.c:977
+#: sequencer.c:12
3
builtin/merge.c:864 builtin/merge.c:977
#: builtin/merge.c:1087 builtin/merge.c:1097
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
#: builtin/merge.c:1087 builtin/merge.c:1097
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: sequencer.c:12
3
builtin/merge.c:333 builtin/merge.c:867
+#: sequencer.c:12
5
builtin/merge.c:333 builtin/merge.c:867
#: builtin/merge.c:1089 builtin/merge.c:1102
#, c-format
msgid "Could not write to '%s'"
msgstr ""
#: builtin/merge.c:1089 builtin/merge.c:1102
#, c-format
msgid "Could not write to '%s'"
msgstr ""
-#: sequencer.c:14
4
+#: sequencer.c:14
6
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:14
7
+#: sequencer.c:14
9
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:16
0 sequencer.c:765 sequencer.c:848
+#: sequencer.c:16
2 sequencer.c:770 sequencer.c:853
#, c-format
msgid "Could not write to %s"
msgstr ""
#, c-format
msgid "Could not write to %s"
msgstr ""
-#: sequencer.c:16
3
+#: sequencer.c:16
5
#, c-format
msgid "Error wrapping up %s"
msgstr ""
#, c-format
msgid "Error wrapping up %s"
msgstr ""
-#: sequencer.c:1
78
+#: sequencer.c:1
80
msgid "Your local changes would be overwritten by cherry-pick."
msgstr ""
msgid "Your local changes would be overwritten by cherry-pick."
msgstr ""
-#: sequencer.c:18
0
+#: sequencer.c:18
2
msgid "Your local changes would be overwritten by revert."
msgstr ""
msgid "Your local changes would be overwritten by revert."
msgstr ""
-#: sequencer.c:18
3
+#: sequencer.c:18
5
msgid "Commit your changes or stash them to proceed."
msgstr ""
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
msgid "Commit your changes or stash them to proceed."
msgstr ""
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:23
3
+#: sequencer.c:23
5
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:26
1
+#: sequencer.c:26
6
msgid "Could not resolve HEAD commit\n"
msgstr ""
msgid "Could not resolve HEAD commit\n"
msgstr ""
-#: sequencer.c:28
2
+#: sequencer.c:28
7
msgid "Unable to update cache tree\n"
msgstr ""
msgid "Unable to update cache tree\n"
msgstr ""
-#: sequencer.c:3
27
+#: sequencer.c:3
32
#, c-format
msgid "Could not parse commit %s\n"
msgstr ""
#, c-format
msgid "Could not parse commit %s\n"
msgstr ""
-#: sequencer.c:33
2
+#: sequencer.c:33
7
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr ""
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr ""
-#: sequencer.c:
398
+#: sequencer.c:
403
msgid "Your index file is unmerged."
msgstr ""
msgid "Your index file is unmerged."
msgstr ""
-#: sequencer.c:40
1
+#: sequencer.c:40
6
msgid "You do not have a valid HEAD"
msgstr ""
msgid "You do not have a valid HEAD"
msgstr ""
-#: sequencer.c:4
16
+#: sequencer.c:4
21
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr ""
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:42
4
+#: sequencer.c:42
9
#, c-format
msgid "Commit %s does not have parent %d"
msgstr ""
#, c-format
msgid "Commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:4
28
+#: sequencer.c:4
33
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:4
39
+#: sequencer.c:4
44
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:44
3
+#: sequencer.c:44
8
#, c-format
msgid "Cannot get commit message for %s"
msgstr ""
#, c-format
msgid "Cannot get commit message for %s"
msgstr ""
-#: sequencer.c:5
27
+#: sequencer.c:5
32
#, c-format
msgid "could not revert %s... %s"
msgstr ""
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:5
28
+#: sequencer.c:5
33
#, c-format
msgid "could not apply %s... %s"
msgstr ""
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:56
0
+#: sequencer.c:56
5
msgid "empty commit set passed"
msgstr ""
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:5
68
+#: sequencer.c:5
73
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:57
3
+#: sequencer.c:57
8
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:63
1
+#: sequencer.c:63
6
#, c-format
msgid "Cannot %s during a %s"
msgstr ""
#, c-format
msgid "Cannot %s during a %s"
msgstr ""
-#: sequencer.c:65
3
+#: sequencer.c:65
8
#, c-format
msgid "Could not parse line %d."
msgstr ""
#, c-format
msgid "Could not parse line %d."
msgstr ""
-#: sequencer.c:6
58
+#: sequencer.c:6
63
msgid "No commits parsed."
msgstr ""
msgid "No commits parsed."
msgstr ""
-#: sequencer.c:67
1
+#: sequencer.c:67
6
#, c-format
msgid "Could not open %s"
msgstr ""
#, c-format
msgid "Could not open %s"
msgstr ""
-#: sequencer.c:6
75
+#: sequencer.c:6
80
#, c-format
msgid "Could not read %s."
msgstr ""
#, c-format
msgid "Could not read %s."
msgstr ""
-#: sequencer.c:68
2
+#: sequencer.c:68
7
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr ""
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr ""
-#: sequencer.c:71
0
+#: sequencer.c:71
5
#, c-format
msgid "Invalid key: %s"
msgstr ""
#, c-format
msgid "Invalid key: %s"
msgstr ""
-#: sequencer.c:71
3
+#: sequencer.c:71
8
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
-#: sequencer.c:7
25
+#: sequencer.c:7
30
#, c-format
msgid "Malformed options sheet: %s"
msgstr ""
#, c-format
msgid "Malformed options sheet: %s"
msgstr ""
-#: sequencer.c:7
46
+#: sequencer.c:7
51
msgid "a cherry-pick or revert is already in progress"
msgstr ""
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:7
47
+#: sequencer.c:7
52
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:75
1
+#: sequencer.c:75
6
#, c-format
msgid "Could not create sequencer directory %s"
msgstr ""
#, c-format
msgid "Could not create sequencer directory %s"
msgstr ""
-#: sequencer.c:7
67 sequencer.c:852
+#: sequencer.c:7
72 sequencer.c:857
#, c-format
msgid "Error wrapping up %s."
msgstr ""
#, c-format
msgid "Error wrapping up %s."
msgstr ""
-#: sequencer.c:7
86 sequencer.c:920
+#: sequencer.c:7
91 sequencer.c:925
msgid "no cherry-pick or revert in progress"
msgstr ""
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:7
88
+#: sequencer.c:7
93
msgid "cannot resolve HEAD"
msgstr ""
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:79
0
+#: sequencer.c:79
5
msgid "cannot abort from a branch yet to be born"
msgstr ""
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:81
2
builtin/apply.c:4005
+#: sequencer.c:81
7
builtin/apply.c:4005
#, c-format
msgid "cannot open %s: %s"
msgstr ""
#, c-format
msgid "cannot open %s: %s"
msgstr ""
-#: sequencer.c:8
15
+#: sequencer.c:8
20
#, c-format
msgid "cannot read %s: %s"
msgstr ""
#, c-format
msgid "cannot read %s: %s"
msgstr ""
-#: sequencer.c:8
16
+#: sequencer.c:8
21
msgid "unexpected end of file"
msgstr ""
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:82
2
+#: sequencer.c:82
7
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:8
45
+#: sequencer.c:8
50
#, c-format
msgid "Could not format %s."
msgstr ""
#, c-format
msgid "Could not format %s."
msgstr ""
-#: sequencer.c:10
07
+#: sequencer.c:10
12
msgid "Can't revert as initial commit"
msgstr ""
msgid "Can't revert as initial commit"
msgstr ""
-#: sequencer.c:10
08
+#: sequencer.c:10
13
msgid "Can't cherry-pick into empty head"
msgstr ""
msgid "Can't cherry-pick into empty head"
msgstr ""
@@
-1324,7
+1299,7
@@
msgstr ""
msgid "unexpected diff status %c"
msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:67 builtin/commit.c:2
29
+#: builtin/add.c:67 builtin/commit.c:2
30
msgid "updating files failed"
msgstr ""
msgid "updating files failed"
msgstr ""
@@
-1389,7
+1364,7
@@
msgstr ""
msgid "dry run"
msgstr ""
msgid "dry run"
msgstr ""
-#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:11
87
+#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:11
54
#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477
#: builtin/mv.c:62 builtin/read-tree.c:112
msgid "be verbose"
#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477
#: builtin/mv.c:62 builtin/read-tree.c:112
msgid "be verbose"
@@
-1466,7
+1441,7
@@
msgstr ""
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:2
89
builtin/mv.c:82
+#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:2
90
builtin/mv.c:82
#: builtin/rm.c:162
msgid "index file corrupt"
msgstr ""
#: builtin/rm.c:162
msgid "index file corrupt"
msgstr ""
@@
-2000,95
+1975,95
@@
msgstr ""
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr ""
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:23
16
+#: builtin/blame.c:23
73
msgid "Show blame entries as we find them, incrementally"
msgstr ""
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:23
17
+#: builtin/blame.c:23
74
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:23
18
+#: builtin/blame.c:23
75
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:23
19
+#: builtin/blame.c:23
76
msgid "Show work cost statistics"
msgstr ""
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:23
20
+#: builtin/blame.c:23
77
msgid "Show output score for blame entries"
msgstr ""
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:23
21
+#: builtin/blame.c:23
78
msgid "Show original filename (Default: auto)"
msgstr ""
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:23
22
+#: builtin/blame.c:23
79
msgid "Show original linenumber (Default: off)"
msgstr ""
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:23
23
+#: builtin/blame.c:23
80
msgid "Show in a format designed for machine consumption"
msgstr ""
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:23
24
+#: builtin/blame.c:23
81
msgid "Show porcelain format with per-line commit information"
msgstr ""
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:23
25
+#: builtin/blame.c:23
82
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:23
26
+#: builtin/blame.c:23
83
msgid "Show raw timestamp (Default: off)"
msgstr ""
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:23
27
+#: builtin/blame.c:23
84
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:23
28
+#: builtin/blame.c:23
85
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:23
29
+#: builtin/blame.c:23
86
msgid "Show author email instead of name (Default: off)"
msgstr ""
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:23
30
+#: builtin/blame.c:23
87
msgid "Ignore whitespace differences"
msgstr ""
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:23
31
+#: builtin/blame.c:23
88
msgid "Spend extra cycles to find better match"
msgstr ""
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:23
32
+#: builtin/blame.c:23
89
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:23
33
+#: builtin/blame.c:23
90
msgid "Use <file>'s contents as the final image"
msgstr ""
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:23
34 builtin/blame.c:2335
+#: builtin/blame.c:23
91 builtin/blame.c:2392
msgid "score"
msgstr ""
msgid "score"
msgstr ""
-#: builtin/blame.c:23
34
+#: builtin/blame.c:23
91
msgid "Find line copies within and across files"
msgstr ""
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:23
35
+#: builtin/blame.c:23
92
msgid "Find line movements within and across files"
msgstr ""
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:23
36
+#: builtin/blame.c:23
93
msgid "n,m"
msgstr ""
msgid "n,m"
msgstr ""
-#: builtin/blame.c:23
36
+#: builtin/blame.c:23
93
msgid "Process only line range n,m, counting from 1"
msgstr ""
msgid "Process only line range n,m, counting from 1"
msgstr ""
@@
-2290,8
+2265,8
@@
msgid "act on remote-tracking branches"
msgstr ""
#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765
msgstr ""
#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765
-#: builtin/branch.c:771 builtin/commit.c:13
95 builtin/commit.c:1396
-#: builtin/commit.c:13
97 builtin/commit.c:1398
builtin/tag.c:470
+#: builtin/branch.c:771 builtin/commit.c:13
62 builtin/commit.c:1363
+#: builtin/commit.c:13
64 builtin/commit.c:1365
builtin/tag.c:470
msgid "commit"
msgstr ""
msgid "commit"
msgstr ""
@@
-2460,7
+2435,7
@@
msgid "git check-attr [-a | --all | attr...] [--] pathname..."
msgstr ""
#: builtin/check-attr.c:12
msgstr ""
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"
+msgid "git check-attr --stdin [-
z] [-
a | --all | attr...] < <list-of-paths>"
msgstr ""
#: builtin/check-attr.c:19
msgstr ""
#: builtin/check-attr.c:19
@@
-2823,7
+2798,7
@@
msgstr ""
msgid "remove whole directories"
msgstr ""
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:80
2
+#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:80
3
#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199
msgid "pattern"
msgstr ""
#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199
msgid "pattern"
msgstr ""
@@
-2945,7
+2920,7
@@
msgstr ""
msgid "path to git-upload-pack on the remote"
msgstr ""
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:74
7
+#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:74
8
msgid "depth"
msgstr ""
msgid "depth"
msgstr ""
@@
-3022,69
+2997,69
@@
msgstr ""
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:6
42
+#: builtin/clone.c:6
90
msgid "Too many arguments."
msgstr ""
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:6
46
+#: builtin/clone.c:6
94
msgid "You must specify a repository to clone."
msgstr ""
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:
657
+#: builtin/clone.c:
705
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:
671
+#: builtin/clone.c:
719
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:
676
+#: builtin/clone.c:
724
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:
686
+#: builtin/clone.c:
734
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:
696
+#: builtin/clone.c:
744
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:7
09 builtin/clone.c:723
+#: builtin/clone.c:7
57 builtin/clone.c:771
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:7
12
+#: builtin/clone.c:7
60
#, c-format
msgid "could not create work tree dir '%s'."
msgstr ""
#, c-format
msgid "could not create work tree dir '%s'."
msgstr ""
-#: builtin/clone.c:7
31
+#: builtin/clone.c:7
79
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:7
33
+#: builtin/clone.c:7
81
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:
789
+#: builtin/clone.c:
823
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:8
38
+#: builtin/clone.c:8
72
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:8
45
+#: builtin/clone.c:8
79
msgid "You appear to have cloned an empty repository."
msgstr ""
msgid "You appear to have cloned an empty repository."
msgstr ""
@@
-3120,15
+3095,15
@@
msgstr ""
msgid "--command must be the first argument"
msgstr ""
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit.c:3
3
+#: builtin/commit.c:3
4
msgid "git commit [options] [--] <filepattern>..."
msgstr ""
msgid "git commit [options] [--] <filepattern>..."
msgstr ""
-#: builtin/commit.c:3
8
+#: builtin/commit.c:3
9
msgid "git status [options] [--] <filepattern>..."
msgstr ""
msgid "git status [options] [--] <filepattern>..."
msgstr ""
-#: builtin/commit.c:4
3
+#: builtin/commit.c:4
4
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@
-3142,14
+3117,14
@@
msgid ""
" git commit --amend --reset-author\n"
msgstr ""
" git commit --amend --reset-author\n"
msgstr ""
-#: builtin/commit.c:5
5
+#: builtin/commit.c:5
6
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-#: builtin/commit.c:6
0
+#: builtin/commit.c:6
1
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@
-3159,93
+3134,93
@@
msgid ""
"Otherwise, please use 'git reset'\n"
msgstr ""
"Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/commit.c:25
6
+#: builtin/commit.c:25
7
msgid "failed to unpack HEAD tree object"
msgstr ""
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:29
8
+#: builtin/commit.c:29
9
msgid "unable to create temporary index"
msgstr ""
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:30
4
+#: builtin/commit.c:30
5
msgid "interactive add failed"
msgstr ""
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:33
7 builtin/commit.c:358 builtin/commit.c:408
+#: builtin/commit.c:33
8 builtin/commit.c:359 builtin/commit.c:409
msgid "unable to write new_index file"
msgstr ""
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:3
89
+#: builtin/commit.c:3
90
msgid "cannot do a partial commit during a merge."
msgstr ""
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:39
1
+#: builtin/commit.c:39
2
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:40
1
+#: builtin/commit.c:40
2
msgid "cannot read the index"
msgstr ""
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:42
1
+#: builtin/commit.c:42
2
msgid "unable to write temporary index file"
msgstr ""
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:5
10 builtin/commit.c:516
+#: builtin/commit.c:5
09 builtin/commit.c:515
#, c-format
msgid "invalid commit: %s"
msgstr ""
#, c-format
msgid "invalid commit: %s"
msgstr ""
-#: builtin/commit.c:53
9
+#: builtin/commit.c:53
8
msgid "malformed --author parameter"
msgstr ""
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:
600
+#: builtin/commit.c:
558
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
-#: builtin/commit.c:
638 builtin/commit.c:671 builtin/commit.c:985
+#: builtin/commit.c:
596 builtin/commit.c:629 builtin/commit.c:952
#, c-format
msgid "could not lookup commit %s"
msgstr ""
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:6
50
builtin/shortlog.c:296
+#: builtin/commit.c:6
08
builtin/shortlog.c:296
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:6
52
+#: builtin/commit.c:6
10
msgid "could not read log from standard input"
msgstr ""
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:6
56
+#: builtin/commit.c:6
14
#, c-format
msgid "could not read log file '%s'"
msgstr ""
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:6
62
+#: builtin/commit.c:6
20
msgid "commit has empty message"
msgstr ""
msgid "commit has empty message"
msgstr ""
-#: builtin/commit.c:6
78
+#: builtin/commit.c:6
36
msgid "could not read MERGE_MSG"
msgstr ""
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:6
82
+#: builtin/commit.c:6
40
msgid "could not read SQUASH_MSG"
msgstr ""
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:6
86
+#: builtin/commit.c:6
44
#, c-format
msgid "could not read '%s'"
msgstr ""
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: builtin/commit.c:7
38
+#: builtin/commit.c:7
05
msgid "could not write commit template"
msgstr ""
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:7
49
+#: builtin/commit.c:7
16
#, c-format
msgid ""
"\n"
#, c-format
msgid ""
"\n"
@@
-3255,7
+3230,7
@@
msgid ""
"and try again.\n"
msgstr ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:7
54
+#: builtin/commit.c:7
21
#, c-format
msgid ""
"\n"
#, c-format
msgid ""
"\n"
@@
-3265,356
+3240,356
@@
msgid ""
"and try again.\n"
msgstr ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:7
66
+#: builtin/commit.c:7
33
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:7
71
+#: builtin/commit.c:7
38
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:7
84
+#: builtin/commit.c:7
51
#, c-format
msgid "%sAuthor: %s"
msgstr ""
#, c-format
msgid "%sAuthor: %s"
msgstr ""
-#: builtin/commit.c:7
91
+#: builtin/commit.c:7
58
#, c-format
msgid "%sCommitter: %s"
msgstr ""
#, c-format
msgid "%sCommitter: %s"
msgstr ""
-#: builtin/commit.c:
811
+#: builtin/commit.c:
778
msgid "Cannot read index"
msgstr ""
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:8
48
+#: builtin/commit.c:8
15
msgid "Error building trees"
msgstr ""
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:8
63
builtin/tag.c:361
+#: builtin/commit.c:8
30
builtin/tag.c:361
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:9
60
+#: builtin/commit.c:9
27
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
-#: builtin/commit.c:9
75 builtin/commit.c:1175
+#: builtin/commit.c:9
42 builtin/commit.c:1142
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:
1015
+#: builtin/commit.c:
982
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:
1026
+#: builtin/commit.c:
993
msgid "You have nothing to amend."
msgstr ""
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:
1029
+#: builtin/commit.c:
996
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:
1031
+#: builtin/commit.c:
998
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:10
34
+#: builtin/commit.c:10
01
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:10
44
+#: builtin/commit.c:10
11
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:10
46
+#: builtin/commit.c:10
13
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:10
54
+#: builtin/commit.c:10
21
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:10
71
+#: builtin/commit.c:10
38
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:10
73
+#: builtin/commit.c:10
40
msgid "No paths with --include/--only does not make sense."
msgstr ""
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:10
75
+#: builtin/commit.c:10
42
msgid "Clever... amending the last one with dirty index."
msgstr ""
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:10
77
+#: builtin/commit.c:10
44
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:10
87
builtin/tag.c:577
+#: builtin/commit.c:10
54
builtin/tag.c:577
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:10
92
+#: builtin/commit.c:10
59
msgid "Paths with -a does not make sense."
msgstr ""
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:11
89 builtin/commit.c:1417
+#: builtin/commit.c:11
56 builtin/commit.c:1384
msgid "show status concisely"
msgstr ""
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:11
91 builtin/commit.c:1419
+#: builtin/commit.c:11
58 builtin/commit.c:1386
msgid "show branch information"
msgstr ""
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:11
93 builtin/commit.c:1421
builtin/push.c:389
+#: builtin/commit.c:11
60 builtin/commit.c:1388
builtin/push.c:389
msgid "machine-readable output"
msgstr ""
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:11
96 builtin/commit.c:1423
+#: builtin/commit.c:11
63 builtin/commit.c:1390
msgid "terminate entries with NUL"
msgstr ""
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:11
98 builtin/commit.c:1426
builtin/fast-export.c:636
+#: builtin/commit.c:11
65 builtin/commit.c:1393
builtin/fast-export.c:636
#: builtin/fast-export.c:639 builtin/tag.c:461
msgid "mode"
msgstr ""
#: builtin/fast-export.c:639 builtin/tag.c:461
msgid "mode"
msgstr ""
-#: builtin/commit.c:11
99 builtin/commit.c:1426
+#: builtin/commit.c:11
66 builtin/commit.c:1393
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1
202
+#: builtin/commit.c:1
169
msgid "show ignored files"
msgstr ""
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1
203
parse-options.h:151
+#: builtin/commit.c:1
170
parse-options.h:151
msgid "when"
msgstr ""
msgid "when"
msgstr ""
-#: builtin/commit.c:1
204
+#: builtin/commit.c:1
171
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1
206
+#: builtin/commit.c:1
173
msgid "list untracked files in columns"
msgstr ""
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:12
75
+#: builtin/commit.c:12
42
msgid "couldn't look up newly created commit"
msgstr ""
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:12
77
+#: builtin/commit.c:12
44
msgid "could not parse newly created commit"
msgstr ""
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1
318
+#: builtin/commit.c:1
285
msgid "detached HEAD"
msgstr ""
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1
320
+#: builtin/commit.c:1
287
msgid " (root-commit)"
msgstr ""
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:13
87
+#: builtin/commit.c:13
54
msgid "suppress summary after successful commit"
msgstr ""
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:13
88
+#: builtin/commit.c:13
55
msgid "show diff in commit message template"
msgstr ""
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:13
90
+#: builtin/commit.c:13
57
msgid "Commit message options"
msgstr ""
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:13
91
builtin/tag.c:459
+#: builtin/commit.c:13
58
builtin/tag.c:459
msgid "read message from file"
msgstr ""
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:13
92
+#: builtin/commit.c:13
59
msgid "author"
msgstr ""
msgid "author"
msgstr ""
-#: builtin/commit.c:13
92
+#: builtin/commit.c:13
59
msgid "override author for commit"
msgstr ""
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:13
93
builtin/gc.c:178
+#: builtin/commit.c:13
60
builtin/gc.c:178
msgid "date"
msgstr ""
msgid "date"
msgstr ""
-#: builtin/commit.c:13
93
+#: builtin/commit.c:13
60
msgid "override date for commit"
msgstr ""
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:13
94 builtin/merge.c:206 builtin/notes.c:534
-#: builtin/notes.c:69
1
builtin/tag.c:457
+#: builtin/commit.c:13
61 builtin/merge.c:206 builtin/notes.c:537
+#: builtin/notes.c:69
4
builtin/tag.c:457
msgid "message"
msgstr ""
msgid "message"
msgstr ""
-#: builtin/commit.c:13
94
+#: builtin/commit.c:13
61
msgid "commit message"
msgstr ""
msgid "commit message"
msgstr ""
-#: builtin/commit.c:13
95
+#: builtin/commit.c:13
62
msgid "reuse and edit message from specified commit"
msgstr ""
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:13
96
+#: builtin/commit.c:13
63
msgid "reuse message from specified commit"
msgstr ""
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:13
97
+#: builtin/commit.c:13
64
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:13
98
+#: builtin/commit.c:13
65
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:13
99
+#: builtin/commit.c:13
66
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:1
400
builtin/log.c:1068 builtin/revert.c:109
+#: builtin/commit.c:1
367
builtin/log.c:1068 builtin/revert.c:109
msgid "add Signed-off-by:"
msgstr ""
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1
401
+#: builtin/commit.c:1
368
msgid "use specified template file"
msgstr ""
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1
402
+#: builtin/commit.c:1
369
msgid "force edit of commit"
msgstr ""
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1
403
+#: builtin/commit.c:1
370
msgid "default"
msgstr ""
msgid "default"
msgstr ""
-#: builtin/commit.c:1
403
builtin/tag.c:462
+#: builtin/commit.c:1
370
builtin/tag.c:462
msgid "how to strip spaces and #comments from message"
msgstr ""
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1
404
+#: builtin/commit.c:1
371
msgid "include status in commit message template"
msgstr ""
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1
405
builtin/merge.c:213 builtin/tag.c:463
+#: builtin/commit.c:1
372
builtin/merge.c:213 builtin/tag.c:463
msgid "key id"
msgstr ""
msgid "key id"
msgstr ""
-#: builtin/commit.c:1
406
builtin/merge.c:214
+#: builtin/commit.c:1
373
builtin/merge.c:214
msgid "GPG sign commit"
msgstr ""
#. end commit message options
msgid "GPG sign commit"
msgstr ""
#. end commit message options
-#: builtin/commit.c:1
409
+#: builtin/commit.c:1
376
msgid "Commit contents options"
msgstr ""
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1
410
+#: builtin/commit.c:1
377
msgid "commit all changed files"
msgstr ""
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1
411
+#: builtin/commit.c:1
378
msgid "add specified files to index for commit"
msgstr ""
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1
412
+#: builtin/commit.c:1
379
msgid "interactively add files"
msgstr ""
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1
413
+#: builtin/commit.c:1
380
msgid "interactively add changes"
msgstr ""
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1
414
+#: builtin/commit.c:1
381
msgid "commit only specified files"
msgstr ""
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1
415
+#: builtin/commit.c:1
382
msgid "bypass pre-commit hook"
msgstr ""
msgid "bypass pre-commit hook"
msgstr ""
-#: builtin/commit.c:1
416
+#: builtin/commit.c:1
383
msgid "show what would be committed"
msgstr ""
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1
424
+#: builtin/commit.c:1
391
msgid "amend previous commit"
msgstr ""
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1
425
+#: builtin/commit.c:1
392
msgid "bypass post-rewrite hook"
msgstr ""
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1
430
+#: builtin/commit.c:1
397
msgid "ok to record an empty change"
msgstr ""
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:14
33
+#: builtin/commit.c:14
00
msgid "ok to record a change with an empty message"
msgstr ""
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:14
64
+#: builtin/commit.c:14
32
msgid "could not parse HEAD commit"
msgstr ""
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1
502
builtin/merge.c:508
+#: builtin/commit.c:1
470
builtin/merge.c:508
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/commit.c:1
509
+#: builtin/commit.c:1
477
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1
516
+#: builtin/commit.c:1
484
msgid "could not read MERGE_MODE"
msgstr ""
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:15
35
+#: builtin/commit.c:15
03
#, c-format
msgid "could not read commit message: %s"
msgstr ""
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:15
49
+#: builtin/commit.c:15
17
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:15
54
+#: builtin/commit.c:15
22
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:15
69
builtin/merge.c:935 builtin/merge.c:960
+#: builtin/commit.c:15
37
builtin/merge.c:935 builtin/merge.c:960
msgid "failed to write commit object"
msgstr ""
msgid "failed to write commit object"
msgstr ""
-#: builtin/commit.c:15
90
+#: builtin/commit.c:15
58
msgid "cannot lock HEAD ref"
msgstr ""
msgid "cannot lock HEAD ref"
msgstr ""
-#: builtin/commit.c:15
94
+#: builtin/commit.c:15
62
msgid "cannot update HEAD ref"
msgstr ""
msgid "cannot update HEAD ref"
msgstr ""
-#: builtin/commit.c:1
605
+#: builtin/commit.c:1
573
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
@@
-4034,145
+4009,145
@@
msgstr ""
msgid "object %s not found"
msgstr ""
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:2
60
+#: builtin/fetch.c:2
59
msgid "[up to date]"
msgstr ""
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:27
4
+#: builtin/fetch.c:27
3
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
-#: builtin/fetch.c:27
5 builtin/fetch.c:361
+#: builtin/fetch.c:27
4 builtin/fetch.c:360
msgid "[rejected]"
msgstr ""
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:28
6
+#: builtin/fetch.c:28
5
msgid "[tag update]"
msgstr ""
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:28
8 builtin/fetch.c:323 builtin/fetch.c:341
+#: builtin/fetch.c:28
7 builtin/fetch.c:322 builtin/fetch.c:340
msgid " (unable to update local ref)"
msgstr ""
msgid " (unable to update local ref)"
msgstr ""
-#: builtin/fetch.c:30
6
+#: builtin/fetch.c:30
5
msgid "[new tag]"
msgstr ""
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:30
9
+#: builtin/fetch.c:30
8
msgid "[new branch]"
msgstr ""
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:31
2
+#: builtin/fetch.c:31
1
msgid "[new ref]"
msgstr ""
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:35
7
+#: builtin/fetch.c:35
6
msgid "unable to update local ref"
msgstr ""
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:35
7
+#: builtin/fetch.c:35
6
msgid "forced update"
msgstr ""
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:36
3
+#: builtin/fetch.c:36
2
msgid "(non-fast-forward)"
msgstr ""
msgid "(non-fast-forward)"
msgstr ""
-#: builtin/fetch.c:39
4 builtin/fetch.c:686
+#: builtin/fetch.c:39
3 builtin/fetch.c:685
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: builtin/fetch.c:40
3
+#: builtin/fetch.c:40
2
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:48
9
+#: builtin/fetch.c:48
8
#, c-format
msgid "From %.*s\n"
msgstr ""
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:
500
+#: builtin/fetch.c:
499
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/fetch.c:5
50
+#: builtin/fetch.c:5
49
#, c-format
msgid " (%s will become dangling)"
msgstr ""
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:55
1
+#: builtin/fetch.c:55
0
#, c-format
msgid " (%s has become dangling)"
msgstr ""
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:55
8
+#: builtin/fetch.c:55
7
msgid "[deleted]"
msgstr ""
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:55
9
builtin/remote.c:1055
+#: builtin/fetch.c:55
8
builtin/remote.c:1055
msgid "(none)"
msgstr ""
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:67
6
+#: builtin/fetch.c:67
5
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:7
10
+#: builtin/fetch.c:7
09
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:78
7
+#: builtin/fetch.c:78
6
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:7
90
+#: builtin/fetch.c:7
89
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:89
2
+#: builtin/fetch.c:89
1
#, c-format
msgid "Fetching %s\n"
msgstr ""
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:89
4
builtin/remote.c:100
+#: builtin/fetch.c:89
3
builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr ""
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:91
3
+#: builtin/fetch.c:91
2
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/fetch.c:93
3
+#: builtin/fetch.c:93
2
msgid "You need to specify a tag name."
msgstr ""
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:98
5
+#: builtin/fetch.c:98
4
msgid "fetch --all does not take a repository argument"
msgstr ""
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:98
7
+#: builtin/fetch.c:98
6
msgid "fetch --all does not make sense with refspecs"
msgstr ""
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:99
8
+#: builtin/fetch.c:99
7
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:100
6
+#: builtin/fetch.c:100
5
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
@@
-4180,7
+4155,7
@@
msgstr ""
msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
msgstr ""
msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:78
6
+#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:78
7
#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192
#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235
msgid "n"
#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192
#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235
msgid "n"
@@
-4316,19
+4291,14
@@
msgstr ""
msgid "enable auto-gc mode"
msgstr ""
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:221
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
-msgstr ""
-
-#: builtin/gc.c:224
+#: builtin/gc.c:222
#, c-format
msgid ""
"Auto packing the repository for optimum performance. You may also\n"
"run \"git gc\" manually. See \"git help gc\" for more information.\n"
msgstr ""
#, c-format
msgid ""
"Auto packing the repository for optimum performance. You may also\n"
"run \"git gc\" manually. See \"git help gc\" for more information.\n"
msgstr ""
-#: builtin/gc.c:2
51
+#: builtin/gc.c:2
49
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@
-4337,226
+4307,230
@@
msgstr ""
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/grep.c:21
6
+#: builtin/grep.c:21
7
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/grep.c:45
4
+#: builtin/grep.c:45
5
#, c-format
msgid "Failed to chdir: %s"
msgstr ""
#, c-format
msgid "Failed to chdir: %s"
msgstr ""
-#: builtin/grep.c:53
0 builtin/grep.c:564
+#: builtin/grep.c:53
1 builtin/grep.c:565
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:57
8
+#: builtin/grep.c:57
9
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:63
6
+#: builtin/grep.c:63
7
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:65
3
+#: builtin/grep.c:65
4
#, c-format
msgid "cannot open '%s'"
msgstr ""
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: builtin/grep.c:72
8
+#: builtin/grep.c:72
9
msgid "search in index instead of in the work tree"
msgstr ""
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:73
0
+#: builtin/grep.c:73
1
msgid "find in contents not managed by git"
msgstr ""
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:73
2
+#: builtin/grep.c:73
3
msgid "search in both tracked and untracked files"
msgstr ""
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:73
4
+#: builtin/grep.c:73
5
msgid "search also in ignored files"
msgstr ""
msgid "search also in ignored files"
msgstr ""
-#: builtin/grep.c:73
7
+#: builtin/grep.c:73
8
msgid "show non-matching lines"
msgstr ""
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:7
39
+#: builtin/grep.c:7
40
msgid "case insensitive matching"
msgstr ""
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:74
1
+#: builtin/grep.c:74
2
msgid "match patterns only at word boundaries"
msgstr ""
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:74
3
+#: builtin/grep.c:74
4
msgid "process binary files as text"
msgstr ""
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:74
5
+#: builtin/grep.c:74
6
msgid "don't match patterns in binary files"
msgstr ""
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:74
8
+#: builtin/grep.c:74
9
msgid "descend at most <depth> levels"
msgstr ""
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:75
2
+#: builtin/grep.c:75
3
msgid "use extended POSIX regular expressions"
msgstr ""
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:75
5
+#: builtin/grep.c:75
6
msgid "use basic POSIX regular expressions (default)"
msgstr ""
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:75
8
+#: builtin/grep.c:75
9
msgid "interpret patterns as fixed strings"
msgstr ""
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:76
1
+#: builtin/grep.c:76
2
msgid "use Perl-compatible regular expressions"
msgstr ""
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:76
4
+#: builtin/grep.c:76
5
msgid "show line numbers"
msgstr ""
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:76
5
+#: builtin/grep.c:76
6
msgid "don't show filenames"
msgstr ""
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:76
6
+#: builtin/grep.c:76
7
msgid "show filenames"
msgstr ""
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:76
8
+#: builtin/grep.c:76
9
msgid "show filenames relative to top directory"
msgstr ""
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:77
0
+#: builtin/grep.c:77
1
msgid "show only filenames instead of matching lines"
msgstr ""
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:77
2
+#: builtin/grep.c:77
3
msgid "synonym for --files-with-matches"
msgstr ""
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:77
5
+#: builtin/grep.c:77
6
msgid "show only the names of files without match"
msgstr ""
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:77
7
+#: builtin/grep.c:77
8
msgid "print NUL after filenames"
msgstr ""
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:7
79
+#: builtin/grep.c:7
80
msgid "show the number of matches instead of matching lines"
msgstr ""
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:78
0
+#: builtin/grep.c:78
1
msgid "highlight matches"
msgstr ""
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:78
2
+#: builtin/grep.c:78
3
msgid "print empty line between matches from different files"
msgstr ""
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:78
4
+#: builtin/grep.c:78
5
msgid "show filename only once above matches from same file"
msgstr ""
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:78
7
+#: builtin/grep.c:78
8
msgid "show <n> context lines before and after matches"
msgstr ""
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:79
0
+#: builtin/grep.c:79
1
msgid "show <n> context lines before matches"
msgstr ""
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:79
2
+#: builtin/grep.c:79
3
msgid "show <n> context lines after matches"
msgstr ""
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:79
3
+#: builtin/grep.c:79
4
msgid "shortcut for -C NUM"
msgstr ""
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:79
6
+#: builtin/grep.c:79
7
msgid "show a line with the function name before matches"
msgstr ""
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:79
8
+#: builtin/grep.c:79
9
msgid "show the surrounding function"
msgstr ""
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:80
1
+#: builtin/grep.c:80
2
msgid "read patterns from file"
msgstr ""
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:80
3
+#: builtin/grep.c:80
4
msgid "match <pattern>"
msgstr ""
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:80
5
+#: builtin/grep.c:80
6
msgid "combine patterns specified with -e"
msgstr ""
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:81
7
+#: builtin/grep.c:81
8
msgid "indicate hit with exit status without output"
msgstr ""
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:8
19
+#: builtin/grep.c:8
20
msgid "show only matches from files that match all patterns"
msgstr ""
#: builtin/grep.c:822
msgid "show only matches from files that match all patterns"
msgstr ""
#: builtin/grep.c:822
+msgid "show parse tree for grep expression"
+msgstr ""
+
+#: builtin/grep.c:826
msgid "pager"
msgstr ""
msgid "pager"
msgstr ""
-#: builtin/grep.c:82
2
+#: builtin/grep.c:82
6
msgid "show matching files in the pager"
msgstr ""
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:82
5
+#: builtin/grep.c:82
9
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:8
26
builtin/show-ref.c:201
+#: builtin/grep.c:8
30
builtin/show-ref.c:201
msgid "show usage"
msgstr ""
msgid "show usage"
msgstr ""
-#: builtin/grep.c:9
17
+#: builtin/grep.c:9
21
msgid "no pattern given."
msgstr ""
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:93
1
+#: builtin/grep.c:93
5
#, c-format
msgid "bad object %s"
msgstr ""
#, c-format
msgid "bad object %s"
msgstr ""
-#: builtin/grep.c:97
2
+#: builtin/grep.c:97
6
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:99
5
+#: builtin/grep.c:99
9
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:100
0
+#: builtin/grep.c:100
4
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
-#: builtin/grep.c:100
3
+#: builtin/grep.c:100
7
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:101
1
+#: builtin/grep.c:101
5
msgid "both --cached and trees are given."
msgstr ""
msgid "both --cached and trees are given."
msgstr ""
@@
-5552,7
+5526,7
@@
msgstr ""
msgid "abort if fast-forward is not possible"
msgstr ""
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:202 builtin/notes.c:8
67
builtin/revert.c:112
+#: builtin/merge.c:202 builtin/notes.c:8
70
builtin/revert.c:112
msgid "strategy"
msgstr ""
msgid "strategy"
msgstr ""
@@
-6000,338
+5974,338
@@
msgstr ""
msgid "allow to print `undefined` names"
msgstr ""
msgid "allow to print `undefined` names"
msgstr ""
-#: builtin/notes.c:2
3
+#: builtin/notes.c:2
6
msgid "git notes [--ref <notes_ref>] [list [<object>]]"
msgstr ""
msgid "git notes [--ref <notes_ref>] [list [<object>]]"
msgstr ""
-#: builtin/notes.c:2
4
+#: builtin/notes.c:2
7
msgid ""
"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
"<object>] [<object>]"
msgstr ""
msgid ""
"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
"<object>] [<object>]"
msgstr ""
-#: builtin/notes.c:2
5
+#: builtin/notes.c:2
8
msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
msgstr ""
msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
msgstr ""
-#: builtin/notes.c:2
6
+#: builtin/notes.c:2
9
msgid ""
"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
"<object>] [<object>]"
msgstr ""
msgid ""
"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
"<object>] [<object>]"
msgstr ""
-#: builtin/notes.c:
27
+#: builtin/notes.c:
30
msgid "git notes [--ref <notes_ref>] edit [<object>]"
msgstr ""
msgid "git notes [--ref <notes_ref>] edit [<object>]"
msgstr ""
-#: builtin/notes.c:
28
+#: builtin/notes.c:
31
msgid "git notes [--ref <notes_ref>] show [<object>]"
msgstr ""
msgid "git notes [--ref <notes_ref>] show [<object>]"
msgstr ""
-#: builtin/notes.c:
29
+#: builtin/notes.c:
32
msgid ""
"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
msgstr ""
msgid ""
"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
msgstr ""
-#: builtin/notes.c:3
0
+#: builtin/notes.c:3
3
msgid "git notes merge --commit [-v | -q]"
msgstr ""
msgid "git notes merge --commit [-v | -q]"
msgstr ""
-#: builtin/notes.c:3
1
+#: builtin/notes.c:3
4
msgid "git notes merge --abort [-v | -q]"
msgstr ""
msgid "git notes merge --abort [-v | -q]"
msgstr ""
-#: builtin/notes.c:3
2
+#: builtin/notes.c:3
5
msgid "git notes [--ref <notes_ref>] remove [<object>...]"
msgstr ""
msgid "git notes [--ref <notes_ref>] remove [<object>...]"
msgstr ""
-#: builtin/notes.c:3
3
+#: builtin/notes.c:3
6
msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
msgstr ""
msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
msgstr ""
-#: builtin/notes.c:3
4
+#: builtin/notes.c:3
7
msgid "git notes [--ref <notes_ref>] get-ref"
msgstr ""
msgid "git notes [--ref <notes_ref>] get-ref"
msgstr ""
-#: builtin/notes.c:
39
+#: builtin/notes.c:
42
msgid "git notes [list [<object>]]"
msgstr ""
msgid "git notes [list [<object>]]"
msgstr ""
-#: builtin/notes.c:4
4
+#: builtin/notes.c:4
7
msgid "git notes add [<options>] [<object>]"
msgstr ""
msgid "git notes add [<options>] [<object>]"
msgstr ""
-#: builtin/notes.c:
49
+#: builtin/notes.c:
52
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr ""
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr ""
-#: builtin/notes.c:5
0
+#: builtin/notes.c:5
3
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr ""
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr ""
-#: builtin/notes.c:5
5
+#: builtin/notes.c:5
8
msgid "git notes append [<options>] [<object>]"
msgstr ""
msgid "git notes append [<options>] [<object>]"
msgstr ""
-#: builtin/notes.c:6
0
+#: builtin/notes.c:6
3
msgid "git notes edit [<object>]"
msgstr ""
msgid "git notes edit [<object>]"
msgstr ""
-#: builtin/notes.c:6
5
+#: builtin/notes.c:6
8
msgid "git notes show [<object>]"
msgstr ""
msgid "git notes show [<object>]"
msgstr ""
-#: builtin/notes.c:7
0
+#: builtin/notes.c:7
3
msgid "git notes merge [<options>] <notes_ref>"
msgstr ""
msgid "git notes merge [<options>] <notes_ref>"
msgstr ""
-#: builtin/notes.c:7
1
+#: builtin/notes.c:7
4
msgid "git notes merge --commit [<options>]"
msgstr ""
msgid "git notes merge --commit [<options>]"
msgstr ""
-#: builtin/notes.c:7
2
+#: builtin/notes.c:7
5
msgid "git notes merge --abort [<options>]"
msgstr ""
msgid "git notes merge --abort [<options>]"
msgstr ""
-#: builtin/notes.c:
77
+#: builtin/notes.c:
80
msgid "git notes remove [<object>]"
msgstr ""
msgid "git notes remove [<object>]"
msgstr ""
-#: builtin/notes.c:8
2
+#: builtin/notes.c:8
5
msgid "git notes prune [<options>]"
msgstr ""
msgid "git notes prune [<options>]"
msgstr ""
-#: builtin/notes.c:
87
+#: builtin/notes.c:
90
msgid "git notes get-ref"
msgstr ""
msgid "git notes get-ref"
msgstr ""
-#: builtin/notes.c:1
39
+#: builtin/notes.c:1
42
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr ""
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:14
5
+#: builtin/notes.c:14
8
msgid "can't fdopen 'show' output fd"
msgstr ""
msgid "can't fdopen 'show' output fd"
msgstr ""
-#: builtin/notes.c:15
5
+#: builtin/notes.c:15
8
#, c-format
msgid "failed to close pipe to 'show' for object '%s'"
msgstr ""
#, c-format
msgid "failed to close pipe to 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:1
58
+#: builtin/notes.c:1
61
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr ""
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:17
5
builtin/tag.c:347
+#: builtin/notes.c:17
8
builtin/tag.c:347
#, c-format
msgid "could not create file '%s'"
msgstr ""
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: builtin/notes.c:1
89
+#: builtin/notes.c:1
92
msgid "Please supply the note contents using either -m or -F option"
msgstr ""
msgid "Please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/notes.c:21
0 builtin/notes.c:973
+#: builtin/notes.c:21
3 builtin/notes.c:976
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/notes.c:21
5
+#: builtin/notes.c:21
8
msgid "unable to write note object"
msgstr ""
msgid "unable to write note object"
msgstr ""
-#: builtin/notes.c:2
17
+#: builtin/notes.c:2
20
#, c-format
msgid "The note contents has been left in %s"
msgstr ""
#, c-format
msgid "The note contents has been left in %s"
msgstr ""
-#: builtin/notes.c:25
1
builtin/tag.c:542
+#: builtin/notes.c:25
4
builtin/tag.c:542
#, c-format
msgid "cannot read '%s'"
msgstr ""
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:25
3
builtin/tag.c:545
+#: builtin/notes.c:25
6
builtin/tag.c:545
#, c-format
msgid "could not open or read '%s'"
msgstr ""
#, c-format
msgid "could not open or read '%s'"
msgstr ""
-#: builtin/notes.c:27
2 builtin/notes.c:445 builtin/notes.c:447
-#: builtin/notes.c:5
07 builtin/notes.c:561 builtin/notes.c:644
-#: builtin/notes.c:6
49 builtin/notes.c:724 builtin/notes.c:766
-#: builtin/notes.c:9
68
builtin/reset.c:293 builtin/tag.c:558
+#: builtin/notes.c:27
5 builtin/notes.c:448 builtin/notes.c:450
+#: builtin/notes.c:5
10 builtin/notes.c:564 builtin/notes.c:647
+#: builtin/notes.c:6
52 builtin/notes.c:727 builtin/notes.c:769
+#: builtin/notes.c:9
71
builtin/reset.c:293 builtin/tag.c:558
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/notes.c:27
5
+#: builtin/notes.c:27
8
#, c-format
msgid "Failed to read object '%s'."
msgstr ""
#, c-format
msgid "Failed to read object '%s'."
msgstr ""
-#: builtin/notes.c:
299
+#: builtin/notes.c:
302
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: builtin/notes.c:34
0
+#: builtin/notes.c:34
3
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: builtin/notes.c:35
0
+#: builtin/notes.c:35
3
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
#. TRANSLATORS: The first %s is the name of the
#. environment variable, the second %s is its value
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
#. TRANSLATORS: The first %s is the name of the
#. environment variable, the second %s is its value
-#: builtin/notes.c:3
77
+#: builtin/notes.c:3
80
#, c-format
msgid "Bad %s value: '%s'"
msgstr ""
#, c-format
msgid "Bad %s value: '%s'"
msgstr ""
-#: builtin/notes.c:44
1
+#: builtin/notes.c:44
4
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/notes.c:45
6
+#: builtin/notes.c:45
9
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/notes.c:50
0 builtin/notes.c:554 builtin/notes.c:627
-#: builtin/notes.c:6
39 builtin/notes.c:712 builtin/notes.c:759
-#: builtin/notes.c:103
3
+#: builtin/notes.c:50
3 builtin/notes.c:557 builtin/notes.c:630
+#: builtin/notes.c:6
42 builtin/notes.c:715 builtin/notes.c:762
+#: builtin/notes.c:103
6
msgid "too many parameters"
msgstr ""
msgid "too many parameters"
msgstr ""
-#: builtin/notes.c:51
3 builtin/notes.c:772
+#: builtin/notes.c:51
6 builtin/notes.c:775
#, c-format
msgid "No note found for object %s."
msgstr ""
#, c-format
msgid "No note found for object %s."
msgstr ""
-#: builtin/notes.c:53
5 builtin/notes.c:692
+#: builtin/notes.c:53
8 builtin/notes.c:695
msgid "note contents as a string"
msgstr ""
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:5
38 builtin/notes.c:695
+#: builtin/notes.c:5
41 builtin/notes.c:698
msgid "note contents in a file"
msgstr ""
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:54
0 builtin/notes.c:543 builtin/notes.c:697
-#: builtin/notes.c:70
0
builtin/tag.c:476
+#: builtin/notes.c:54
3 builtin/notes.c:546 builtin/notes.c:700
+#: builtin/notes.c:70
3
builtin/tag.c:476
msgid "object"
msgstr ""
msgid "object"
msgstr ""
-#: builtin/notes.c:54
1 builtin/notes.c:698
+#: builtin/notes.c:54
4 builtin/notes.c:701
msgid "reuse and edit specified note object"
msgstr ""
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:54
4 builtin/notes.c:701
+#: builtin/notes.c:54
7 builtin/notes.c:704
msgid "reuse specified note object"
msgstr ""
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:54
6 builtin/notes.c:614
+#: builtin/notes.c:54
9 builtin/notes.c:617
msgid "replace existing notes"
msgstr ""
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:58
0
+#: builtin/notes.c:58
3
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:58
5 builtin/notes.c:662
+#: builtin/notes.c:58
8 builtin/notes.c:665
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:61
5
+#: builtin/notes.c:61
8
msgid "read objects from stdin"
msgstr ""
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:6
17
+#: builtin/notes.c:6
20
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:63
5
+#: builtin/notes.c:63
8
msgid "too few parameters"
msgstr ""
msgid "too few parameters"
msgstr ""
-#: builtin/notes.c:65
6
+#: builtin/notes.c:65
9
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:6
68
+#: builtin/notes.c:6
71
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr ""
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:7
17
+#: builtin/notes.c:7
20
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-#: builtin/notes.c:86
4
+#: builtin/notes.c:86
7
msgid "General options"
msgstr ""
msgid "General options"
msgstr ""
-#: builtin/notes.c:86
6
+#: builtin/notes.c:86
9
msgid "Merge options"
msgstr ""
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:8
68
+#: builtin/notes.c:8
71
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:87
0
+#: builtin/notes.c:87
3
msgid "Committing unmerged notes"
msgstr ""
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:87
2
+#: builtin/notes.c:87
5
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:87
4
+#: builtin/notes.c:87
7
msgid "Aborting notes merge resolution"
msgstr ""
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:87
6
+#: builtin/notes.c:87
9
msgid "abort notes merge"
msgstr ""
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:97
1
+#: builtin/notes.c:97
4
#, c-format
msgid "Object %s has no note\n"
msgstr ""
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:98
3
+#: builtin/notes.c:98
6
msgid "attempt to remove non-existent note is not an error"
msgstr ""
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:98
6
+#: builtin/notes.c:98
9
msgid "read object names from the standard input"
msgstr ""
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:10
67
+#: builtin/notes.c:10
70
msgid "notes_ref"
msgstr ""
msgid "notes_ref"
msgstr ""
-#: builtin/notes.c:10
68
+#: builtin/notes.c:10
71
msgid "use notes from <notes_ref>"
msgstr ""
msgid "use notes from <notes_ref>"
msgstr ""
-#: builtin/notes.c:110
3
builtin/remote.c:1598
+#: builtin/notes.c:110
6
builtin/remote.c:1598
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
@@
-8577,7
+8551,7
@@
msgstr ""
msgid "Cannot rebase onto multiple branches"
msgstr ""
msgid "Cannot rebase onto multiple branches"
msgstr ""
-#: git-rebase.sh:5
2
+#: git-rebase.sh:5
3
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@
-8585,38
+8559,42
@@
msgid ""
"\"."
msgstr ""
"\"."
msgstr ""
-#: git-rebase.sh:1
59
+#: git-rebase.sh:1
60
msgid "The pre-rebase hook refused to rebase."
msgstr ""
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:16
4
+#: git-rebase.sh:16
5
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:29
5
+#: git-rebase.sh:29
6
msgid "The --exec option must be used with the --interactive option"
msgstr ""
msgid "The --exec option must be used with the --interactive option"
msgstr ""
-#: git-rebase.sh:30
0
+#: git-rebase.sh:30
1
msgid "No rebase in progress?"
msgstr ""
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:313
+#: git-rebase.sh:312
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+
+#: git-rebase.sh:319
msgid "Cannot read HEAD"
msgstr ""
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:3
16
+#: git-rebase.sh:3
22
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:3
34
+#: git-rebase.sh:3
40
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:35
0
+#: git-rebase.sh:35
9
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@
-8629,56
+8607,56
@@
msgid ""
"valuable there."
msgstr ""
"valuable there."
msgstr ""
-#: git-rebase.sh:
395
+#: git-rebase.sh:
404
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
-#: git-rebase.sh:4
19
+#: git-rebase.sh:4
28
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:4
22 git-rebase.sh:426
+#: git-rebase.sh:4
31 git-rebase.sh:435
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:4
31
+#: git-rebase.sh:4
40
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:4
54
+#: git-rebase.sh:4
63
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: git-rebase.sh:4
74
+#: git-rebase.sh:4
83
msgid "Please commit or stash them."
msgstr ""
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:
492
+#: git-rebase.sh:
501
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:
495
+#: git-rebase.sh:
504
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:5
06
+#: git-rebase.sh:5
15
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
#. Detach HEAD and reset the tree
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
#. Detach HEAD and reset the tree
-#: git-rebase.sh:5
15
+#: git-rebase.sh:5
24
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:5
23
+#: git-rebase.sh:5
32
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""