summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9e2116a)
Generate po/git.pot from v1.7.12-rc0-54-g9e211, and there are 4 new,
3 removed l10n messages.
* 4 new messages are added at lines:
1254, 1264, 1459, 1523
* 3 old messages are deleted from the previous version at lines:
1254, 1273, 2854
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
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-07-03 10:23+0800\n"
+"POT-Creation-Date: 2012-07-30 09:18+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"
msgid "unrecognized header: %s%s (%d)"
msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:89 builtin/commit.c:696
+#: bundle.c:89 builtin/commit.c:699
#, c-format
msgid "could not open '%s'"
msgstr ""
#, c-format
msgid "could not open '%s'"
msgstr ""
msgstr ""
#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
msgstr ""
#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
-#: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347
+#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr ""
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr ""
msgid "rev-list died"
msgstr ""
msgid "rev-list died"
msgstr ""
-#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284
+#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
msgstr[0] ""
msgstr[1] ""
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
msgid "'%s': short read %s"
msgstr ""
msgid "'%s': short read %s"
msgstr ""
#, c-format
msgid "available git commands in '%s'"
msgstr ""
#, c-format
msgid "available git commands in '%s'"
msgstr ""
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr ""
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr ""
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
msgid ""
"\n"
"Did you mean this?"
msgid ""
"\n"
"Did you mean this?"
msgstr[0] ""
msgstr[1] ""
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
#, c-format
msgid " or: %s"
msgstr ""
#, c-format
msgid " or: %s"
msgstr ""
#, c-format
msgid " %s"
msgstr ""
#, c-format
msgid " %s"
msgstr ""
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] ""
msgstr[1] ""
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgid "cannot abort from a branch yet to be born"
msgstr ""
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:805 builtin/apply.c:3697
+#: sequencer.c:805 builtin/apply.c:3988
#, c-format
msgid "cannot open %s: %s"
msgstr ""
#, c-format
msgid "cannot open %s: %s"
msgstr ""
msgid "Can't cherry-pick into empty head"
msgstr ""
msgid "Can't cherry-pick into empty head"
msgstr ""
msgid "HEAD does not point to a branch"
msgstr ""
msgid "HEAD does not point to a branch"
msgstr ""
#, c-format
msgid "No such branch: '%s'"
msgstr ""
#, c-format
msgid "No such branch: '%s'"
msgstr ""
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr ""
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr ""
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
msgid "no such user"
msgstr ""
msgid "no such user"
msgstr ""
msgid "Unmerged paths:"
msgstr ""
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:168 wt-status.c:195
+#: wt-status.c:167 wt-status.c:194
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:170 wt-status.c:197
+#: wt-status.c:169 wt-status.c:196
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:176 wt-status.c:180
+#: wt-status.c:175 wt-status.c:179
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
msgid "Changes to be committed:"
msgstr ""
msgid "Changes to be committed:"
msgstr ""
msgid "Changes not staged for commit:"
msgstr ""
msgid "Changes not staged for commit:"
msgstr ""
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
#, c-format
msgid "%s files:"
msgstr ""
#, c-format
msgid "%s files:"
msgstr ""
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
msgid "both deleted:"
msgstr ""
msgid "both deleted:"
msgstr ""
msgid "added by us:"
msgstr ""
msgid "added by us:"
msgstr ""
msgid "deleted by them:"
msgstr ""
msgid "deleted by them:"
msgstr ""
msgid "added by them:"
msgstr ""
msgid "added by them:"
msgstr ""
msgid "deleted by us:"
msgstr ""
msgid "deleted by us:"
msgstr ""
msgid "both added:"
msgstr ""
msgid "both added:"
msgstr ""
msgid "both modified:"
msgstr ""
msgid "both modified:"
msgstr ""
msgid "new commits, "
msgstr ""
msgid "new commits, "
msgstr ""
msgid "modified content, "
msgstr ""
msgid "modified content, "
msgstr ""
msgid "untracked content, "
msgstr ""
msgid "untracked content, "
msgstr ""
#, c-format
msgid "new file: %s"
msgstr ""
#, c-format
msgid "new file: %s"
msgstr ""
#, c-format
msgid "copied: %s -> %s"
msgstr ""
#, c-format
msgid "copied: %s -> %s"
msgstr ""
#, c-format
msgid "deleted: %s"
msgstr ""
#, c-format
msgid "deleted: %s"
msgstr ""
#, c-format
msgid "modified: %s"
msgstr ""
#, c-format
msgid "modified: %s"
msgstr ""
#, c-format
msgid "renamed: %s -> %s"
msgstr ""
#, c-format
msgid "renamed: %s -> %s"
msgstr ""
#, c-format
msgid "typechange: %s"
msgstr ""
#, c-format
msgid "typechange: %s"
msgstr ""
#, c-format
msgid "unknown: %s"
msgstr ""
#, c-format
msgid "unknown: %s"
msgstr ""
#, c-format
msgid "unmerged: %s"
msgstr ""
#, c-format
msgid "unmerged: %s"
msgstr ""
#, c-format
msgid "bug: unhandled diff status %c"
msgstr ""
#, c-format
msgid "bug: unhandled diff status %c"
msgstr ""
msgid "You have unmerged paths."
msgstr ""
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:789 wt-status.c:913
+#: wt-status.c:788 wt-status.c:912
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
msgid "All conflicts fixed but you are still merging."
msgstr ""
msgid "All conflicts fixed but you are still merging."
msgstr ""
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
msgid "You are in the middle of an am session."
msgstr ""
msgid "You are in the middle of an am session."
msgstr ""
msgid "The current patch is empty."
msgstr ""
msgid "The current patch is empty."
msgstr ""
msgid " (fix conflicts and then run \"git am --resolved\")"
msgstr ""
msgid " (fix conflicts and then run \"git am --resolved\")"
msgstr ""
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:874 wt-status.c:884
+#: wt-status.c:873 wt-status.c:883
msgid "You are currently rebasing."
msgstr ""
msgid "You are currently rebasing."
msgstr ""
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
msgid "You are currently splitting a commit during a rebase."
msgstr ""
msgid "You are currently splitting a commit during a rebase."
msgstr ""
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
msgid "You are currently editing a commit during a rebase."
msgstr ""
msgid "You are currently editing a commit during a rebase."
msgstr ""
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
msgid "You are currently cherry-picking."
msgstr ""
msgid "You are currently cherry-picking."
msgstr ""
msgid " (all conflicts fixed: run \"git commit\")"
msgstr ""
msgid " (all conflicts fixed: run \"git commit\")"
msgstr ""
msgid "You are currently bisecting."
msgstr ""
msgid "You are currently bisecting."
msgstr ""
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
msgid "On branch "
msgstr ""
msgid "On branch "
msgstr ""
msgid "Not currently on any branch."
msgstr ""
msgid "Not currently on any branch."
msgstr ""
msgid "Initial commit"
msgstr ""
msgid "Initial commit"
msgstr ""
msgid "Untracked"
msgstr ""
msgid "Untracked"
msgstr ""
msgid "Ignored"
msgstr ""
msgid "Ignored"
msgstr ""
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
msgid " (use -u option to show untracked files)"
msgstr ""
msgid " (use -u option to show untracked files)"
msgstr ""
msgid "No changes"
msgstr ""
msgid "No changes"
msgstr ""
#, c-format
msgid "no changes added to commit%s\n"
msgstr ""
#, c-format
msgid "no changes added to commit%s\n"
msgstr ""
msgid " (use \"git add\" and/or \"git commit -a\")"
msgstr ""
msgid " (use \"git add\" and/or \"git commit -a\")"
msgstr ""
#, c-format
msgid "nothing added to commit but untracked files present%s\n"
msgstr ""
#, c-format
msgid "nothing added to commit but untracked files present%s\n"
msgstr ""
msgid " (use \"git add\" to track)"
msgstr ""
msgid " (use \"git add\" to track)"
msgstr ""
-#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042
+#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
#, c-format
msgid "nothing to commit%s\n"
msgstr ""
#, c-format
msgid "nothing to commit%s\n"
msgstr ""
msgid " (create/copy files and use \"git add\" to track)"
msgstr ""
msgid " (create/copy files and use \"git add\" to track)"
msgstr ""
msgid " (use -u to show untracked files)"
msgstr ""
msgid " (use -u to show untracked files)"
msgstr ""
msgid " (working directory clean)"
msgstr ""
msgid " (working directory clean)"
msgstr ""
msgid "HEAD (no branch)"
msgstr ""
msgid "HEAD (no branch)"
msgstr ""
msgid "Initial commit on "
msgstr ""
msgid "Initial commit on "
msgstr ""
msgid "behind "
msgstr ""
msgid "behind "
msgstr ""
-#: wt-status.c:1175 wt-status.c:1178
+#: wt-status.c:1174 wt-status.c:1177
msgid ", behind "
msgstr ""
msgid ", behind "
msgstr ""
msgid "unexpected diff status %c"
msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:67 builtin/commit.c:226
+#: builtin/add.c:67 builtin/commit.c:229
msgid "updating files failed"
msgstr ""
msgid "updating files failed"
msgstr ""
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
+#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
#: builtin/rm.c:162
msgid "index file corrupt"
msgstr ""
#: builtin/rm.c:162
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
+#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
msgid "Unable to write new index file"
msgstr ""
msgid "Unable to write new index file"
msgstr ""
msgid "git apply [options] [<patch>...]"
msgstr ""
msgid "git apply [options] [<patch>...]"
msgstr ""
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
msgstr[0] ""
msgstr[1] ""
msgid "new file depends on old contents"
msgstr ""
msgid "new file depends on old contents"
msgstr ""
msgid "deleted file still has contents"
msgstr ""
msgid "deleted file still has contents"
msgstr ""
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
#. there has to be one hunk (forward hunk)
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
#. there has to be one hunk (forward hunk)
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
#, c-format
msgid "unable to read symlink %s"
msgstr ""
#, c-format
msgid "unable to read symlink %s"
msgstr ""
#, c-format
msgid "unable to open or read %s"
msgstr ""
#, c-format
msgid "unable to open or read %s"
msgstr ""
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-msgid "patch %s has been renamed/deleted"
+msgid "cannot checkout %s"
-#: builtin/apply.c:3052 builtin/apply.c:3069
+#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
#, c-format
msgid "read of %s failed"
msgstr ""
#, c-format
msgid "read of %s failed"
msgstr ""
-#: builtin/apply.c:3084
-msgid "removal patch leaves file contents"
-msgstr ""
-
-#: builtin/apply.c:3105
+#: builtin/apply.c:3139 builtin/apply.c:3361
-msgid "%s: already exists in working directory"
+msgid "path %s has been renamed/deleted"
+#: builtin/apply.c:3220 builtin/apply.c:3375
-msgid "%s: has been deleted/renamed"
+msgid "%s: does not exist in index"
-#: builtin/apply.c:3148 builtin/apply.c:3179
+#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
#, c-format
msgid "%s: %s"
msgstr ""
#, c-format
msgid "%s: %s"
msgstr ""
+#: builtin/apply.c:3229 builtin/apply.c:3383
-msgid "%s: does not exist in index"
+msgid "%s: does not match index"
-#: builtin/apply.c:3173
-#, c-format
-msgid "%s: does not match index"
+#: builtin/apply.c:3331
+msgid "removal patch leaves file contents"
#, c-format
msgid "%s: wrong type"
msgstr ""
#, c-format
msgid "%s: wrong type"
msgstr ""
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
#, c-format
msgid "%s: already exists in index"
msgstr ""
#, c-format
msgid "%s: already exists in index"
msgstr ""
+#: builtin/apply.c:3506
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr ""
+
+#: builtin/apply.c:3526
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
#, c-format
msgid "%s: patch does not apply"
msgstr ""
#, c-format
msgid "%s: patch does not apply"
msgstr ""
#, c-format
msgid "Checking patch %s..."
msgstr ""
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158
+#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
#, c-format
msgid "unable to remove %s from index"
msgstr ""
#, c-format
msgid "unable to remove %s from index"
msgstr ""
#, c-format
msgid "corrupt patch for subproject %s"
msgstr ""
#, c-format
msgid "corrupt patch for subproject %s"
msgstr ""
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
+#: builtin/apply.c:3790 builtin/apply.c:3898
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
#, c-format
msgid "closing file '%s'"
msgstr ""
#, c-format
msgid "closing file '%s'"
msgstr ""
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
msgid "internal error"
msgstr ""
#. Say this even without --verbose
msgid "internal error"
msgstr ""
#. Say this even without --verbose
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
msgid "unrecognized input"
msgstr ""
msgid "unrecognized input"
msgstr ""
msgid "unable to read index file"
msgstr ""
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:3970 builtin/apply.c:3973
+#: builtin/apply.c:4284 builtin/apply.c:4287
msgid "don't apply changes matching the given path"
msgstr ""
msgid "don't apply changes matching the given path"
msgstr ""
msgid "apply changes matching the given path"
msgstr ""
msgid "apply changes matching the given path"
msgstr ""
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
msgid "ignore additions made by the patch"
msgstr ""
msgid "ignore additions made by the patch"
msgstr ""
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
msgid "shows number of added and deleted lines in decimal notation"
msgstr ""
msgid "shows number of added and deleted lines in decimal notation"
msgstr ""
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
msgid "make sure the patch is applicable to the current index"
msgstr ""
msgid "make sure the patch is applicable to the current index"
msgstr ""
msgid "apply a patch without touching the working tree"
msgstr ""
msgid "apply a patch without touching the working tree"
msgstr ""
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
+#: builtin/apply.c:4312
+msgid "attempt three-way merge if a patch does not apply"
+msgstr ""
+
+#: builtin/apply.c:4314
msgid "build a temporary index based on embedded index information"
msgstr ""
msgid "build a temporary index based on embedded index information"
msgstr ""
msgid "paths are separated with NUL character"
msgstr ""
msgid "paths are separated with NUL character"
msgstr ""
msgid "ensure at least <n> lines of context match"
msgstr ""
msgid "ensure at least <n> lines of context match"
msgstr ""
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: builtin/apply.c:4008 builtin/apply.c:4011
+#: builtin/apply.c:4324 builtin/apply.c:4327
msgid "ignore changes in whitespace when finding context"
msgstr ""
msgid "ignore changes in whitespace when finding context"
msgstr ""
msgid "apply the patch in reverse"
msgstr ""
msgid "apply the patch in reverse"
msgstr ""
msgid "don't expect at least one line of context"
msgstr ""
msgid "don't expect at least one line of context"
msgstr ""
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
msgid "allow overlapping hunks"
msgstr ""
msgid "allow overlapping hunks"
msgstr ""
msgid "be verbose"
msgstr ""
msgid "be verbose"
msgstr ""
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
msgid "do not trust the line counts in the hunk headers"
msgstr ""
msgid "do not trust the line counts in the hunk headers"
msgstr ""
msgid "prepend <root> to all filenames"
msgstr ""
msgid "prepend <root> to all filenames"
msgstr ""
+#: builtin/apply.c:4367
+msgid "--3way outside a repository"
+msgstr ""
+
+#: builtin/apply.c:4375
msgid "--index outside a repository"
msgstr ""
msgid "--index outside a repository"
msgstr ""
msgid "--cached outside a repository"
msgstr ""
msgid "--cached outside a repository"
msgstr ""
#, c-format
msgid "can't open patch '%s'"
msgstr ""
#, c-format
msgid "can't open patch '%s'"
msgstr ""
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4089 builtin/apply.c:4099
+#: builtin/apply.c:4414 builtin/apply.c:4424
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:788 builtin/clone.c:558
+#: builtin/branch.c:788 builtin/clone.c:561
msgid "HEAD not found below refs/heads!"
msgstr ""
msgid "HEAD not found below refs/heads!"
msgstr ""
msgid "Need a repository to unbundle."
msgstr ""
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/checkout.c:113 builtin/checkout.c:146
+#: builtin/checkout.c:114 builtin/checkout.c:147
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:115 builtin/checkout.c:148
+#: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:131
+#: builtin/checkout.c:132
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:175
+#: builtin/checkout.c:176
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:192
+#: builtin/checkout.c:193
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:209
+#: builtin/checkout.c:210
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:234 builtin/checkout.c:392
+#: builtin/checkout.c:235 builtin/checkout.c:393
msgid "corrupt index file"
msgstr ""
msgid "corrupt index file"
msgstr ""
-#: builtin/checkout.c:264 builtin/checkout.c:271
+#: builtin/checkout.c:265 builtin/checkout.c:272
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
+#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
#: builtin/merge.c:812
msgid "unable to write new index file"
msgstr ""
#: builtin/merge.c:812
msgid "unable to write new index file"
msgstr ""
-#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
+#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
msgid "diff_setup_done failed"
msgstr ""
msgid "diff_setup_done failed"
msgstr ""
-#: builtin/checkout.c:414
+#: builtin/checkout.c:415
msgid "you need to resolve your current index first"
msgstr ""
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:533
+#: builtin/checkout.c:534
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr ""
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr ""
-#: builtin/checkout.c:566
+#: builtin/checkout.c:567
msgid "HEAD is now at"
msgstr ""
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:573
+#: builtin/checkout.c:574
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:576
+#: builtin/checkout.c:577
#, c-format
msgid "Already on '%s'\n"
msgstr ""
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:580
+#: builtin/checkout.c:581
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:582
+#: builtin/checkout.c:583
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:584
+#: builtin/checkout.c:585
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:640
+#: builtin/checkout.c:641
#, c-format
msgid " ... and %d more.\n"
msgstr ""
#. The singular version
#, c-format
msgid " ... and %d more.\n"
msgstr ""
#. The singular version
-#: builtin/checkout.c:646
+#: builtin/checkout.c:647
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:664
+#: builtin/checkout.c:665
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
-#: builtin/checkout.c:694
+#: builtin/checkout.c:695
msgid "internal error in revision walk"
msgstr ""
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:698
+#: builtin/checkout.c:699
msgid "Previous HEAD position was"
msgstr ""
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:724
+#: builtin/checkout.c:725 builtin/checkout.c:920
msgid "You are on a branch yet to be born"
msgstr ""
#. case (1)
msgid "You are on a branch yet to be born"
msgstr ""
#. case (1)
-#: builtin/checkout.c:855
+#: builtin/checkout.c:856
#, c-format
msgid "invalid reference: %s"
msgstr ""
#. case (1): want a tree
#, c-format
msgid "invalid reference: %s"
msgstr ""
#. case (1): want a tree
-#: builtin/checkout.c:894
+#: builtin/checkout.c:895
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:974
+#: builtin/checkout.c:977
msgid "-B cannot be used with -b"
msgstr ""
msgid "-B cannot be used with -b"
msgstr ""
-#: builtin/checkout.c:983
+#: builtin/checkout.c:986
msgid "--patch is incompatible with all other options"
msgstr ""
msgid "--patch is incompatible with all other options"
msgstr ""
-#: builtin/checkout.c:986
+#: builtin/checkout.c:989
msgid "--detach cannot be used with -b/-B/--orphan"
msgstr ""
msgid "--detach cannot be used with -b/-B/--orphan"
msgstr ""
-#: builtin/checkout.c:988
+#: builtin/checkout.c:991
msgid "--detach cannot be used with -t"
msgstr ""
msgid "--detach cannot be used with -t"
msgstr ""
-#: builtin/checkout.c:994
+#: builtin/checkout.c:997
msgid "--track needs a branch name"
msgstr ""
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1001
+#: builtin/checkout.c:1004
msgid "Missing branch name; try -b"
msgstr ""
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1007
+#: builtin/checkout.c:1010
msgid "--orphan and -b|-B are mutually exclusive"
msgstr ""
msgid "--orphan and -b|-B are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1012
msgid "--orphan cannot be used with -t"
msgstr ""
msgid "--orphan cannot be used with -t"
msgstr ""
-#: builtin/checkout.c:1019
+#: builtin/checkout.c:1022
msgid "git checkout: -f and -m are incompatible"
msgstr ""
msgid "git checkout: -f and -m are incompatible"
msgstr ""
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1056
msgid "invalid path specification"
msgstr ""
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1061
+#: builtin/checkout.c:1064
#, c-format
msgid ""
"git checkout: updating paths is incompatible with switching branches.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
#, c-format
msgid ""
"git checkout: updating paths is incompatible with switching branches.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1066
msgid "git checkout: updating paths is incompatible with switching branches."
msgstr ""
msgid "git checkout: updating paths is incompatible with switching branches."
msgstr ""
-#: builtin/checkout.c:1068
+#: builtin/checkout.c:1071
msgid "git checkout: --detach does not take a path argument"
msgstr ""
msgid "git checkout: --detach does not take a path argument"
msgstr ""
-#: builtin/checkout.c:1071
+#: builtin/checkout.c:1074
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/checkout.c:1090
+#: builtin/checkout.c:1093
msgid "Cannot switch branch to a non-commit."
msgstr ""
msgid "Cannot switch branch to a non-commit."
msgstr ""
-#: builtin/checkout.c:1093
+#: builtin/checkout.c:1096
msgid "--ours/--theirs is incompatible with switching branches."
msgstr ""
msgid "--ours/--theirs is incompatible with switching branches."
msgstr ""
msgid "done.\n"
msgstr ""
msgid "done.\n"
msgstr ""
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
#, c-format
msgid "Could not find remote branch %s to clone."
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 ""
msgid "Too many arguments."
msgstr ""
msgid "Too many arguments."
msgstr ""
msgid "You must specify a repository to clone."
msgstr ""
msgid "You must specify a repository to clone."
msgstr ""
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
#, 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 ""
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:706 builtin/clone.c:720
+#: builtin/clone.c:709 builtin/clone.c:723
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
#, c-format
msgid "could not create work tree dir '%s'."
msgstr ""
#, c-format
msgid "could not create work tree dir '%s'."
msgstr ""
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
msgid "You appear to have cloned an empty repository."
msgstr ""
msgid "You appear to have cloned an empty repository."
msgstr ""
"Otherwise, please use 'git reset'\n"
msgstr ""
"Otherwise, please use 'git reset'\n"
msgstr ""
msgid "failed to unpack HEAD tree object"
msgstr ""
msgid "failed to unpack HEAD tree object"
msgstr ""
msgid "unable to create temporary index"
msgstr ""
msgid "unable to create temporary index"
msgstr ""
msgid "interactive add failed"
msgstr ""
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
+#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
msgid "unable to write new_index file"
msgstr ""
msgid "unable to write new_index file"
msgstr ""
msgid "cannot do a partial commit during a merge."
msgstr ""
msgid "cannot do a partial commit during a merge."
msgstr ""
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
msgid "cannot read the index"
msgstr ""
msgid "cannot read the index"
msgstr ""
msgid "unable to write temporary index file"
msgstr ""
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:493 builtin/commit.c:499
+#: builtin/commit.c:496 builtin/commit.c:502
#, c-format
msgid "invalid commit: %s"
msgstr ""
#, c-format
msgid "invalid commit: %s"
msgstr ""
msgid "malformed --author parameter"
msgstr ""
msgid "malformed --author parameter"
msgstr ""
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
-#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967
+#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
#, c-format
msgid "could not lookup commit %s"
msgstr ""
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:632 builtin/shortlog.c:296
+#: builtin/commit.c:635 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 ""
msgid "could not read log from standard input"
msgstr ""
msgid "could not read log from standard input"
msgstr ""
#, c-format
msgid "could not read log file '%s'"
msgstr ""
#, c-format
msgid "could not read log file '%s'"
msgstr ""
msgid "commit has empty message"
msgstr ""
msgid "commit has empty message"
msgstr ""
msgid "could not read MERGE_MSG"
msgstr ""
msgid "could not read MERGE_MSG"
msgstr ""
msgid "could not read SQUASH_MSG"
msgstr ""
msgid "could not read SQUASH_MSG"
msgstr ""
#, c-format
msgid "could not read '%s'"
msgstr ""
#, c-format
msgid "could not read '%s'"
msgstr ""
msgid "could not write commit template"
msgstr ""
msgid "could not write commit template"
msgstr ""
#, c-format
msgid ""
"\n"
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
"and try again.\n"
msgstr ""
#, c-format
msgid ""
"\n"
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
"and try again.\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 ""
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 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 ""
#, c-format
msgid "%sAuthor: %s"
msgstr ""
#, c-format
msgid "%sAuthor: %s"
msgstr ""
#, c-format
msgid "%sCommitter: %s"
msgstr ""
#, c-format
msgid "%sCommitter: %s"
msgstr ""
msgid "Cannot read index"
msgstr ""
msgid "Cannot read index"
msgstr ""
msgid "Error building trees"
msgstr ""
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:845 builtin/tag.c:361
+#: builtin/commit.c:848 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 ""
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
-#: builtin/commit.c:957 builtin/commit.c:1157
+#: builtin/commit.c:960 builtin/commit.c:1160
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
+#: builtin/commit.c:1000
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:1008
+#: builtin/commit.c:1011
msgid "You have nothing to amend."
msgstr ""
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1011
+#: builtin/commit.c:1014
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:1013
+#: builtin/commit.c:1016
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:1016
+#: builtin/commit.c:1019
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1026
+#: builtin/commit.c:1029
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:1028
+#: builtin/commit.c:1031
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:1036
+#: builtin/commit.c:1039
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:1053
+#: builtin/commit.c:1056
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:1055
+#: builtin/commit.c:1058
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:1057
+#: builtin/commit.c:1060
msgid "Clever... amending the last one with dirty index."
msgstr ""
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1059
+#: builtin/commit.c:1062
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:1069 builtin/tag.c:577
+#: builtin/commit.c:1072 builtin/tag.c:577
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1074
+#: builtin/commit.c:1077
msgid "Paths with -a does not make sense."
msgstr ""
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1257
+#: builtin/commit.c:1260
msgid "couldn't look up newly created commit"
msgstr ""
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1259
+#: builtin/commit.c:1262
msgid "could not parse newly created commit"
msgstr ""
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1300
+#: builtin/commit.c:1303
msgid "detached HEAD"
msgstr ""
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1302
+#: builtin/commit.c:1305
msgid " (root-commit)"
msgstr ""
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1446
+#: builtin/commit.c:1449
msgid "could not parse HEAD commit"
msgstr ""
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1484 builtin/merge.c:509
+#: builtin/commit.c:1487 builtin/merge.c:509
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/commit.c:1491
+#: builtin/commit.c:1494
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1498
+#: builtin/commit.c:1501
msgid "could not read MERGE_MODE"
msgstr ""
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1517
+#: builtin/commit.c:1520
#, c-format
msgid "could not read commit message: %s"
msgstr ""
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1531
+#: builtin/commit.c:1534
#, 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:1536
+#: builtin/commit.c:1539
#, 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:1551 builtin/merge.c:936 builtin/merge.c:961
+#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
msgid "failed to write commit object"
msgstr ""
msgid "failed to write commit object"
msgstr ""
-#: builtin/commit.c:1572
+#: builtin/commit.c:1575
msgid "cannot lock HEAD ref"
msgstr ""
msgid "cannot lock HEAD ref"
msgstr ""
-#: builtin/commit.c:1576
+#: builtin/commit.c:1579
msgid "cannot update HEAD ref"
msgstr ""
msgid "cannot update HEAD ref"
msgstr ""
-#: builtin/commit.c:1587
+#: builtin/commit.c:1590
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"
msgid "both --cached and trees are given."
msgstr ""
msgid "both --cached and trees are given."
msgstr ""
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
msgid "Failed to start emacsclient."
msgstr ""
msgid "Failed to start emacsclient."
msgstr ""
msgid "Failed to parse emacsclient version."
msgstr ""
msgid "Failed to parse emacsclient version."
msgstr ""
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
#, c-format
msgid "failed to exec '%s': %s"
msgstr ""
#, c-format
msgid "failed to exec '%s': %s"
msgstr ""
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
msgid "The most commonly used git commands are:"
msgstr ""
msgid "The most commonly used git commands are:"
msgstr ""
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
msgid "no man viewer handled the request"
msgstr ""
msgid "no man viewer handled the request"
msgstr ""
msgid "no info viewer handled the request"
msgstr ""
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:395
-#, c-format
-msgid "'%s': not a documentation directory."
-msgstr ""
-
-#: builtin/help.c:436 builtin/help.c:443
+#: builtin/help.c:447 builtin/help.c:454
#, c-format
msgid "usage: %s%s"
msgstr ""
#, c-format
msgid "usage: %s%s"
msgstr ""
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr ""
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr ""
msgid "unknown object type %d"
msgstr ""
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:531
+#: builtin/index-pack.c:530
msgid "cannot pread pack file"
msgstr ""
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:533
+#: builtin/index-pack.c:532
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:555
+#: builtin/index-pack.c:558
msgid "serious inflate inconsistency"
msgstr ""
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675
-#: builtin/index-pack.c:709 builtin/index-pack.c:718
+#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
+#: builtin/index-pack.c:712 builtin/index-pack.c:721
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:649 builtin/pack-objects.c:170
+#: builtin/index-pack.c:652 builtin/pack-objects.c:170
#: builtin/pack-objects.c:262
#, c-format
msgid "unable to read %s"
msgstr ""
#: builtin/pack-objects.c:262
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:715
+#: builtin/index-pack.c:718
#, c-format
msgid "cannot read existing object %s"
msgstr ""
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:729
+#: builtin/index-pack.c:732
#, c-format
msgid "invalid blob object %s"
msgstr ""
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:744
+#: builtin/index-pack.c:747
#, c-format
msgid "invalid %s"
msgstr ""
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:746
+#: builtin/index-pack.c:749
msgid "Error in object"
msgstr ""
msgid "Error in object"
msgstr ""
-#: builtin/index-pack.c:748
+#: builtin/index-pack.c:751
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:818 builtin/index-pack.c:844
+#: builtin/index-pack.c:821 builtin/index-pack.c:847
msgid "failed to apply delta"
msgstr ""
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:983
+#: builtin/index-pack.c:986
msgid "Receiving objects"
msgstr ""
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:983
+#: builtin/index-pack.c:986
msgid "Indexing objects"
msgstr ""
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1012
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1014
+#: builtin/index-pack.c:1017
msgid "cannot fstat packfile"
msgstr ""
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1017
+#: builtin/index-pack.c:1020
msgid "pack has junk at the end"
msgstr ""
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1028
+#: builtin/index-pack.c:1031
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1051
+#: builtin/index-pack.c:1054
msgid "Resolving deltas"
msgstr ""
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1102
+#: builtin/index-pack.c:1105
msgid "confusion beyond insanity"
msgstr ""
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1124
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1146
+#: builtin/index-pack.c:1149
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1225
+#: builtin/index-pack.c:1228
#, c-format
msgid "local object %s is corrupt"
msgstr ""
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1252
msgid "error while closing pack file"
msgstr ""
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1262
+#: builtin/index-pack.c:1265
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1270
+#: builtin/index-pack.c:1273
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1286
msgid "cannot store pack file"
msgstr ""
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1294
+#: builtin/index-pack.c:1297
msgid "cannot store index file"
msgstr ""
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1395
+#: builtin/index-pack.c:1398
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1397
+#: builtin/index-pack.c:1400
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1447
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1451
+#: builtin/index-pack.c:1454
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1481
msgid "Cannot come back to cwd"
msgstr ""
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1522 builtin/index-pack.c:1525
-#: builtin/index-pack.c:1537 builtin/index-pack.c:1541
+#: builtin/index-pack.c:1525 builtin/index-pack.c:1528
+#: builtin/index-pack.c:1540 builtin/index-pack.c:1544
#, c-format
msgid "bad %s"
msgstr ""
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1555
+#: builtin/index-pack.c:1558
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1559 builtin/index-pack.c:1569
+#: builtin/index-pack.c:1562 builtin/index-pack.c:1572
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1578
+#: builtin/index-pack.c:1581
msgid "--verify with no packfile name given"
msgstr ""
msgid "--verify with no packfile name given"
msgstr ""
msgid "insane git directory %s"
msgstr ""
msgid "insane git directory %s"
msgstr ""
-#: builtin/init-db.c:322 builtin/init-db.c:325
+#: builtin/init-db.c:323 builtin/init-db.c:326
#, c-format
msgid "%s already exists"
msgstr ""
#, c-format
msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:354
+#: builtin/init-db.c:355
#, c-format
msgid "unable to handle file type %d"
msgstr ""
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:357
+#: builtin/init-db.c:358
#, c-format
msgid "unable to move %s to %s"
msgstr ""
#, c-format
msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:362
+#: builtin/init-db.c:363
#, c-format
msgid "Could not create git link %s"
msgstr ""
#, c-format
msgid "Could not create git link %s"
msgstr ""
#. * existing" or "Initialized empty", the second " shared" or
#. * "", and the last '%s%s' is the verbatim directory name.
#.
#. * existing" or "Initialized empty", the second " shared" or
#. * "", and the last '%s%s' is the verbatim directory name.
#.
-#: builtin/init-db.c:419
+#: builtin/init-db.c:420
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr ""
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:420
+#: builtin/init-db.c:421
msgid "Reinitialized existing"
msgstr ""
msgid "Reinitialized existing"
msgstr ""
-#: builtin/init-db.c:420
+#: builtin/init-db.c:421
msgid "Initialized empty"
msgstr ""
msgid "Initialized empty"
msgstr ""
-#: builtin/init-db.c:421
+#: builtin/init-db.c:422
msgid " shared"
msgstr ""
msgid " shared"
msgstr ""
-#: builtin/init-db.c:440
+#: builtin/init-db.c:441
msgid "cannot tell cwd"
msgstr ""
msgid "cannot tell cwd"
msgstr ""
-#: builtin/init-db.c:521 builtin/init-db.c:528
+#: builtin/init-db.c:522 builtin/init-db.c:529
#, c-format
msgid "cannot mkdir %s"
msgstr ""
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:532
+#: builtin/init-db.c:533
#, c-format
msgid "cannot chdir to %s"
msgstr ""
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:554
+#: builtin/init-db.c:555
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:578
+#: builtin/init-db.c:579
msgid "Cannot access current working directory"
msgstr ""
msgid "Cannot access current working directory"
msgstr ""
-#: builtin/init-db.c:585
+#: builtin/init-db.c:586
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
msgid "Final output: %d %s\n"
msgstr ""
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:402 builtin/log.c:490
+#: builtin/log.c:403 builtin/log.c:494
#, c-format
msgid "Could not read object %s"
msgstr ""
#, c-format
msgid "Could not read object %s"
msgstr ""
#, c-format
msgid "Unknown type: %d"
msgstr ""
#, c-format
msgid "Unknown type: %d"
msgstr ""
msgid "format.headers without value"
msgstr ""
msgid "format.headers without value"
msgstr ""
msgid "name of output directory is too long"
msgstr ""
msgid "name of output directory is too long"
msgstr ""
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
msgid "Need exactly one range."
msgstr ""
msgid "Need exactly one range."
msgstr ""
msgid "Not a range."
msgstr ""
msgid "Not a range."
msgstr ""
msgid "Cover letter needs email format"
msgstr ""
msgid "Cover letter needs email format"
msgstr ""
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
msgid "Two output directories?"
msgstr ""
msgid "Two output directories?"
msgstr ""
#, c-format
msgid "bogus committer info %s"
msgstr ""
#, c-format
msgid "bogus committer info %s"
msgstr ""
msgid "-n and -k are mutually exclusive."
msgstr ""
msgid "-n and -k are mutually exclusive."
msgstr ""
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
msgid "--name-only does not make sense"
msgstr ""
msgid "--name-only does not make sense"
msgstr ""
msgid "--name-status does not make sense"
msgstr ""
msgid "--name-status does not make sense"
msgstr ""
msgid "--check does not make sense"
msgstr ""
msgid "--check does not make sense"
msgstr ""
msgid "standard output, or directory, which one?"
msgstr ""
msgid "standard output, or directory, which one?"
msgstr ""
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
msgid "Failed to create output files"
msgstr ""
msgid "Failed to create output files"
msgstr ""
#, 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:1511 builtin/log.c:1513 builtin/log.c:1525
+#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
#, c-format
msgid "Unknown commit %s"
msgstr ""
#, c-format
msgid "Unknown commit %s"
msgstr ""
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr ""
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr ""
#, sh-format
msgid ""
"Patch is empty. Was it split wrong?\n"
#, sh-format
msgid ""
"Patch is empty. Was it split wrong?\n"
"To restore the original branch and stop patching run \"$cmdline --abort\"."
msgstr ""
"To restore the original branch and stop patching run \"$cmdline --abort\"."
msgstr ""
msgid "Patch does not have a valid e-mail address."
msgstr ""
msgid "Patch does not have a valid e-mail address."
msgstr ""
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
msgid "Commit Body is:"
msgstr ""
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
msgid "Commit Body is:"
msgstr ""
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr ""
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr ""
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr ""
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr ""
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
msgid ""
"You still have unmerged paths in your index\n"
"did you forget to use 'git add'?"
msgstr ""
msgid ""
"You still have unmerged paths in your index\n"
"did you forget to use 'git add'?"
msgstr ""
msgid "No changes -- Patch already applied."
msgstr ""
msgid "No changes -- Patch already applied."
msgstr ""
#, sh-format
msgid "Patch failed at $msgnum $FIRSTLINE"
msgstr ""
#, sh-format
msgid "Patch failed at $msgnum $FIRSTLINE"
msgstr ""
msgid "applying to an empty history"
msgstr ""
msgid "applying to an empty history"
msgstr ""
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr ""
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr ""
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr ""
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr ""
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr ""
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr ""
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr ""
"Use -f if you really want to add it."
msgstr ""
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr ""
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr ""
#, sh-format
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr ""
#, sh-format
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr ""
#, sh-format
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr ""
#, sh-format
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr ""
#, sh-format
msgid "Failed to register url for submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Failed to register url for submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr ""
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr ""
#, sh-format
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid ""
"Submodule path '$sm_path' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
#, sh-format
msgid ""
"Submodule path '$sm_path' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr ""
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr ""
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr ""
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr ""
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr ""
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:641 git-submodule.sh:964
+#: git-submodule.sh:646 git-submodule.sh:969
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
msgid "--cached cannot be used with --files"
msgstr ""
#. unexpected type
msgid "--cached cannot be used with --files"
msgstr ""
#. unexpected type
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr ""
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr ""
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr ""
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr ""
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
msgid "submodule"
msgstr ""
msgid "submodule"
msgstr ""
msgid "# Submodules changed but not updated:"
msgstr ""
msgid "# Submodules changed but not updated:"
msgstr ""
msgid "# Submodule changes to be committed:"
msgstr ""
msgid "# Submodule changes to be committed:"
msgstr ""
-#: git-submodule.sh:1022
+#: git-submodule.sh:1027
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr ""
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr ""
projects / thirdparty / git.git / commitdiff
