summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml10
-rw-r--r--Documentation/RelNotes/2.6.5.txt19
-rw-r--r--Documentation/RelNotes/2.7.0.txt45
-rw-r--r--Documentation/RelNotes/2.7.1.txt87
-rw-r--r--Documentation/RelNotes/2.8.0.txt235
-rw-r--r--Documentation/blame-options.txt7
-rw-r--r--Documentation/config.txt66
-rw-r--r--Documentation/fetch-options.txt16
-rw-r--r--Documentation/git-add.txt2
-rw-r--r--Documentation/git-am.txt1
-rw-r--r--Documentation/git-blame.txt3
-rw-r--r--Documentation/git-cherry-pick.txt1
-rw-r--r--Documentation/git-clone.txt9
-rw-r--r--Documentation/git-commit.txt6
-rw-r--r--Documentation/git-for-each-ref.txt15
-rw-r--r--Documentation/git-format-patch.txt11
-rw-r--r--Documentation/git-grep.txt13
-rw-r--r--Documentation/git-interpret-trailers.txt24
-rw-r--r--Documentation/git-ls-files.txt22
-rw-r--r--Documentation/git-ls-remote.txt18
-rw-r--r--Documentation/git-pull.txt4
-rw-r--r--Documentation/git-push.txt26
-rw-r--r--Documentation/git-revert.txt1
-rw-r--r--Documentation/git-tag.txt2
-rw-r--r--Documentation/git-worktree.txt15
-rw-r--r--Documentation/git.txt9
-rw-r--r--Documentation/gitignore.txt23
-rw-r--r--Documentation/glossary-content.txt5
-rw-r--r--Documentation/pretty-options.txt8
-rw-r--r--Documentation/revisions.txt20
-rw-r--r--Documentation/technical/api-remote.txt4
-rw-r--r--Documentation/user-manual.txt41
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile9
l---------RelNotes2
-rw-r--r--bisect.c8
-rw-r--r--builtin/am.c40
-rw-r--r--builtin/blame.c39
-rw-r--r--builtin/cat-file.c2
-rw-r--r--builtin/check-attr.c7
-rw-r--r--builtin/check-ignore.c7
-rw-r--r--builtin/check-mailmap.c2
-rw-r--r--builtin/checkout-index.c16
-rw-r--r--builtin/checkout.c3
-rw-r--r--builtin/clean.c32
-rw-r--r--builtin/clone.c13
-rw-r--r--builtin/column.c2
-rw-r--r--builtin/commit.c4
-rw-r--r--builtin/diff.c2
-rw-r--r--builtin/fast-export.c2
-rw-r--r--builtin/fetch-pack.c2
-rw-r--r--builtin/fetch.c10
-rw-r--r--builtin/grep.c62
-rw-r--r--builtin/hash-object.c2
-rw-r--r--builtin/interpret-trailers.c13
-rw-r--r--builtin/log.c11
-rw-r--r--builtin/ls-files.c21
-rw-r--r--builtin/ls-remote.c90
-rw-r--r--builtin/merge.c1
-rw-r--r--builtin/mktree.c14
-rw-r--r--builtin/notes.c33
-rw-r--r--builtin/pull.c17
-rw-r--r--builtin/push.c37
-rw-r--r--builtin/receive-pack.c3
-rw-r--r--builtin/remote.c10
-rw-r--r--builtin/repack.c2
-rw-r--r--builtin/rev-parse.c4
-rw-r--r--builtin/rm.c2
-rw-r--r--builtin/send-pack.c2
-rw-r--r--builtin/shortlog.c186
-rw-r--r--builtin/symbolic-ref.c2
-rw-r--r--builtin/tag.c4
-rw-r--r--builtin/update-index.c27
-rw-r--r--cache-tree.c2
-rw-r--r--cache.h26
-rw-r--r--compat/basename.c66
-rw-r--r--compat/bswap.h5
-rw-r--r--compat/mingw.c47
-rw-r--r--compat/mingw.h36
-rw-r--r--compat/nedmalloc/malloc.c.h7
-rw-r--r--compat/poll/poll.c2
-rw-r--r--compat/terminal.c2
-rw-r--r--compat/win32/pthread.h7
-rw-r--r--compat/winansi.c5
-rw-r--r--config.mak.uname31
-rw-r--r--contrib/completion/git-completion.bash33
-rwxr-xr-xcontrib/examples/git-commit.sh8
-rwxr-xr-xcontrib/examples/git-fetch.sh4
-rwxr-xr-xcontrib/examples/git-merge.sh4
-rwxr-xr-xcontrib/examples/git-repack.sh4
-rwxr-xr-xcontrib/examples/git-revert.sh8
-rw-r--r--contrib/subtree/Makefile6
-rwxr-xr-xcontrib/subtree/git-subtree.sh22
-rwxr-xr-xcontrib/subtree/t/t7900-subtree.sh60
-rwxr-xr-xcontrib/thunderbird-patch-inline/appp.sh4
-rw-r--r--convert.c119
-rw-r--r--convert.h3
-rw-r--r--credential-cache--daemon.c4
-rw-r--r--credential-store.c5
-rw-r--r--credential.c2
-rw-r--r--daemon.c2
-rw-r--r--diff-no-index.c7
-rw-r--r--diff.c14
-rw-r--r--diff.h6
-rw-r--r--dir.c80
-rw-r--r--environment.c2
-rw-r--r--fast-import.c4
-rw-r--r--git-compat-util.h14
-rwxr-xr-xgit-filter-branch.sh2
-rwxr-xr-xgit-gui/po/glossary/txt-to-pot.sh4
-rwxr-xr-xgit-p4.py64
-rw-r--r--git-rebase--interactive.sh18
-rwxr-xr-xgit-rebase.sh2
-rwxr-xr-xgit-send-email.perl16
-rw-r--r--git.c41
-rwxr-xr-xgitk-git/gitk38
-rw-r--r--gitk-git/po/ja.po692
-rw-r--r--gitk-git/po/sv.po614
-rwxr-xr-xgitweb/gitweb.perl2
-rw-r--r--http.c142
-rw-r--r--http.h1
-rw-r--r--ident.c51
-rw-r--r--log-tree.c3
-rw-r--r--mailinfo.c8
-rw-r--r--notes-cache.c11
-rw-r--r--notes-utils.c6
-rw-r--r--notes.c21
-rw-r--r--notes.h17
-rw-r--r--pack-bitmap.c13
-rw-r--r--pack-revindex.c99
-rw-r--r--pack-revindex.h11
-rw-r--r--path.c14
-rw-r--r--perl/Git/SVN/Ra.pm8
-rw-r--r--po/TEAMS4
-rw-r--r--po/bg.po5205
-rw-r--r--po/ca.po3186
-rw-r--r--po/de.po3212
-rw-r--r--po/fr.po3223
-rw-r--r--po/git.pot3106
-rw-r--r--po/ko.po11859
-rw-r--r--po/ru.po3155
-rw-r--r--po/sv.po3221
-rw-r--r--po/vi.po3159
-rw-r--r--po/zh_CN.po3199
-rw-r--r--read-cache.c4
-rw-r--r--ref-filter.c26
-rw-r--r--reflog-walk.c16
-rw-r--r--refs.h2
-rw-r--r--refs/files-backend.c193
-rw-r--r--remote-curl.c6
-rw-r--r--remote-testsvn.c4
-rw-r--r--remote.c7
-rw-r--r--remote.h1
-rw-r--r--revision.c14
-rw-r--r--revision.h1
-rw-r--r--run-command.c337
-rw-r--r--run-command.h80
-rw-r--r--sequencer.c2
-rw-r--r--setup.c29
-rw-r--r--sha1_file.c3
-rw-r--r--shell.c2
-rw-r--r--sigchain.c9
-rw-r--r--sigchain.h1
-rw-r--r--strbuf.c39
-rw-r--r--strbuf.h37
-rw-r--r--submodule-config.c29
-rw-r--r--submodule-config.h1
-rw-r--r--submodule.c141
-rw-r--r--submodule.h3
-rw-r--r--t/lib-httpd.sh4
-rwxr-xr-xt/perf/p7300-clean.sh4
-rwxr-xr-xt/t0001-init.sh17
-rwxr-xr-xt/t0027-auto-crlf.sh121
-rwxr-xr-xt/t0060-path-utils.sh3
-rwxr-xr-xt/t0061-run-command.sh53
-rwxr-xr-xt/t1100-commit-tree-options.sh4
-rwxr-xr-xt/t1401-symbolic-ref.sh39
-rwxr-xr-xt/t1410-reflog.sh37
-rwxr-xr-xt/t1511-rev-parse-caret.sh4
-rwxr-xr-xt/t1512-rev-parse-disambiguation.sh8
-rwxr-xr-xt/t1700-split-index.sh2
-rwxr-xr-xt/t2011-checkout-invalid-head.sh39
-rwxr-xr-xt/t2025-worktree-add.sh4
-rwxr-xr-xt/t2102-update-index-symlinks.sh2
-rwxr-xr-xt/t3000-ls-files-others.sh7
-rwxr-xr-xt/t3001-ls-files-others-exclude.sh25
-rwxr-xr-xt/t3030-merge-recursive.sh2
-rwxr-xr-xt/t3100-ls-tree-restrict.sh2
-rwxr-xr-xt/t3101-ls-tree-dirname.sh2
-rwxr-xr-xt/t3203-branch-output.sh8
-rwxr-xr-xt/t3210-pack-refs.sh2
-rwxr-xr-xt/t3301-notes.sh10
-rwxr-xr-xt/t3308-notes-merge.sh22
-rwxr-xr-xt/t3403-rebase-skip.sh2
-rwxr-xr-xt/t3404-rebase-interactive.sh16
-rwxr-xr-xt/t3511-cherry-pick-x.sh14
-rwxr-xr-xt/t3600-rm.sh4
-rwxr-xr-xt/t3700-add.sh16
-rwxr-xr-xt/t4014-format-patch.sh29
-rwxr-xr-xt/t4056-diff-order.sh6
-rwxr-xr-xt/t4201-shortlog.sh22
-rwxr-xr-xt/t4202-log.sh29
-rwxr-xr-xt/t5100-mailinfo.sh12
-rwxr-xr-xt/t5300-pack-object.sh18
-rwxr-xr-xt/t5301-sliding-window.sh14
-rwxr-xr-xt/t5302-pack-index.sh34
-rwxr-xr-xt/t5303-pack-corruption-resilience.sh16
-rwxr-xr-xt/t5304-prune.sh2
-rwxr-xr-xt/t5305-include-tag.sh8
-rwxr-xr-xt/t5500-fetch-pack.sh20
-rwxr-xr-xt/t5505-remote.sh2
-rwxr-xr-xt/t5506-remote-groups.sh2
-rwxr-xr-xt/t5510-fetch.sh23
-rwxr-xr-xt/t5512-ls-remote.sh45
-rwxr-xr-xt/t5515-fetch-merge-logic.sh4
-rwxr-xr-xt/t5516-fetch-push.sh4
-rwxr-xr-xt/t5517-push-mirror.sh2
-rwxr-xr-xt/t5520-pull.sh10
-rwxr-xr-xt/t5522-pull-symlink.sh2
-rwxr-xr-xt/t5526-fetch-submodules.sh71
-rwxr-xr-xt/t5530-upload-pack-error.sh2
-rwxr-xr-xt/t5531-deep-submodule-push.sh217
-rwxr-xr-xt/t5532-fetch-proxy.sh4
-rwxr-xr-xt/t5537-fetch-shallow.sh4
-rwxr-xr-xt/t5538-push-shallow.sh4
-rwxr-xr-xt/t5550-http-fetch-dumb.sh8
-rwxr-xr-xt/t5570-git-daemon.sh8
-rwxr-xr-xt/t5601-clone.sh25
-rwxr-xr-xt/t5700-clone-reference.sh2
-rwxr-xr-xt/t5710-info-alternate.sh2
-rwxr-xr-xt/t5900-repo-selection.sh2
-rwxr-xr-xt/t6001-rev-list-graft.sh12
-rwxr-xr-xt/t6002-rev-list-bisect.sh6
-rwxr-xr-xt/t6015-rev-list-show-all-parents.sh6
-rwxr-xr-xt/t6023-merge-file.sh13
-rwxr-xr-xt/t6032-merge-large-rename.sh2
-rwxr-xr-xt/t6050-replace.sh10
-rwxr-xr-xt/t6132-pathspec-exclude.sh2
-rwxr-xr-xt/t6300-for-each-ref.sh74
-rwxr-xr-xt/t7001-mv.sh4
-rwxr-xr-xt/t7003-filter-branch.sh14
-rwxr-xr-xt/t7004-tag.sh24
-rwxr-xr-xt/t7006-pager.sh2
-rwxr-xr-xt/t7103-reset-bare.sh2
-rwxr-xr-xt/t7406-submodule-update.sh4
-rwxr-xr-xt/t7408-submodule-reference.sh2
-rwxr-xr-xt/t7504-commit-msg-hook.sh2
-rwxr-xr-xt/t7505-prepare-commit-msg-hook.sh32
-rwxr-xr-xt/t7513-interpret-trailers.sh40
-rwxr-xr-xt/t7602-merge-octopus-many.sh8
-rwxr-xr-xt/t7700-repack.sh4
-rwxr-xr-xt/t7810-grep.sh49
-rwxr-xr-xt/t8003-blame-corner-cases.sh4
-rwxr-xr-xt/t9001-send-email.sh27
-rwxr-xr-xt/t9100-git-svn-basic.sh8
-rwxr-xr-xt/t9101-git-svn-props.sh30
-rwxr-xr-xt/t9104-git-svn-follow-parent.sh68
-rwxr-xr-xt/t9105-git-svn-commit-diff.sh4
-rwxr-xr-xt/t9107-git-svn-migrate.sh28
-rwxr-xr-xt/t9108-git-svn-glob.sh20
-rwxr-xr-xt/t9109-git-svn-multi-glob.sh32
-rwxr-xr-xt/t9110-git-svn-use-svm-props.sh2
-rwxr-xr-xt/t9114-git-svn-dcommit-merge.sh12
-rwxr-xr-xt/t9118-git-svn-funky-branch-names.sh2
-rwxr-xr-xt/t9119-git-svn-info.sh2
-rwxr-xr-xt/t9129-git-svn-i18n-commitencoding.sh4
-rwxr-xr-xt/t9130-git-svn-authors-file.sh12
-rwxr-xr-xt/t9132-git-svn-broken-symlink.sh4
-rwxr-xr-xt/t9137-git-svn-dcommit-clobber-series.sh24
-rwxr-xr-xt/t9138-git-svn-authors-prog.sh2
-rwxr-xr-xt/t9145-git-svn-master-branch.sh4
-rwxr-xr-xt/t9150-svk-mergetickets.sh2
-rwxr-xr-xt/t9300-fast-import.sh68
-rwxr-xr-xt/t9350-fast-export.sh6
-rwxr-xr-xt/t9501-gitweb-standalone-http-status.sh6
-rwxr-xr-xt/t9818-git-p4-block.sh28
-rwxr-xr-xt/t9827-git-p4-change-filetype.sh66
-rwxr-xr-xt/t9901-git-web--browse.sh2
-rw-r--r--t/test-lib.sh18
-rw-r--r--test-path-utils.c130
-rw-r--r--test-run-command.c55
-rw-r--r--test-sha1-array.c2
-rwxr-xr-xtest-sha1.sh8
-rw-r--r--trailer.c69
-rw-r--r--trailer.h3
-rw-r--r--transport-helper.c5
-rw-r--r--tree-walk.c7
-rw-r--r--tree-walk.h1
-rw-r--r--unimplemented.sh2
-rw-r--r--unpack-trees.c51
-rw-r--r--walker.c2
-rw-r--r--worktree.c8
-rw-r--r--wrapper.c45
-rw-r--r--wt-status.c4
-rw-r--r--xdiff/xmerge.c98
295 files changed, 33527 insertions, 16466 deletions
diff --git a/.travis.yml b/.travis.yml
index c3bf9c6..f8b73ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
language: c
+sudo: false
+
+cache:
+ directories:
+ - $HOME/travis-cache
+
os:
- linux
- osx
@@ -18,7 +24,7 @@ env:
- P4_VERSION="15.2"
- GIT_LFS_VERSION="1.1.0"
- DEFAULT_TEST_TARGET=prove
- - GIT_PROVE_OPTS="--timer --jobs 3"
+ - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
- GIT_TEST_OPTS="--verbose --tee"
- CFLAGS="-g -O2 -Wall -Werror"
- GIT_TEST_CLONE_2GB=YesPlease
@@ -67,6 +73,8 @@ before_install:
p4 -V | grep Rev.;
echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)";
git-lfs version;
+ mkdir -p $HOME/travis-cache;
+ ln -s $HOME/travis-cache/.prove t/.prove;
before_script: make --jobs=2
diff --git a/Documentation/RelNotes/2.6.5.txt b/Documentation/RelNotes/2.6.5.txt
index 3e6331d..f0924b6 100644
--- a/Documentation/RelNotes/2.6.5.txt
+++ b/Documentation/RelNotes/2.6.5.txt
@@ -35,5 +35,24 @@ Fixes since v2.6.4
* The exit code of git-fsck did not reflect some types of errors
found in packed objects, which has been corrected.
+ * The completion script (in contrib/) used to list "git column"
+ (which is not an end-user facing command) as one of the choices
+
+ * Improve error reporting when SMTP TLS fails.
+
+ * When getpwuid() on the system returned NULL (e.g. the user is not
+ in the /etc/passwd file or other uid-to-name mappings), the
+ codepath to find who the user is to record it in the reflog barfed
+ and died. Loosen the check in this codepath, which already accepts
+ questionable ident string (e.g. host part of the e-mail address is
+ obviously bogus), and in general when we operate fmt_ident() function
+ in non-strict mode.
+
+ * "git symbolic-ref" forgot to report a failure with its exit status.
+
+ * History traversal with "git log --source" that starts with an
+ annotated tag failed to report the tag as "source", due to an
+ old regression in the command line parser back in v2.2 days.
+
Also contains typofixes, documentation updates and trivial code
clean-ups.
diff --git a/Documentation/RelNotes/2.7.0.txt b/Documentation/RelNotes/2.7.0.txt
index a84caba..563dadc 100644
--- a/Documentation/RelNotes/2.7.0.txt
+++ b/Documentation/RelNotes/2.7.0.txt
@@ -6,6 +6,10 @@ Updates since v2.6
UI, Workflows & Features
+ * The appearance of "gitk", particularly on high DPI monitors, have
+ been improved. "gitk" also comes with an undated translation for
+ Swedish and Japanese.
+
* "git remote" learned "get-url" subcommand to show the URL for a
given remote name used for fetching and pushing.
@@ -22,7 +26,7 @@ UI, Workflows & Features
* Users who are too busy to type three extra keystrokes to ask for
"git stash show -p" can now set stash.showPatch configuration
- varible to true to always see the actual patch, not just the list
+ variable to true to always see the actual patch, not just the list
of paths affected with feel for the extent of damage via diffstat.
* "quiltimport" allows to specify the series file by honoring the
@@ -65,7 +69,7 @@ UI, Workflows & Features
a superset of "--no-progress". Extend the command to support the
usual "--[no-]progress".
- * The semantics of tranfer.hideRefs configuration variable have been
+ * The semantics of transfer.hideRefs configuration variable have been
extended to work better with the ref "namespace" feature that lets
you throw unrelated bunches of repositories in a single physical
repository and virtually serve them as separate ones.
@@ -79,6 +83,12 @@ UI, Workflows & Features
* The credential-cache daemon can be told to ignore SIGHUP to work
around issue when running Git from inside emacs.
+ * "git push" learned new configuration for doing "--recurse-submodules"
+ on each push.
+
+ * "format-patch" has learned a new option to zero-out the commit
+ object name on the mbox "From " line.
+
Performance, Internal Implementation, Development Support etc.
@@ -161,6 +171,9 @@ Performance, Internal Implementation, Development Support etc.
git/git (including build-status for pull requests that people
open).
+ * The write(2) emulation for Windows learned to set errno to EPIPE
+ when necessary.
+
Also contains various documentation updates and code clean-ups.
@@ -370,4 +383,32 @@ notes for details).
them instead, with a new configuration git-p4.keepEmptyCommits as a
backward compatibility knob.
+ * The completion script (in contrib/) used to list "git column"
+ (which is not an end-user facing command) as one of the choices
+ (merge 160fcdb sg/completion-no-column later to maint).
+
+ * The error reporting from "git send-email", when SMTP TLS fails, has
+ been improved.
+ (merge 9d60524 jk/send-email-ssl-errors later to maint).
+
+ * When getpwuid() on the system returned NULL (e.g. the user is not
+ in the /etc/passwd file or other uid-to-name mappings), the
+ codepath to find who the user is to record it in the reflog barfed
+ and died. Loosen the check in this codepath, which already accepts
+ questionable ident string (e.g. host part of the e-mail address is
+ obviously bogus), and in general when we operate fmt_ident() function
+ in non-strict mode.
+ (merge 92bcbb9 jk/ident-loosen-getpwuid later to maint).
+
+ * "git symbolic-ref" forgot to report a failure with its exit status.
+ (merge f91b273 jk/symbolic-ref-maint later to maint).
+
+ * History traversal with "git log --source" that starts with an
+ annotated tag failed to report the tag as "source", due to an
+ old regression in the command line parser back in v2.2 days.
+ (merge 728350b jk/pending-keep-tag-name later to maint).
+
+ * "git p4" when interacting with multiple depots at the same time
+ used to incorrectly drop changes.
+
* Code clean-up, minor fixes etc.
diff --git a/Documentation/RelNotes/2.7.1.txt b/Documentation/RelNotes/2.7.1.txt
new file mode 100644
index 0000000..6553d69
--- /dev/null
+++ b/Documentation/RelNotes/2.7.1.txt
@@ -0,0 +1,87 @@
+Git v2.7.1 Release Notes
+========================
+
+Fixes since v2.7
+----------------
+
+ * An earlier change in 2.5.x-era broke users' hooks and aliases by
+ exporting GIT_WORK_TREE to point at the root of the working tree,
+ interfering when they tried to use a different working tree without
+ setting GIT_WORK_TREE environment themselves.
+
+ * The "exclude_list" structure has the usual "alloc, nr" pair of
+ fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot
+ to reset 'alloc' to 0 when it cleared 'nr' to discard the managed
+ array.
+
+ * "git send-email" was confused by escaped quotes stored in the alias
+ files saved by "mutt", which has been corrected.
+
+ * A few unportable C construct have been spotted by clang compiler
+ and have been fixed.
+
+ * The documentation has been updated to hint the connection between
+ the '--signoff' option and DCO.
+
+ * "git reflog" incorrectly assumed that all objects that used to be
+ at the tip of a ref must be commits, which caused it to segfault.
+
+ * The ignore mechanism saw a few regressions around untracked file
+ listing and sparse checkout selection areas in 2.7.0; the change
+ that is responsible for the regression has been reverted.
+
+ * Some codepaths used fopen(3) when opening a fixed path in $GIT_DIR
+ (e.g. COMMIT_EDITMSG) that is meant to be left after the command is
+ done. This however did not work well if the repository is set to
+ be shared with core.sharedRepository and the umask of the previous
+ user is tighter. They have been made to work better by calling
+ unlink(2) and retrying after fopen(3) fails with EPERM.
+
+ * Asking gitweb for a nonexistent commit left a warning in the server
+ log.
+
+ * "git rebase", unlike all other callers of "gc --auto", did not
+ ignore the exit code from "gc --auto".
+
+ * Many codepaths that run "gc --auto" before exiting kept packfiles
+ mapped and left the file descriptors to them open, which was not
+ friendly to systems that cannot remove files that are open. They
+ now close the packs before doing so.
+
+ * A recent optimization to filter-branch in v2.7.0 introduced a
+ regression when --prune-empty filter is used, which has been
+ corrected.
+
+ * The description for SANITY prerequisite the test suite uses has
+ been clarified both in the comment and in the implementation.
+
+ * "git tag" started listing a tag "foo" as "tags/foo" when a branch
+ named "foo" exists in the same repository; remove this unnecessary
+ disambiguation, which is a regression introduced in v2.7.0.
+
+ * The way "git svn" uses auth parameter was broken by Subversion
+ 1.9.0 and later.
+
+ * The "split" subcommand of "git subtree" (in contrib/) incorrectly
+ skipped merges when it shouldn't, which was corrected.
+
+ * A few options of "git diff" did not work well when the command was
+ run from a subdirectory.
+
+ * dirname() emulation has been added, as Msys2 lacks it.
+
+ * The underlying machinery used by "ls-files -o" and other commands
+ have been taught not to create empty submodule ref cache for a
+ directory that is not a submodule. This removes a ton of wasted
+ CPU cycles.
+
+ * Drop a few old "todo" items by deciding that the change one of them
+ suggests is not such a good idea, and doing the change the other
+ one suggested to do.
+
+ * Documentation for "git fetch --depth" has been updated for clarity.
+
+ * The command line completion learned a handful of additional options
+ and command specific syntax.
+
+Also includes a handful of documentation and test updates.
diff --git a/Documentation/RelNotes/2.8.0.txt b/Documentation/RelNotes/2.8.0.txt
new file mode 100644
index 0000000..166e06c
--- /dev/null
+++ b/Documentation/RelNotes/2.8.0.txt
@@ -0,0 +1,235 @@
+Git 2.8 Release Notes
+=====================
+
+Updates since v2.7
+------------------
+
+UI, Workflows & Features
+
+ * "branch --delete" has "branch -d" but "push --delete" does not.
+
+ * "git blame" learned to produce the progress eye-candy when it takes
+ too much time before emitting the first line of the result.
+
+ * "git grep" can now be configured (or told from the command line)
+ how many threads to use when searching in the working tree files.
+
+ * Some "git notes" operations, e.g. "git log --notes=<note>", should
+ be able to read notes from any tree-ish that is shaped like a notes
+ tree, but the notes infrastructure required that the argument must
+ be a ref under refs/notes/. Loosen it to require a valid ref only
+ when the operation would update the notes (in which case we must
+ have a place to store the updated notes tree, iow, a ref).
+
+ * "git grep" by default does not fall back to its "--no-index"
+ behaviour outside a directory under Git's control (otherwise the
+ user may by mistake end up running a huge recursive search); with a
+ new configuration (set in $HOME/.gitconfig--by definition this
+ cannot be set in the config file per project), this safety can be
+ disabled.
+
+ * "git pull --rebase" has been extended to allow invoking
+ "rebase -i".
+
+ * "git p4" learned to cope with the type of a file getting changed.
+
+ * "git format-patch" learned to notice format.outputDirectory
+ configuration variable. This allows "-o <dir>" option to be
+ omitted on the command line if you always use the same directory in
+ your workflow.
+
+ * "interpret-trailers" has been taught to optionally update a file in
+ place, instead of always writing the result to the standard output.
+
+ * Many commands that read files that are expected to contain text
+ that is generated (or can be edited) by the end user to control
+ their behaviour (e.g. "git grep -f <filename>") have been updated
+ to be more tolerant to lines that are terminated with CRLF (they
+ used to treat such a line to contain payload that ends with CR,
+ which is usually not what the users expect).
+
+ * "git notes merge" used to limit the source of the merged notes tree
+ to somewhere under refs/notes/ hierarchy, which was too limiting
+ when inventing a workflow to exchange notes with remote
+ repositories using remote-tracking notes trees (located in e.g.
+ refs/remote-notes/ or somesuch).
+
+ * "git ls-files" learned a new "--eol" option to help diagnose
+ end-of-line problems.
+
+ * "ls-remote" learned an option to show which branch the remote
+ repository advertises as its primary by pointing its HEAD at.
+
+ * New http.proxyAuthMethod configuration variable can be used to
+ specify what authentication method to use, as a way to work around
+ proxies that do not give error response expected by libcurl when
+ CURLAUTH_ANY is used. Also, the codepath for proxy authentication
+ has been taught to use credential API to store the authentication
+ material in user's keyrings.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Add a framework to spawn a group of processes in parallel, and use
+ it to run "git fetch --recurse-submodules" in parallel.
+
+ * A slight update to the Makefile to mark "phoney" targets
+ as such correctly.
+
+ * In-core storage of the reverse index for .pack files (which lets
+ you go from a pack offset to an object name) has been streamlined.
+
+ * d95138e6 (setup: set env $GIT_WORK_TREE when work tree is set, like
+ $GIT_DIR, 2015-06-26) attempted to work around a glitch in alias
+ handling by overwriting GIT_WORK_TREE environment variable to
+ affect subprocesses when set_git_work_tree() gets called, which
+ resulted in a rather unpleasant regression to "clone" and "init".
+ Try to address the same issue by always restoring the environment
+ and respawning the real underlying command when handling alias.
+
+ * The low-level code that is used to create symbolic references has
+ been updated to share more code with the code that deals with
+ normal references.
+
+ * strbuf_getline() and friends have been redefined to make it easier
+ to identify which callsite of (new) strbuf_getline_lf() should
+ allow and silently ignore carriage-return at the end of the line to
+ help users on DOSsy systems.
+
+ * "git shortlog" used to accumulate various pieces of information
+ regardless of what was asked to be shown in the final output. It
+ has been optimized by noticing what need not to be collected
+ (e.g. there is no need to collect the log messages when showing
+ only the number of changes).
+
+ * "git checkout $branch" (and other operations that share the same
+ underlying machinery) has been optimized.
+
+ * Automated tests in Travis CI environment has been optimized by
+ persisting runtime statistics of previous "prove" run, executing
+ tests that take longer before other ones; this reduces the total
+ wallclock time.
+
+
+Also contains various documentation updates and code clean-ups.
+
+
+Fixes since v2.7
+----------------
+
+Unless otherwise noted, all the fixes since v2.7 in the maintenance
+track are contained in this release (see the maintenance releases'
+notes for details).
+
+ * An earlier change in 2.5.x-era broke users' hooks and aliases by
+ exporting GIT_WORK_TREE to point at the root of the working tree,
+ interfering when they tried to use a different working tree without
+ setting GIT_WORK_TREE environment themselves.
+ (merge df1e6ea nd/stop-setenv-work-tree later to maint).
+
+ * The "exclude_list" structure has the usual "alloc, nr" pair of
+ fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot
+ to reset 'alloc' to 0 when it cleared 'nr' to discard the managed
+ array.
+ (merge 2653a8c nd/dir-exclude-cleanup later to maint).
+
+ * Paths that have been told the index about with "add -N" are not
+ quite yet in the index, but a few commands behaved as if they
+ already are in a harmful way.
+ (merge 4d55200 nd/ita-cleanup later to maint).
+
+ * "git send-email" was confused by escaped quotes stored in the alias
+ files saved by "mutt", which has been corrected.
+ (merge 2c510f2 ew/send-email-mutt-alias-fix later to maint).
+
+ * A few unportable C construct have been spotted by clang compiler
+ and have been fixed.
+ (merge a0df2e5 jk/clang-pedantic later to maint).
+
+ * The documentation has been updated to hint the connection between
+ the '--signoff' option and DCO.
+ (merge b2c150d dw/signoff-doc later to maint).
+
+ * "git reflog" incorrectly assumed that all objects that used to be
+ at the tip of a ref must be commits, which caused it to segfault.
+ (merge aecad37 dk/reflog-walk-with-non-commit later to maint).
+
+ * The ignore mechanism saw a few regressions around untracked file
+ listing and sparse checkout selection areas in 2.7.0; the change
+ that is responsible for the regression has been reverted.
+ (merge 8c72236 nd/exclusion-regression-fix later to maint).
+
+ * Some codepaths used fopen(3) when opening a fixed path in $GIT_DIR
+ (e.g. COMMIT_EDITMSG) that is meant to be left after the command is
+ done. This however did not work well if the repository is set to
+ be shared with core.sharedRepository and the umask of the previous
+ user is tighter. They have been made to work better by calling
+ unlink(2) and retrying after fopen(3) fails with EPERM.
+ (merge ea56518 js/fopen-harder later to maint).
+
+ * Asking gitweb for a nonexistent commit left a warning in the server
+ log.
+
+ Somebody may want to follow this up with an additional test, perhaps?
+ IIRC, we do test that no Perl warnings are given to the server log,
+ so this should have been caught if our test coverage were good.
+ (merge a9eb90a ho/gitweb-squelch-undef-warning later to maint).
+
+ * "git rebase", unlike all other callers of "gc --auto", did not
+ ignore the exit code from "gc --auto".
+ (merge 8c24f5b jk/ok-to-fail-gc-auto-in-rebase later to maint).
+
+ * Many codepaths that run "gc --auto" before exiting kept packfiles
+ mapped and left the file descriptors to them open, which was not
+ friendly to systems that cannot remove files that are open. They
+ now close the packs before doing so.
+ (merge d562102 js/close-packs-before-gc later to maint).
+
+ * A recent optimization to filter-branch in v2.7.0 introduced a
+ regression when --prune-empty filter is used, which has been
+ corrected.
+ (merge 1dc413e jk/filter-branch-no-index later to maint).
+
+ * The description for SANITY prerequisite the test suite uses has
+ been clarified both in the comment and in the implementation.
+ (merge 719c3da jk/sanity later to maint).
+
+ * "git tag" started listing a tag "foo" as "tags/foo" when a branch
+ named "foo" exists in the same repository; remove this unnecessary
+ disambiguation, which is a regression introduced in v2.7.0.
+ (merge 0571979 jk/list-tag-2.7-regression later to maint).
+
+ * The way "git svn" uses auth parameter was broken by Subversion
+ 1.9.0 and later.
+ (merge 0b66415 ew/svn-1.9.0-auth later to maint).
+
+ * The "split" subcommand of "git subtree" (in contrib/) incorrectly
+ skipped merges when it shouldn't, which was corrected.
+ (merge 933cfeb dw/subtree-split-do-not-drop-merge later to maint).
+
+ * A few options of "git diff" did not work well when the command was
+ run from a subdirectory.
+ (merge a97262c nd/diff-with-path-params later to maint).
+
+ * The command line completion learned a handful of additional options
+ and command specific syntax.
+ (merge fa4b5e3 jk/completion-rebase later to maint).
+ (merge f7c2e1a pw/completion-show-branch later to maint).
+ (merge d7d4ca8 pw/completion-stash later to maint).
+ (merge e6414b4 tb/complete-word-diff-regex later to maint).
+
+ * dirname() emulation has been added, as Msys2 lacks it.
+ (merge e7d5ce8 js/dirname-basename later to maint).
+
+ * The underlying machinery used by "ls-files -o" and other commands
+ have been taught not to create empty submodule ref cache for a
+ directory that is not a submodule. This removes a ton of wasted
+ CPU cycles.
+ (merge a2d5156 jk/ref-cache-non-repository-optim later to maint).
+
+ * Other minor clean-ups and documentation updates
+ (merge 99487cf ss/user-manual later to maint).
+ (merge e914ef0 ew/for-each-ref-doc later to maint).
+ (merge 36fc7d8 sg/t6050-failing-editor-test-fix later to maint).
+ (merge 60253a6 ss/clone-depth-single-doc later to maint).
+ (merge bd02e97 lv/add-doc-working-tree later to maint).
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 760eab7..02cb684 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -69,6 +69,13 @@ include::line-range-format.txt[]
iso format is used. For supported values, see the discussion
of the --date option at linkgit:git-log[1].
+--[no-]progress::
+ Progress status is reported on the standard error stream
+ by default when it is attached to a terminal. This flag
+ enables progress reporting even if not attached to a
+ terminal. Can't use `--progress` together with `--porcelain`
+ or `--incremental`.
+
-M|<num>|::
Detect moved or copied lines within a file. When a commit
moves or copies a block of lines (e.g. the original file
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e3c8cfe..27f02be 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -879,6 +879,8 @@ When preserve, also pass `--preserve-merges` along to 'git rebase'
so that locally committed merge commits will not be flattened
by running 'git pull'.
+
+When the value is `interactive`, the rebase is run in interactive mode.
++
*NOTE*: this is a possibly dangerous operation; do *not* use
it unless you understand the implications (see linkgit:git-rebase[1]
for details).
@@ -1252,6 +1254,10 @@ format.coverLetter::
format-patch is invoked, but in addition can be set to "auto", to
generate a cover-letter only when there's more than one patch.
+format.outputDirectory::
+ Set a custom directory to store the resulting files instead of the
+ current working directory.
+
filter.<driver>.clean::
The command which is used to convert the content of a worktree
file to a blob upon checkin. See linkgit:gitattributes[5] for
@@ -1459,6 +1465,14 @@ grep.extendedRegexp::
option is ignored when the 'grep.patternType' option is set to a value
other than 'default'.
+grep.threads::
+ Number of grep worker threads to use.
+ See `grep.threads` in linkgit:git-grep[1] for more information.
+
+grep.fallbackToNoIndex::
+ If set to true, fall back to git grep --no-index if git grep
+ is executed outside of a git repository. Defaults to false.
+
gpg.program::
Use this custom program instead of "gpg" found on $PATH when
making or verifying a PGP signature. The program must support the
@@ -1605,9 +1619,34 @@ help.htmlPath::
http.proxy::
Override the HTTP proxy, normally configured using the 'http_proxy',
- 'https_proxy', and 'all_proxy' environment variables (see
- `curl(1)`). This can be overridden on a per-remote basis; see
- remote.<name>.proxy
+ 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In
+ addition to the syntax understood by curl, it is possible to specify a
+ proxy string with a user name but no password, in which case git will
+ attempt to acquire one in the same way it does for other credentials. See
+ linkgit:gitcredentials[7] for more information. The syntax thus is
+ '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden
+ on a per-remote basis; see remote.<name>.proxy
+
+http.proxyAuthMethod::
+ Set the method with which to authenticate against the HTTP proxy. This
+ only takes effect if the configured proxy string contains a user name part
+ (i.e. is of the form 'user@host' or 'user@host:port'). This can be
+ overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`.
+ Both can be overridden by the 'GIT_HTTP_PROXY_AUTHMETHOD' environment
+ variable. Possible values are:
++
+--
+* `anyauth` - Automatically pick a suitable authentication method. It is
+ assumed that the proxy answers an unauthenticated request with a 407
+ status code and one or more Proxy-authenticate headers with supported
+ authentication methods. This is the default.
+* `basic` - HTTP Basic authentication
+* `digest` - HTTP Digest authentication; this prevents the password from being
+ transmitted to the proxy in clear text
+* `negotiate` - GSS-Negotiate authentication (compare the --negotiate option
+ of `curl(1)`)
+* `ntlm` - NTLM authentication (compare the --ntlm option of `curl(1)`)
+--
http.cookieFile::
File containing previously stored cookie lines which should be used
@@ -2158,6 +2197,8 @@ When preserve, also pass `--preserve-merges` along to 'git rebase'
so that locally committed merge commits will not be flattened
by running 'git pull'.
+
+When the value is `interactive`, the rebase is run in interactive mode.
++
*NOTE*: this is a possibly dangerous operation; do *not* use
it unless you understand the implications (see linkgit:git-rebase[1]
for details).
@@ -2238,6 +2279,20 @@ push.gpgSign::
override a value from a lower-priority config file. An explicit
command-line flag always overrides this config option.
+push.recurseSubmodules::
+ Make sure all submodule commits used by the revisions to be pushed
+ are available on a remote-tracking branch. If the value is 'check'
+ then Git will verify that all submodule commits that changed in the
+ revisions to be pushed are available on at least one remote of the
+ submodule. If any commits are missing, the push will be aborted and
+ exit with non-zero status. If the value is 'on-demand' then all
+ submodules that changed in the revisions to be pushed will be
+ pushed. If on-demand was not able to push all necessary revisions
+ it will also be aborted and exit with non-zero status. If the value
+ is 'no' then default behavior of ignoring submodules when pushing
+ is retained. You may override this configuration at time of push by
+ specifying '--recurse-submodules=check|on-demand|no'.
+
rebase.stat::
Whether to show a diffstat of what changed upstream since the last
rebase. False by default.
@@ -2402,6 +2457,11 @@ remote.<name>.proxy::
the proxy to use for that remote. Set to the empty string to
disable proxying for that remote.
+remote.<name>.proxyAuthMethod::
+ For remotes that require curl (http, https and ftp), the method to use for
+ authenticating against the proxy in use (probably set in
+ `remote.<name>.proxy`). See `http.proxyAuthMethod`.
+
remote.<name>.fetch::
The default set of "refspec" for linkgit:git-fetch[1]. See
linkgit:git-fetch[1].
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 45583d8..952dfdf 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -8,10 +8,11 @@
option old data in `.git/FETCH_HEAD` will be overwritten.
--depth=<depth>::
- Deepen or shorten the history of a 'shallow' repository created by
- `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
- to the specified number of commits from the tip of each remote
- branch history. Tags for the deepened commits are not fetched.
+ Limit fetching to the specified number of commits from the tip of
+ each remote branch history. If fetching to a 'shallow' repository
+ created by `git clone` with `--depth=<depth>` option (see
+ linkgit:git-clone[1]), deepen or shorten the history to the specified
+ number of commits. Tags for the deepened commits are not fetched.
--unshallow::
If the source repository is complete, convert a shallow
@@ -100,6 +101,13 @@ ifndef::git-pull[]
reference to a commit that isn't already in the local submodule
clone.
+-j::
+--jobs=<n>::
+ Number of parallel children to be used for fetching submodules.
+ Each will fetch from different submodules, such that fetching many
+ submodules will be faster. By default submodules will be fetched
+ one at a time.
+
--no-recurse-submodules::
Disable recursive fetching of submodules (this has the same effect as
using the '--recurse-submodules=no' option).
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index fe5282f..6a96a66 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -24,7 +24,7 @@ remove paths that do not exist in the working tree anymore.
The "index" holds a snapshot of the content of the working tree, and it
is this snapshot that is taken as the contents of the next commit. Thus
-after making any changes to the working directory, and before running
+after making any changes to the working tree, and before running
the commit command, you must use the `add` command to add any new or
modified files to the index.
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 452c1fe..13cdd7f 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -35,6 +35,7 @@ OPTIONS
--signoff::
Add a `Signed-off-by:` line to the commit message, using
the committer identity of yourself.
+ See the signoff option in linkgit:git-commit[1] for more information.
-k::
--keep::
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index e6e947c..ba54175 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -10,7 +10,8 @@ SYNOPSIS
[verse]
'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]
[-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
- [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>] [--] <file>
+ [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>]
+ [--] <file>
DESCRIPTION
-----------
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 77da29a..6154e57 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -100,6 +100,7 @@ effect to your index in a row.
-s::
--signoff::
Add Signed-off-by line at the end of the commit message.
+ See the signoff option in linkgit:git-commit[1] for more information.
-S[<keyid>]::
--gpg-sign[=<keyid>]::
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 6bf000d..789b668 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -190,15 +190,14 @@ objects from the source repository into a pack in the cloned repository.
--depth <depth>::
Create a 'shallow' clone with a history truncated to the
- specified number of revisions.
+ specified number of commits. Implies `--single-branch` unless
+ `--no-single-branch` is given to fetch the histories near the
+ tips of all branches.
--[no-]single-branch::
Clone only the history leading to the tip of a single branch,
either specified by the `--branch` option or the primary
- branch remote's `HEAD` points at. When creating a shallow
- clone with the `--depth` option, this is the default, unless
- `--no-single-branch` is given to fetch the histories near the
- tips of all branches.
+ branch remote's `HEAD` points at.
Further fetches into the resulting repository will only update the
remote-tracking branch for the branch this option was used for the
initial cloning. If the HEAD at the remote did not point at any
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 7f34a5b..9ec6b3c 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -154,7 +154,11 @@ OPTIONS
-s::
--signoff::
Add Signed-off-by line by the committer at the end of the commit
- log message.
+ log message. The meaning of a signoff depends on the project,
+ but it typically certifies that committer has
+ the rights to submit this work under the same license and
+ agrees to a Developer Certificate of Origin
+ (see http://developercertificate.org/ for more information).
-n::
--no-verify::
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index c6f073c..2e3e96f 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -92,7 +92,11 @@ refname::
The name of the ref (the part after $GIT_DIR/).
For a non-ambiguous short name of the ref append `:short`.
The option core.warnAmbiguousRefs is used to select the strict
- abbreviation mode.
+ abbreviation mode. If `strip=<N>` is appended, strips `<N>`
+ slash-separated path components from the front of the refname
+ (e.g., `%(refname:strip=2)` turns `refs/tags/foo` into `foo`.
+ `<N>` must be a positive integer. If a displayed ref has fewer
+ components than `<N>`, the command aborts with an error.
objecttype::
The type of the object (`blob`, `tree`, `commit`, `tag`).
@@ -142,6 +146,11 @@ In addition to the above, for commit and tag objects, the header
field names (`tree`, `parent`, `object`, `type`, and `tag`) can
be used to specify the value in the header field.
+For commit and tag objects, the special `creatordate` and `creator`
+fields will correspond to the appropriate date or name-email-date tuple
+from the `committer` or `tagger` fields depending on the object type.
+These are intended for working on a mix of annotated and lightweight tags.
+
Fields that have name-email-date tuple as its value (`author`,
`committer`, and `tagger`) can be suffixed with `name`, `email`,
and `date` to extract the named component.
@@ -153,8 +162,8 @@ line is 'contents:body', where body is all of the lines after the first
blank line. The optional GPG signature is `contents:signature`. The
first `N` lines of the message is obtained using `contents:lines=N`.
-For sorting purposes, fields with numeric values sort in numeric
-order (`objectsize`, `authordate`, `committerdate`, `taggerdate`).
+For sorting purposes, fields with numeric values sort in numeric order
+(`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`).
All other fields are used to sort in their byte-value order.
There is also an option to sort by versions, this can be done by using
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 4035649..6821441 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -57,7 +57,11 @@ The names of the output files are printed to standard
output, unless the `--stdout` option is specified.
If `-o` is specified, output files are created in <dir>. Otherwise
-they are created in the current working directory.
+they are created in the current working directory. The default path
+can be set with the 'format.outputDirectory' configuration option.
+The `-o` option takes precedence over `format.outputDirectory`.
+To store patches in the current working directory even when
+`format.outputDirectory` points elsewhere, use `-o .`.
By default, the subject of a single patch is "[PATCH] " followed by
the concatenation of lines from the commit message up to the first blank
@@ -109,6 +113,7 @@ include::diff-options.txt[]
--signoff::
Add `Signed-off-by:` line to the commit message, using
the committer identity of yourself.
+ See the signoff option in linkgit:git-commit[1] for more information.
--stdout::
Print all commits to the standard output in mbox format,
@@ -256,6 +261,10 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.
using this option cannot be applied properly, but they are
still useful for code review.
+--zero-commit::
+ Output an all-zero hash in each patch's From header instead
+ of the hash of the commit.
+
--root::
Treat the revision argument as a <revision range>, even if it
is just a single commit (that would normally be treated as a
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 4a44d6d..cb0f6cf 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -23,6 +23,7 @@ SYNOPSIS
[--break] [--heading] [-p | --show-function]
[-A <post-context>] [-B <pre-context>] [-C <context>]
[-W | --function-context]
+ [--threads <num>]
[-f <file>] [-e] <pattern>
[--and|--or|--not|(|)|-e <pattern>...]
[ [--[no-]exclude-standard] [--cached | --no-index | --untracked] | <tree>...]
@@ -53,9 +54,17 @@ grep.extendedRegexp::
option is ignored when the 'grep.patternType' option is set to a value
other than 'default'.
+grep.threads::
+ Number of grep worker threads to use. If unset (or set to 0),
+ 8 threads are used by default (for now).
+
grep.fullName::
If set to true, enable '--full-name' option by default.
+grep.fallbackToNoIndex::
+ If set to true, fall back to git grep --no-index if git grep
+ is executed outside of a git repository. Defaults to false.
+
OPTIONS
-------
@@ -227,6 +236,10 @@ OPTIONS
effectively showing the whole function in which the match was
found.
+--threads <num>::
+ Number of grep worker threads to use.
+ See `grep.threads` in 'CONFIGURATION' for more information.
+
-f <file>::
Read patterns from <file>, one per line.
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 0ecd497..a77b901 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -8,7 +8,7 @@ git-interpret-trailers - help add structured information into commit messages
SYNOPSIS
--------
[verse]
-'git interpret-trailers' [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]
+'git interpret-trailers' [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]
DESCRIPTION
-----------
@@ -64,6 +64,9 @@ folding rules, the encoding rules and probably many other rules.
OPTIONS
-------
+--in-place::
+ Edit the files in place.
+
--trim-empty::
If the <value> part of any trailer contains only whitespace,
the whole trailer will be removed from the resulting message.
@@ -216,6 +219,25 @@ Signed-off-by: Alice <alice@example.com>
Signed-off-by: Bob <bob@example.com>
------------
+* Use the '--in-place' option to edit a message file in place:
++
+------------
+$ cat msg.txt
+subject
+
+message
+
+Signed-off-by: Bob <bob@example.com>
+$ git interpret-trailers --trailer 'Acked-by: Alice <alice@example.com>' --in-place msg.txt
+$ cat msg.txt
+subject
+
+message
+
+Signed-off-by: Bob <bob@example.com>
+Acked-by: Alice <alice@example.com>
+------------
+
* Extract the last commit as a patch, and add a 'Cc' and a
'Reviewed-by' trailer to it:
+
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index e26f01f..0e08f56 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -12,6 +12,7 @@ SYNOPSIS
'git ls-files' [-z] [-t] [-v]
(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*
(-[c|d|o|i|s|u|k|m])*
+ [--eol]
[-x <pattern>|--exclude=<pattern>]
[-X <file>|--exclude-from=<file>]
[--exclude-per-directory=<file>]
@@ -147,6 +148,24 @@ a space) at the start of each line:
possible for manual inspection; the exact format may change at
any time.
+--eol::
+ Show <eolinfo> and <eolattr> of files.
+ <eolinfo> is the file content identification used by Git when
+ the "text" attribute is "auto" (or not set and core.autocrlf is not false).
+ <eolinfo> is either "-text", "none", "lf", "crlf", "mixed" or "".
++
+"" means the file is not a regular file, it is not in the index or
+not accessable in the working tree.
++
+<eolattr> is the attribute that is used when checking out or committing,
+it is either "", "-text", "text", "text=auto", "text eol=lf", "text eol=crlf".
+Note: Currently Git does not support "text=auto eol=lf" or "text=auto eol=crlf",
+that may change in the future.
++
+Both the <eolinfo> in the index ("i/<eolinfo>")
+and in the working tree ("w/<eolinfo>") are shown for regular files,
+followed by the ("attr/<eolattr>").
+
\--::
Do not interpret any more arguments as options.
@@ -161,6 +180,9 @@ which case it outputs:
[<tag> ]<mode> <object> <stage> <file>
+'git ls-files --eol' will show
+ i/<eolinfo><SPACES>w/<eolinfo><SPACES>attr/<eolattr><SPACE*><TAB><file>
+
'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine
detailed information on unmerged paths.
diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index d510c05..5f2628c 100644
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -9,8 +9,9 @@ git-ls-remote - List references in a remote repository
SYNOPSIS
--------
[verse]
-'git ls-remote' [--heads] [--tags] [--upload-pack=<exec>]
- [--exit-code] <repository> [<refs>...]
+'git ls-remote' [--heads] [--tags] [--refs] [--upload-pack=<exec>]
+ [-q | --quiet] [--exit-code] [--get-url]
+ [--symref] [<repository> [<refs>...]]
DESCRIPTION
-----------
@@ -29,6 +30,13 @@ OPTIONS
both, references stored in refs/heads and refs/tags are
displayed.
+--refs::
+ Do not show peeled tags or pseudorefs like HEAD in the output.
+
+-q::
+--quiet::
+ Do not print remote URL to stderr.
+
--upload-pack=<exec>::
Specify the full path of 'git-upload-pack' on the remote
host. This allows listing references from repositories accessed via
@@ -46,6 +54,12 @@ OPTIONS
"url.<base>.insteadOf" config setting (See linkgit:git-config[1]) and
exit without talking to the remote.
+--symref::
+ In addition to the object pointed by it, show the underlying
+ ref pointed by it when showing a symbolic ref. Currently,
+ upload-pack only shows the symref HEAD, so it will be the only
+ one shown by ls-remote.
+
<repository>::
The "remote" repository to query. This parameter can be
either a URL or the name of a remote (see the GIT URLS and
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 93c72a2..a62a2a6 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -101,7 +101,7 @@ Options related to merging
include::merge-options.txt[]
-r::
---rebase[=false|true|preserve]::
+--rebase[=false|true|preserve|interactive]::
When true, rebase the current branch on top of the upstream
branch after fetching. If there is a remote-tracking branch
corresponding to the upstream branch and the upstream branch
@@ -113,6 +113,8 @@ to `git rebase` so that locally created merge commits will not be flattened.
+
When false, merge the current branch into the upstream branch.
+
+When `interactive`, enable the interactive mode of rebase.
++
See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in
linkgit:git-config[1] if you want to make `git pull` always use
`--rebase` instead of merging.
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 85a4d7d..32482ce 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
- [--repo=<repository>] [-f | --force] [--prune] [-v | --verbose]
+ [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
[-u | --set-upstream]
[--[no-]signed|--sign=(true|false|if-asked)]
[--force-with-lease[=<refname>[:<expect>]]]
@@ -257,16 +257,20 @@ origin +master` to force a push to the `master` branch). See the
is specified. This flag forces progress status even if the
standard error stream is not directed to a terminal.
---recurse-submodules=check|on-demand::
- Make sure all submodule commits used by the revisions to be
- pushed are available on a remote-tracking branch. If 'check' is
- used Git will verify that all submodule commits that changed in
- the revisions to be pushed are available on at least one remote
- of the submodule. If any commits are missing the push will be
- aborted and exit with non-zero status. If 'on-demand' is used
- all submodules that changed in the revisions to be pushed will
- be pushed. If on-demand was not able to push all necessary
- revisions it will also be aborted and exit with non-zero status.
+--no-recurse-submodules::
+--recurse-submodules=check|on-demand|no::
+ May be used to make sure all submodule commits used by the
+ revisions to be pushed are available on a remote-tracking branch.
+ If 'check' is used Git will verify that all submodule commits that
+ changed in the revisions to be pushed are available on at least one
+ remote of the submodule. If any commits are missing the push will
+ be aborted and exit with non-zero status. If 'on-demand' is used
+ all submodules that changed in the revisions to be pushed will be
+ pushed. If on-demand was not able to push all necessary revisions
+ it will also be aborted and exit with non-zero status. A value of
+ 'no' or using '--no-recurse-submodules' can be used to override the
+ push.recurseSubmodules configuration variable when no submodule
+ recursion is required.
--[no-]verify::
Toggle the pre-push hook (see linkgit:githooks[5]). The
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index b15139f..573616a 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -89,6 +89,7 @@ effect to your index in a row.
-s::
--signoff::
Add Signed-off-by line at the end of the commit message.
+ See the signoff option in linkgit:git-commit[1] for more information.
--strategy=<strategy>::
Use the given merge strategy. Should only be used once.
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 7220e5e..abab481 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -163,7 +163,7 @@ This option is only applicable when listing tags without annotation lines.
A string that interpolates `%(fieldname)` from the object
pointed at by a ref being shown. The format is the same as
that of linkgit:git-for-each-ref[1]. When unspecified,
- defaults to `%(refname:short)`.
+ defaults to `%(refname:strip=2)`.
--[no-]merged [<commit>]::
Only list tags whose tips are reachable, or not reachable
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 5b9ad04..62c76c1 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -32,11 +32,9 @@ The working tree's administrative files in the repository (see
`git worktree prune` in the main or any linked working tree to
clean up any stale administrative files.
-If you move a linked working tree to another file system, or
-within a file system that does not support hard links, you need to run
-at least one git command inside the linked working tree
-(e.g. `git status`) in order to update its administrative files in the
-repository so that they do not get automatically pruned.
+If you move a linked working tree, you need to manually update the
+administrative files so that they do not get pruned automatically. See
+section "DETAILS" for more information.
If a linked working tree is stored on a portable device or network share
which is not always mounted, you can prevent its administrative files from
@@ -137,6 +135,13 @@ thumb is do not make any assumption about whether a path belongs to
$GIT_DIR or $GIT_COMMON_DIR when you need to directly access something
inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path.
+If you move a linked working tree, you need to update the 'gitdir' file
+in the entry's directory. For example, if a linked working tree is moved
+to `/newpath/test-next` and its `.git` file points to
+`/path/main/.git/worktrees/test-next`, then update
+`/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next`
+instead.
+
To prevent a $GIT_DIR/worktrees entry from being pruned (which
can be useful in some situations, such as when the
entry's working tree is stored on a portable device), add a file named
diff --git a/Documentation/git.txt b/Documentation/git.txt
index cbf157b..d987ad2 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,16 @@ unreleased) version of Git, that is available from the 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v2.6.4/git.html[documentation for release 2.6.4]
+* link:v2.7.1/git.html[documentation for release 2.7.1]
* release notes for
+ link:RelNotes/2.7.1.txt[2.7.1],
+ link:RelNotes/2.7.0.txt[2.7].
+
+* link:v2.6.5/git.html[documentation for release 2.6.5]
+
+* release notes for
+ link:RelNotes/2.6.5.txt[2.6.5],
link:RelNotes/2.6.4.txt[2.6.4],
link:RelNotes/2.6.3.txt[2.6.3],
link:RelNotes/2.6.2.txt[2.6.2],
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 79a1948..473623d 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -82,12 +82,12 @@ PATTERN FORMAT
- An optional prefix "`!`" which negates the pattern; any
matching file excluded by a previous pattern will become
- included again.
+ included again. It is not possible to re-include a file if a parent
+ directory of that file is excluded. Git doesn't list excluded
+ directories for performance reasons, so any patterns on contained
+ files have no effect, no matter where they are defined.
Put a backslash ("`\`") in front of the first "`!`" for patterns
that begin with a literal "`!`", for example, "`\!important!.txt`".
- It is possible to re-include a file if a parent directory of that
- file is excluded if certain conditions are met. See section NOTES
- for detail.
- If the pattern ends with a slash, it is removed for the
purpose of the following description, but it would only find
@@ -141,21 +141,6 @@ not tracked by Git remain untracked.
To stop tracking a file that is currently tracked, use
'git rm --cached'.
-To re-include files or directories when their parent directory is
-excluded, the following conditions must be met:
-
- - The rules to exclude a directory and re-include a subset back must
- be in the same .gitignore file.
-
- - The directory part in the re-include rules must be literal (i.e. no
- wildcards)
-
- - The rules to exclude the parent directory must not end with a
- trailing slash.
-
- - The rules to exclude the parent directory must have at least one
- slash.
-
EXAMPLES
--------
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index e225974..cafc284 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -531,6 +531,11 @@ The most notable example is `HEAD`.
"Secure Hash Algorithm 1"; a cryptographic hash function.
In the context of Git used as a synonym for <<def_object_name,object name>>.
+[[def_shallow_clone]]shallow clone::
+ Mostly a synonym to <<def_shallow_repository,shallow repository>>
+ but the phrase makes it more explicit that it was created by
+ running `git clone --depth=...` command.
+
[[def_shallow_repository]]shallow repository::
A shallow <<def_repository,repository>> has an incomplete
history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 4b659ac..54b88b6 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -43,7 +43,7 @@ people using 80-column terminals.
commit may be copied to the output.
ifndef::git-rev-list[]
---notes[=<ref>]::
+--notes[=<treeish>]::
Show the notes (see linkgit:git-notes[1]) that annotate the
commit, when showing the commit log message. This is the default
for `git log`, `git show` and `git whatchanged` commands when
@@ -54,8 +54,8 @@ By default, the notes shown are from the notes refs listed in the
'core.notesRef' and 'notes.displayRef' variables (or corresponding
environment overrides). See linkgit:git-config[1] for more details.
+
-With an optional '<ref>' argument, show this notes ref instead of the
-default notes ref(s). The ref specifies the full refname when it begins
+With an optional '<treeish>' argument, use the treeish to find the notes
+to display. The treeish can specify the full refname when it begins
with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise
`refs/notes/` is prefixed to form a full name of the ref.
+
@@ -71,7 +71,7 @@ being displayed. Examples: "--notes=foo" will show only notes from
"--notes --notes=foo --no-notes --notes=bar" will only show notes
from "refs/notes/bar".
---show-notes[=<ref>]::
+--show-notes[=<treeish>]::
--[no-]standard-notes::
These options are deprecated. Use the above --notes/--no-notes
options instead.
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index d85e303..fa4bdb2 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -61,11 +61,11 @@ some output processing may assume ref names in UTF-8.
'@'::
'@' alone is a shortcut for 'HEAD'.
-'<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}'::
+'<refname>@{<date>}', e.g. 'master@\{yesterday\}', 'HEAD@{5 minutes ago}'::
A ref followed by the suffix '@' with a date specification
enclosed in a brace
- pair (e.g. '\{yesterday\}', '\{1 month 2 weeks 3 days 1 hour 1
- second ago\}' or '\{1979-02-26 18:30:00\}') specifies the value
+ pair (e.g. '\{yesterday\}', '{1 month 2 weeks 3 days 1 hour 1
+ second ago}' or '{1979-02-26 18:30:00}') specifies the value
of the ref at a prior point in time. This suffix may only be
used immediately following a ref name and the ref must have an
existing log ('$GIT_DIR/logs/<ref>'). Note that this looks up the state
@@ -73,7 +73,7 @@ some output processing may assume ref names in UTF-8.
'master' branch last week. If you want to look at commits made during
certain times, see '--since' and '--until'.
-'<refname>@\{<n>\}', e.g. 'master@\{1\}'::
+'<refname>@{<n>}', e.g. 'master@\{1\}'::
A ref followed by the suffix '@' with an ordinal specification
enclosed in a brace pair (e.g. '\{1\}', '\{15\}') specifies
the n-th prior value of that ref. For example 'master@\{1\}'
@@ -82,13 +82,13 @@ some output processing may assume ref names in UTF-8.
immediately following a ref name and the ref must have an existing
log ('$GIT_DIR/logs/<refname>').
-'@\{<n>\}', e.g. '@\{1\}'::
+'@{<n>}', e.g. '@\{1\}'::
You can use the '@' construct with an empty ref part to get at a
reflog entry of the current branch. For example, if you are on
branch 'blabla' then '@\{1\}' means the same as 'blabla@\{1\}'.
-'@\{-<n>\}', e.g. '@\{-1\}'::
- The construct '@\{-<n>\}' means the <n>th branch/commit checked out
+'@{-<n>}', e.g. '@{-1}'::
+ The construct '@{-<n>}' means the <n>th branch/commit checked out
before the current one.
'<branchname>@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::
@@ -139,7 +139,7 @@ from one location and push to another. In a non-triangular workflow,
'<rev>{caret}1{caret}1{caret}1'. See below for an illustration of
the usage of this form.
-'<rev>{caret}\{<type>\}', e.g. 'v0.99.8{caret}\{commit\}'::
+'<rev>{caret}{<type>}', e.g. 'v0.99.8{caret}\{commit\}'::
A suffix '{caret}' followed by an object type name enclosed in
brace pair means dereference the object at '<rev>' recursively until
an object of type '<type>' is found or the object cannot be
@@ -159,13 +159,13 @@ it does not have to be dereferenced even once to get to an object.
'rev{caret}\{tag\}' can be used to ensure that 'rev' identifies an
existing tag object.
-'<rev>{caret}\{\}', e.g. 'v0.99.8{caret}\{\}'::
+'<rev>{caret}{}', e.g. 'v0.99.8{caret}{}'::
A suffix '{caret}' followed by an empty brace pair
means the object could be a tag,
and dereference the tag recursively until a non-tag object is
found.
-'<rev>{caret}\{/<text>\}', e.g. 'HEAD^{/fix nasty bug}'::
+'<rev>{caret}{/<text>}', e.g. 'HEAD^{/fix nasty bug}'::
A suffix '{caret}' to a revision parameter, followed by a brace
pair that contains a text led by a slash,
is the same as the ':/fix nasty bug' syntax below except that
diff --git a/Documentation/technical/api-remote.txt b/Documentation/technical/api-remote.txt
index 2cfdd22..f10941b 100644
--- a/Documentation/technical/api-remote.txt
+++ b/Documentation/technical/api-remote.txt
@@ -51,6 +51,10 @@ struct remote
The proxy to use for curl (http, https, ftp, etc.) URLs.
+`http_proxy_authmethod`::
+
+ The method used for authenticating against `http_proxy`.
+
struct remotes can be found by name with remote_get(), and iterated
through with for_each_remote(). remote_get(NULL) will return the
default remote, given the current branch and configuration.
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 1c790ac..ec6bacf 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2125,8 +2125,37 @@ Allowing web browsing of a repository
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The gitweb cgi script provides users an easy way to browse your
-project's files and history without having to install Git; see the file
-gitweb/INSTALL in the Git source tree for instructions on setting it up.
+project's revisions, file contents and logs without having to install
+Git. Features like RSS/Atom feeds and blame/annotation details may
+optionally be enabled.
+
+The linkgit:git-instaweb[1] command provides a simple way to start
+browsing the repository using gitweb. The default server when using
+instaweb is lighttpd.
+
+See the file gitweb/INSTALL in the Git source tree and
+linkgit:gitweb[1] for instructions on details setting up a permament
+installation with a CGI or Perl capable server.
+
+[[how-to-get-a-git-repository-with-minimal-history]]
+How to get a Git repository with minimal history
+------------------------------------------------
+
+A <<def_shallow_clone,shallow clone>>, with its truncated
+history, is useful when one is interested only in recent history
+of a project and getting full history from the upstream is
+expensive.
+
+A <<def_shallow_clone,shallow clone>> is created by specifying
+the linkgit:git-clone[1] `--depth` switch. The depth can later be
+changed with the linkgit:git-fetch[1] `--depth` switch, or full
+history restored with `--unshallow`.
+
+Merging inside a <<def_shallow_clone,shallow clone>> will work as long
+as a merge base is in the recent history.
+Otherwise, it will be like merging unrelated histories and may
+have to result in huge conflicts. This limitation may make such
+a repository unsuitable to be used in merge based workflows.
[[sharing-development-examples]]
Examples
@@ -4636,23 +4665,15 @@ Scan email archives for other stuff left out
Scan man pages to see if any assume more background than this manual
provides.
-Simplify beginning by suggesting disconnected head instead of
-temporary branch creation?
-
Add more good examples. Entire sections of just cookbook examples
might be a good idea; maybe make an "advanced examples" section a
standard end-of-chapter section?
Include cross-references to the glossary, where appropriate.
-Document shallow clones? See draft 1.5.0 release notes for some
-documentation.
-
Add a section on working with other version control systems, including
CVS, Subversion, and just imports of series of release tarballs.
-More details on gitweb?
-
Write a chapter on using plumbing and writing scripts.
Alternates, clone -reference, etc.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4478007..5873f16 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.7.0-rc1
+DEF_VER=v2.7.0.GIT
LF='
'
diff --git a/Makefile b/Makefile
index fd19b54..fc2f1ab 100644
--- a/Makefile
+++ b/Makefile
@@ -2025,6 +2025,7 @@ $(VCSSVN_LIB): $(VCSSVN_OBJS)
export DEFAULT_EDITOR DEFAULT_PAGER
+.PHONY: doc man html info pdf
doc:
$(MAKE) -C Documentation all
@@ -2068,6 +2069,7 @@ po/git.pot: $(GENERATED_H) FORCE
$(LOCALIZED_PERL)
mv $@+ $@
+.PHONY: pot
pot: po/git.pot
POFILES := $(wildcard po/*.po)
@@ -2277,6 +2279,7 @@ mergetools_instdir_SQ = $(subst ','\'',$(mergetools_instdir))
install_bindir_programs := $(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X)) $(BINDIR_PROGRAMS_NO_X)
+.PHONY: profile-install profile-fast-install
profile-install: profile
$(MAKE) install
@@ -2343,6 +2346,8 @@ endif
done && \
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
+.PHONY: install-gitweb install-doc install-man install-html install-info install-pdf
+.PHONY: quick-install-doc quick-install-man quick-install-html
install-gitweb:
$(MAKE) -C gitweb install
@@ -2402,6 +2407,7 @@ rpm: dist
htmldocs = git-htmldocs-$(GIT_VERSION)
manpages = git-manpages-$(GIT_VERSION)
+.PHONY: dist-doc distclean
dist-doc:
$(RM) -r .doc-tmp-dir
mkdir .doc-tmp-dir
@@ -2470,6 +2476,8 @@ ALL_COMMANDS += git
ALL_COMMANDS += gitk
ALL_COMMANDS += gitweb
ALL_COMMANDS += git-gui git-citool
+
+.PHONY: check-docs
check-docs::
@(for v in $(ALL_COMMANDS); \
do \
@@ -2514,6 +2522,7 @@ check-builtins::
### Test suite coverage testing
#
.PHONY: coverage coverage-clean coverage-compile coverage-test coverage-report
+.PHONY: coverage-untested-functions cover_db cover_db_html
.PHONY: coverage-clean-results
coverage:
diff --git a/RelNotes b/RelNotes
index 3ba13ce..7db3040 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.7.0.txt \ No newline at end of file
+Documentation/RelNotes/2.8.0.txt \ No newline at end of file
diff --git a/bisect.c b/bisect.c
index 42aa7aa..06ec54e 100644
--- a/bisect.c
+++ b/bisect.c
@@ -440,7 +440,7 @@ static void read_bisect_paths(struct argv_array *array)
if (!fp)
die_errno("Could not open file '%s'", filename);
- while (strbuf_getline(&str, fp, '\n') != EOF) {
+ while (strbuf_getline_lf(&str, fp) != EOF) {
strbuf_trim(&str);
if (sq_dequote_to_argv_array(str.buf, array))
die("Badly quoted content in file '%s': %s",
@@ -668,7 +668,7 @@ static int is_expected_rev(const struct object_id *oid)
if (!fp)
return 0;
- if (strbuf_getline(&str, fp, '\n') != EOF)
+ if (strbuf_getline_lf(&str, fp) != EOF)
res = !strcmp(str.buf, oid_to_hex(oid));
strbuf_release(&str);
@@ -914,9 +914,9 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
strerror(errno));
}
} else {
- strbuf_getline(&str, fp, '\n');
+ strbuf_getline_lf(&str, fp);
*read_bad = strbuf_detach(&str, NULL);
- strbuf_getline(&str, fp, '\n');
+ strbuf_getline_lf(&str, fp);
*read_good = strbuf_detach(&str, NULL);
}
strbuf_release(&str);
diff --git a/builtin/am.c b/builtin/am.c
index 9fb42fd..259dc1c 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -46,21 +46,6 @@ static int is_empty_file(const char *filename)
}
/**
- * Like strbuf_getline(), but treats both '\n' and "\r\n" as line terminators.
- */
-static int strbuf_getline_crlf(struct strbuf *sb, FILE *fp)
-{
- if (strbuf_getwholeline(sb, fp, '\n'))
- return EOF;
- if (sb->buf[sb->len - 1] == '\n') {
- strbuf_setlen(sb, sb->len - 1);
- if (sb->len > 0 && sb->buf[sb->len - 1] == '\r')
- strbuf_setlen(sb, sb->len - 1);
- }
- return 0;
-}
-
-/**
* Returns the length of the first line of msg.
*/
static int linelen(const char *msg)
@@ -284,7 +269,7 @@ static char *read_shell_var(FILE *fp, const char *key)
struct strbuf sb = STRBUF_INIT;
const char *str;
- if (strbuf_getline(&sb, fp, '\n'))
+ if (strbuf_getline_lf(&sb, fp))
goto fail;
if (!skip_prefix(sb.buf, key, &str))
@@ -573,7 +558,7 @@ static int copy_notes_for_rebase(const struct am_state *state)
fp = xfopen(am_path(state, "rewritten"), "r");
- while (!strbuf_getline(&sb, fp, '\n')) {
+ while (!strbuf_getline_lf(&sb, fp)) {
unsigned char from_obj[GIT_SHA1_RAWSZ], to_obj[GIT_SHA1_RAWSZ];
if (sb.len != GIT_SHA1_HEXSZ * 2 + 1) {
@@ -628,7 +613,7 @@ static int is_mail(FILE *fp)
if (regcomp(&regex, header_regex, REG_NOSUB | REG_EXTENDED))
die("invalid pattern: %s", header_regex);
- while (!strbuf_getline_crlf(&sb, fp)) {
+ while (!strbuf_getline(&sb, fp)) {
if (!sb.len)
break; /* End of header */
@@ -675,7 +660,7 @@ static int detect_patch_format(const char **paths)
fp = xfopen(*paths, "r");
- while (!strbuf_getline_crlf(&l1, fp)) {
+ while (!strbuf_getline(&l1, fp)) {
if (l1.len)
break;
}
@@ -696,9 +681,9 @@ static int detect_patch_format(const char **paths)
}
strbuf_reset(&l2);
- strbuf_getline_crlf(&l2, fp);
+ strbuf_getline(&l2, fp);
strbuf_reset(&l3);
- strbuf_getline_crlf(&l3, fp);
+ strbuf_getline(&l3, fp);
/*
* If the second line is empty and the third is a From, Author or Date
@@ -817,7 +802,7 @@ static int stgit_patch_to_mail(FILE *out, FILE *in, int keep_cr)
struct strbuf sb = STRBUF_INIT;
int subject_printed = 0;
- while (!strbuf_getline(&sb, in, '\n')) {
+ while (!strbuf_getline_lf(&sb, in)) {
const char *str;
if (str_isspace(sb.buf))
@@ -875,7 +860,7 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
return error(_("could not open '%s' for reading: %s"), *paths,
strerror(errno));
- while (!strbuf_getline(&sb, fp, '\n')) {
+ while (!strbuf_getline_lf(&sb, fp)) {
if (*sb.buf == '#')
continue; /* skip comment lines */
@@ -900,7 +885,7 @@ static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
{
struct strbuf sb = STRBUF_INIT;
- while (!strbuf_getline(&sb, in, '\n')) {
+ while (!strbuf_getline_lf(&sb, in)) {
const char *str;
if (skip_prefix(sb.buf, "# User ", &str))
@@ -1317,7 +1302,7 @@ static int parse_mail(struct am_state *state, const char *mail)
/* Extract message and author information */
fp = xfopen(am_path(state, "info"), "r");
- while (!strbuf_getline(&sb, fp, '\n')) {
+ while (!strbuf_getline_lf(&sb, fp)) {
const char *x;
if (skip_prefix(sb.buf, "Subject: ", &x)) {
@@ -1383,7 +1368,7 @@ static int get_mail_commit_sha1(unsigned char *commit_id, const char *mail)
FILE *fp = xfopen(mail, "r");
const char *x;
- if (strbuf_getline(&sb, fp, '\n'))
+ if (strbuf_getline_lf(&sb, fp))
return -1;
if (!skip_prefix(sb.buf, "From ", &x))
@@ -1657,7 +1642,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
init_revisions(&rev_info, NULL);
rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;
- diff_opt_parse(&rev_info.diffopt, &diff_filter_str, 1);
+ diff_opt_parse(&rev_info.diffopt, &diff_filter_str, 1, rev_info.prefix);
add_pending_sha1(&rev_info, "HEAD", our_tree, 0);
diff_setup_done(&rev_info.diffopt);
run_diff_index(&rev_info, 1);
@@ -1939,6 +1924,7 @@ next:
*/
if (!state->rebasing) {
am_destroy(state);
+ close_all_packs();
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
}
}
diff --git a/builtin/blame.c b/builtin/blame.c
index 1df13cf..55bf5fa 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -28,6 +28,7 @@
#include "line-range.h"
#include "line-log.h"
#include "dir.h"
+#include "progress.h"
static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
@@ -50,6 +51,7 @@ static int incremental;
static int xdl_opts;
static int abbrev = -1;
static int no_whole_file_rename;
+static int show_progress;
static struct date_mode blame_date_mode = { DATE_ISO8601 };
static size_t blame_date_width;
@@ -127,6 +129,11 @@ struct origin {
char path[FLEX_ARRAY];
};
+struct progress_info {
+ struct progress *progress;
+ int blamed_lines;
+};
+
static int diff_hunks(mmfile_t *file_a, mmfile_t *file_b, long ctxlen,
xdl_emit_hunk_consume_func_t hunk_func, void *cb_data)
{
@@ -1746,7 +1753,8 @@ static int emit_one_suspect_detail(struct origin *suspect, int repeat)
* The blame_entry is found to be guilty for the range.
* Show it in incremental output.
*/
-static void found_guilty_entry(struct blame_entry *ent)
+static void found_guilty_entry(struct blame_entry *ent,
+ struct progress_info *pi)
{
if (incremental) {
struct origin *suspect = ent->suspect;
@@ -1758,6 +1766,8 @@ static void found_guilty_entry(struct blame_entry *ent)
write_filename_info(suspect->path);
maybe_flush_or_die(stdout, "stdout");
}
+ pi->blamed_lines += ent->num_lines;
+ display_progress(pi->progress, pi->blamed_lines);
}
/*
@@ -1768,6 +1778,11 @@ static void assign_blame(struct scoreboard *sb, int opt)
{
struct rev_info *revs = sb->revs;
struct commit *commit = prio_queue_get(&sb->commits);
+ struct progress_info pi = { NULL, 0 };
+
+ if (show_progress)
+ pi.progress = start_progress_delay(_("Blaming lines"),
+ sb->num_lines, 50, 1);
while (commit) {
struct blame_entry *ent;
@@ -1809,7 +1824,7 @@ static void assign_blame(struct scoreboard *sb, int opt)
suspect->guilty = 1;
for (;;) {
struct blame_entry *next = ent->next;
- found_guilty_entry(ent);
+ found_guilty_entry(ent, &pi);
if (next) {
ent = next;
continue;
@@ -1825,6 +1840,8 @@ static void assign_blame(struct scoreboard *sb, int opt)
if (DEBUG) /* sanity */
sanity_check_refcnt(sb);
}
+
+ stop_progress(&pi.progress);
}
static const char *format_time(unsigned long time, const char *tz_str,
@@ -2392,11 +2409,6 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
ce->ce_mode = create_ce_mode(mode);
add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
- /*
- * We are not going to write this out, so this does not matter
- * right now, but someday we might optimize diff-index --cached
- * with cache-tree information.
- */
cache_tree_invalidate_path(&the_index, path);
return commit;
@@ -2520,6 +2532,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
OPT_BOOL('b', NULL, &blank_boundary, N_("Show blank SHA-1 for boundary commits (Default: off)")),
OPT_BOOL(0, "root", &show_root, N_("Do not treat root commits as boundaries (Default: off)")),
OPT_BOOL(0, "show-stats", &show_stats, N_("Show work cost statistics")),
+ OPT_BOOL(0, "progress", &show_progress, N_("Force progress reporting")),
OPT_BIT(0, "score-debug", &output_option, N_("Show output score for blame entries"), OUTPUT_SHOW_SCORE),
OPT_BIT('f', "show-name", &output_option, N_("Show original filename (Default: auto)"), OUTPUT_SHOW_NAME),
OPT_BIT('n', "show-number", &output_option, N_("Show original linenumber (Default: off)"), OUTPUT_SHOW_NUMBER),
@@ -2555,6 +2568,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
save_commit_buffer = 0;
dashdash_pos = 0;
+ show_progress = -1;
parse_options_start(&ctx, argc, argv, prefix, options,
PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
@@ -2579,6 +2593,13 @@ parse_done:
DIFF_OPT_CLR(&revs.diffopt, FOLLOW_RENAMES);
argc = parse_options_end(&ctx);
+ if (incremental || (output_option & OUTPUT_PORCELAIN)) {
+ if (show_progress > 0)
+ die("--progress can't be used with --incremental or porcelain formats");
+ show_progress = 0;
+ } else if (show_progress < 0)
+ show_progress = isatty(2);
+
if (0 < abbrev)
/* one more abbrev length is needed for the boundary commit */
abbrev++;
@@ -2828,11 +2849,11 @@ parse_done:
read_mailmap(&mailmap, NULL);
+ assign_blame(&sb, opt);
+
if (!incremental)
setup_pager();
- assign_blame(&sb, opt);
-
free(final_commit_name);
if (incremental)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index c0fd8db..54db118 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -401,7 +401,7 @@ static int batch_objects(struct batch_options *opt)
save_warning = warn_on_object_refname_ambiguity;
warn_on_object_refname_ambiguity = 0;
- while (strbuf_getline(&buf, stdin, '\n') != EOF) {
+ while (strbuf_getline(&buf, stdin) != EOF) {
if (data.split_on_whitespace) {
/*
* Split at first whitespace, tying off the beginning
diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index 265c9ba..087325e 100644
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -73,12 +73,13 @@ static void check_attr_stdin_paths(const char *prefix, int cnt,
struct git_attr_check *check)
{
struct strbuf buf, nbuf;
- int line_termination = nul_term_line ? 0 : '\n';
+ strbuf_getline_fn getline_fn;
+ getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
strbuf_init(&buf, 0);
strbuf_init(&nbuf, 0);
- while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
- if (line_termination && buf.buf[0] == '"') {
+ while (getline_fn(&buf, stdin) != EOF) {
+ if (!nul_term_line && buf.buf[0] == '"') {
strbuf_reset(&nbuf);
if (unquote_c_style(&nbuf, buf.buf, NULL))
die("line is badly quoted");
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c
index 43f3617..4f0b09e 100644
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@ -117,13 +117,14 @@ static int check_ignore_stdin_paths(struct dir_struct *dir, const char *prefix)
{
struct strbuf buf, nbuf;
char *pathspec[2] = { NULL, NULL };
- int line_termination = nul_term_line ? 0 : '\n';
+ strbuf_getline_fn getline_fn;
int num_ignored = 0;
+ getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
strbuf_init(&buf, 0);
strbuf_init(&nbuf, 0);
- while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
- if (line_termination && buf.buf[0] == '"') {
+ while (getline_fn(&buf, stdin) != EOF) {
+ if (!nul_term_line && buf.buf[0] == '"') {
strbuf_reset(&nbuf);
if (unquote_c_style(&nbuf, buf.buf, NULL))
die("line is badly quoted");
diff --git a/builtin/check-mailmap.c b/builtin/check-mailmap.c
index eaaea54..cf0f54f 100644
--- a/builtin/check-mailmap.c
+++ b/builtin/check-mailmap.c
@@ -54,7 +54,7 @@ int cmd_check_mailmap(int argc, const char **argv, const char *prefix)
if (use_stdin) {
struct strbuf buf = STRBUF_INIT;
- while (strbuf_getline(&buf, stdin, '\n') != EOF) {
+ while (strbuf_getline_lf(&buf, stdin) != EOF) {
check_mailmap(&mailmap, buf.buf);
maybe_flush_or_die(stdout, "stdout");
}
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 8028c37..ed888a5 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -11,7 +11,7 @@
#include "parse-options.h"
#define CHECKOUT_ALL 4
-static int line_termination = '\n';
+static int nul_term_line;
static int checkout_stage; /* default to checkout stage0 */
static int to_tempfile;
static char topath[4][TEMPORARY_FILENAME_LENGTH + 1];
@@ -35,7 +35,8 @@ static void write_tempfile_record(const char *name, const char *prefix)
fputs(topath[checkout_stage], stdout);
putchar('\t');
- write_name_quoted_relative(name, prefix, stdout, line_termination);
+ write_name_quoted_relative(name, prefix, stdout,
+ nul_term_line ? '\0' : '\n');
for (i = 0; i < 4; i++) {
topath[i][0] = 0;
@@ -144,10 +145,7 @@ static int option_parse_u(const struct option *opt,
static int option_parse_z(const struct option *opt,
const char *arg, int unset)
{
- if (unset)
- line_termination = '\n';
- else
- line_termination = 0;
+ nul_term_line = !unset;
return 0;
}
@@ -254,13 +252,15 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
if (read_from_stdin) {
struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
+ strbuf_getline_fn getline_fn;
if (all)
die("git checkout-index: don't mix '--all' and '--stdin'");
- while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
+ getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
+ while (getline_fn(&buf, stdin) != EOF) {
char *p;
- if (line_termination && buf.buf[0] == '"') {
+ if (!nul_term_line && buf.buf[0] == '"') {
strbuf_reset(&nbuf);
if (unquote_c_style(&nbuf, buf.buf, NULL))
die("line is badly quoted");
diff --git a/builtin/checkout.c b/builtin/checkout.c
index e8110a9..5af84a3 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -661,7 +661,8 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
describe_detached_head(_("HEAD is now at"), new->commit);
}
} else if (new->path) { /* Switch branches. */
- create_symref("HEAD", new->path, msg.buf);
+ if (create_symref("HEAD", new->path, msg.buf) < 0)
+ die("unable to update HEAD");
if (!opts->quiet) {
if (old->path && !strcmp(new->path, old->path)) {
if (opts->new_branch_force)
diff --git a/builtin/clean.c b/builtin/clean.c
index d7acb94..7b08237 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -147,30 +147,6 @@ static int exclude_cb(const struct option *opt, const char *arg, int unset)
return 0;
}
-/*
- * Return 1 if the given path is the root of a git repository or
- * submodule else 0. Will not return 1 for bare repositories with the
- * exception of creating a bare repository in "foo/.git" and calling
- * is_git_repository("foo").
- */
-static int is_git_repository(struct strbuf *path)
-{
- int ret = 0;
- int gitfile_error;
- size_t orig_path_len = path->len;
- assert(orig_path_len != 0);
- strbuf_complete(path, '/');
- strbuf_addstr(path, ".git");
- if (read_gitfile_gently(path->buf, &gitfile_error) || is_git_directory(path->buf))
- ret = 1;
- if (gitfile_error == READ_GITFILE_ERR_OPEN_FAILED ||
- gitfile_error == READ_GITFILE_ERR_READ_FAILED)
- ret = 1; /* This could be a real .git file, take the
- * safe option and avoid cleaning */
- strbuf_setlen(path, orig_path_len);
- return ret;
-}
-
static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
int dry_run, int quiet, int *dir_gone)
{
@@ -182,7 +158,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
*dir_gone = 1;
- if ((force_flag & REMOVE_DIR_KEEP_NESTED_GIT) && is_git_repository(path)) {
+ if ((force_flag & REMOVE_DIR_KEEP_NESTED_GIT) && is_nonbare_repository_dir(path)) {
if (!quiet) {
quote_path_relative(path->buf, prefix, &quoted);
printf(dry_run ? _(msg_would_skip_git_dir) : _(msg_skip_git_dir),
@@ -594,7 +570,7 @@ static int *list_and_choose(struct menu_opts *opts, struct menu_stuff *stuff)
clean_get_color(CLEAN_COLOR_RESET));
}
- if (strbuf_getline(&choice, stdin, '\n') != EOF) {
+ if (strbuf_getline_lf(&choice, stdin) != EOF) {
strbuf_trim(&choice);
} else {
eof = 1;
@@ -676,7 +652,7 @@ static int filter_by_patterns_cmd(void)
clean_print_color(CLEAN_COLOR_PROMPT);
printf(_("Input ignore patterns>> "));
clean_print_color(CLEAN_COLOR_RESET);
- if (strbuf_getline(&confirm, stdin, '\n') != EOF)
+ if (strbuf_getline_lf(&confirm, stdin) != EOF)
strbuf_trim(&confirm);
else
putchar('\n');
@@ -774,7 +750,7 @@ static int ask_each_cmd(void)
qname = quote_path_relative(item->string, NULL, &buf);
/* TRANSLATORS: Make sure to keep [y/N] as is */
printf(_("Remove %s [y/N]? "), qname);
- if (strbuf_getline(&confirm, stdin, '\n') != EOF) {
+ if (strbuf_getline_lf(&confirm, stdin) != EOF) {
strbuf_trim(&confirm);
} else {
putchar('\n');
diff --git a/builtin/clone.c b/builtin/clone.c
index a0b3cd9..bcba080 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -339,7 +339,7 @@ static void copy_alternates(struct strbuf *src, struct strbuf *dst,
FILE *in = fopen(src->buf, "r");
struct strbuf line = STRBUF_INIT;
- while (strbuf_getline(&line, in, '\n') != EOF) {
+ while (strbuf_getline(&line, in) != EOF) {
char *abs_path;
if (!line.len || line.buf[0] == '#')
continue;
@@ -636,9 +636,11 @@ static void update_remote_refs(const struct ref *refs,
struct strbuf head_ref = STRBUF_INIT;
strbuf_addstr(&head_ref, branch_top);
strbuf_addstr(&head_ref, "HEAD");
- create_symref(head_ref.buf,
- remote_head_points_at->peer_ref->name,
- msg);
+ if (create_symref(head_ref.buf,
+ remote_head_points_at->peer_ref->name,
+ msg) < 0)
+ die("unable to update %s", head_ref.buf);
+ strbuf_release(&head_ref);
}
}
@@ -648,7 +650,8 @@ static void update_head(const struct ref *our, const struct ref *remote,
const char *head;
if (our && skip_prefix(our->name, "refs/heads/", &head)) {
/* Local default branch link */
- create_symref("HEAD", our->name, NULL);
+ if (create_symref("HEAD", our->name, NULL) < 0)
+ die("unable to update HEAD");
if (!option_bare) {
update_ref(msg, "HEAD", our->old_oid.hash, NULL, 0,
UPDATE_REFS_DIE_ON_ERR);
diff --git a/builtin/column.c b/builtin/column.c
index 449413c..33314b4 100644
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -51,7 +51,7 @@ int cmd_column(int argc, const char **argv, const char *prefix)
die(_("--command must be the first argument"));
}
finalize_colopts(&colopts, -1);
- while (!strbuf_getline(&sb, stdin, '\n'))
+ while (!strbuf_getline(&sb, stdin))
string_list_append(&list, sb.buf);
print_columns(&list, colopts, &copts);
diff --git a/builtin/commit.c b/builtin/commit.c
index d054f84..b3bd2d4 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -761,7 +761,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
hook_arg2 = "";
}
- s->fp = fopen(git_path(commit_editmsg), "w");
+ s->fp = fopen_for_writing(git_path(commit_editmsg));
if (s->fp == NULL)
die_errno(_("could not open '%s'"), git_path(commit_editmsg));
@@ -1690,7 +1690,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
if (fp == NULL)
die_errno(_("could not open '%s' for reading"),
git_path_merge_head());
- while (strbuf_getline(&m, fp, '\n') != EOF) {
+ while (strbuf_getline_lf(&m, fp) != EOF) {
struct commit *parent;
parent = get_merge_parent(m.buf);
diff --git a/builtin/diff.c b/builtin/diff.c
index ed0acca..52c98a9 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -341,7 +341,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
}
if (no_index)
/* If this is a no-index diff, just run it and exit there. */
- diff_no_index(&rev, argc, argv, prefix);
+ diff_no_index(&rev, argc, argv);
/* Otherwise, we are doing the usual "git" diff */
rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d9ac5d8..2471297 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -880,7 +880,7 @@ static void export_marks(char *file)
FILE *f;
int e = 0;
- f = fopen(file, "w");
+ f = fopen_for_writing(file);
if (!f)
die_errno("Unable to open marks file %s for writing.", file);
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index cf3019e..9b2a514 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -158,7 +158,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
else {
/* read from stdin one ref per line, until EOF */
struct strbuf line = STRBUF_INIT;
- while (strbuf_getline(&line, stdin, '\n') != EOF)
+ while (strbuf_getline_lf(&line, stdin) != EOF)
add_sought_entry(&sought, &nr_sought, &alloc_sought, line.buf);
strbuf_release(&line);
}
diff --git a/builtin/fetch.c b/builtin/fetch.c
index c85f347..8e74213 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -37,6 +37,7 @@ static int prune = -1; /* unspecified */
static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity;
static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
static int tags = TAGS_DEFAULT, unshallow, update_shallow;
+static int max_children = 1;
static const char *depth;
static const char *upload_pack;
static struct strbuf default_rla = STRBUF_INIT;
@@ -99,6 +100,8 @@ static struct option builtin_fetch_options[] = {
N_("fetch all tags and associated objects"), TAGS_SET),
OPT_SET_INT('n', NULL, &tags,
N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
+ OPT_INTEGER('j', "jobs", &max_children,
+ N_("number of submodules fetched in parallel")),
OPT_BOOL('p', "prune", &prune,
N_("prune remote-tracking branches no longer on remote")),
{ OPTION_CALLBACK, 0, "recurse-submodules", NULL, N_("on-demand"),
@@ -837,7 +840,7 @@ static void check_not_current_branch(struct ref *ref_map)
static int truncate_fetch_head(void)
{
const char *filename = git_path_fetch_head();
- FILE *fp = fopen(filename, "w");
+ FILE *fp = fopen_for_writing(filename);
if (!fp)
return error(_("cannot open %s: %s\n"), filename, strerror(errno));
@@ -1213,7 +1216,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
result = fetch_populated_submodules(&options,
submodule_prefix,
recurse_submodules,
- verbosity < 0);
+ verbosity < 0,
+ max_children);
argv_array_clear(&options);
}
@@ -1221,6 +1225,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
list.strdup_strings = 1;
string_list_clear(&list, 0);
+ close_all_packs();
+
argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
if (verbosity < 0)
argv_array_push(&argv_gc_auto, "--quiet");
diff --git a/builtin/grep.c b/builtin/grep.c
index 4229cae..8c516a9 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -24,11 +24,11 @@ static char const * const grep_usage[] = {
NULL
};
-static int use_threads = 1;
+#define GREP_NUM_THREADS_DEFAULT 8
+static int num_threads;
#ifndef NO_PTHREADS
-#define THREADS 8
-static pthread_t threads[THREADS];
+static pthread_t *threads;
/* We use one producer thread and THREADS consumer
* threads. The producer adds struct work_items to 'todo' and the
@@ -63,13 +63,13 @@ static pthread_mutex_t grep_mutex;
static inline void grep_lock(void)
{
- if (use_threads)
+ if (num_threads)
pthread_mutex_lock(&grep_mutex);
}
static inline void grep_unlock(void)
{
- if (use_threads)
+ if (num_threads)
pthread_mutex_unlock(&grep_mutex);
}
@@ -206,7 +206,8 @@ static void start_threads(struct grep_opt *opt)
strbuf_init(&todo[i].out, 0);
}
- for (i = 0; i < ARRAY_SIZE(threads); i++) {
+ threads = xcalloc(num_threads, sizeof(*threads));
+ for (i = 0; i < num_threads; i++) {
int err;
struct grep_opt *o = grep_opt_dup(opt);
o->output = strbuf_out;
@@ -238,12 +239,14 @@ static int wait_all(void)
pthread_cond_broadcast(&cond_add);
grep_unlock();
- for (i = 0; i < ARRAY_SIZE(threads); i++) {
+ for (i = 0; i < num_threads; i++) {
void *h;
pthread_join(threads[i], &h);
hit |= (int) (intptr_t) h;
}
+ free(threads);
+
pthread_mutex_destroy(&grep_mutex);
pthread_mutex_destroy(&grep_read_mutex);
pthread_mutex_destroy(&grep_attr_mutex);
@@ -267,6 +270,14 @@ static int grep_cmd_config(const char *var, const char *value, void *cb)
int st = grep_config(var, value, cb);
if (git_color_default_config(var, value, cb) < 0)
st = -1;
+
+ if (!strcmp(var, "grep.threads")) {
+ num_threads = git_config_int(var, value);
+ if (num_threads < 0)
+ die(_("invalid number of threads specified (%d) for %s"),
+ num_threads, var);
+ }
+
return st;
}
@@ -294,7 +305,7 @@ static int grep_sha1(struct grep_opt *opt, const unsigned char *sha1,
}
#ifndef NO_PTHREADS
- if (use_threads) {
+ if (num_threads) {
add_work(opt, GREP_SOURCE_SHA1, pathbuf.buf, path, sha1);
strbuf_release(&pathbuf);
return 0;
@@ -323,7 +334,7 @@ static int grep_file(struct grep_opt *opt, const char *filename)
strbuf_addstr(&buf, filename);
#ifndef NO_PTHREADS
- if (use_threads) {
+ if (num_threads) {
add_work(opt, GREP_SOURCE_FILE, buf.buf, filename, filename);
strbuf_release(&buf);
return 0;
@@ -375,7 +386,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int
for (nr = 0; nr < active_nr; nr++) {
const struct cache_entry *ce = active_cache[nr];
- if (!S_ISREG(ce->ce_mode))
+ if (!S_ISREG(ce->ce_mode) || ce_intent_to_add(ce))
continue;
if (!ce_path_match(ce, pathspec, NULL))
continue;
@@ -562,7 +573,7 @@ static int file_callback(const struct option *opt, const char *arg, int unset)
patterns = from_stdin ? stdin : fopen(arg, "r");
if (!patterns)
die_errno(_("cannot open '%s'"), arg);
- while (strbuf_getline(&sb, patterns, '\n') == 0) {
+ while (strbuf_getline(&sb, patterns) == 0) {
/* ignore empty line like grep does */
if (sb.len == 0)
continue;
@@ -697,6 +708,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
N_("show <n> context lines before matches")),
OPT_INTEGER('A', "after-context", &opt.post_context,
N_("show <n> context lines after matches")),
+ OPT_INTEGER(0, "threads", &num_threads,
+ N_("use <n> worker threads")),
OPT_NUMBER_CALLBACK(&opt, N_("shortcut for -C NUM"),
context_callback),
OPT_BOOL('p', "show-function", &opt.funcname,
@@ -755,9 +768,15 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
PARSE_OPT_STOP_AT_NON_OPTION);
grep_commit_pattern_type(pattern_type_arg, &opt);
- if (use_index && !startup_info->have_repository)
- /* die the same way as if we did it at the beginning */
- setup_git_directory();
+ if (use_index && !startup_info->have_repository) {
+ int fallback = 0;
+ git_config_get_bool("grep.fallbacktonoindex", &fallback);
+ if (fallback)
+ use_index = 0;
+ else
+ /* die the same way as if we did it at the beginning */
+ setup_git_directory();
+ }
/*
* skip a -- separator; we know it cannot be
@@ -786,7 +805,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
opt.output_priv = &path_list;
opt.output = append_path;
string_list_append(&path_list, show_in_pager);
- use_threads = 0;
}
if (!opt.pattern_list)
@@ -817,14 +835,18 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
}
#ifndef NO_PTHREADS
- if (list.nr || cached || online_cpus() == 1)
- use_threads = 0;
+ if (list.nr || cached || show_in_pager)
+ num_threads = 0;
+ else if (num_threads == 0)
+ num_threads = GREP_NUM_THREADS_DEFAULT;
+ else if (num_threads < 0)
+ die(_("invalid number of threads specified (%d)"), num_threads);
#else
- use_threads = 0;
+ num_threads = 0;
#endif
#ifndef NO_PTHREADS
- if (use_threads) {
+ if (num_threads) {
if (!(opt.name_only || opt.unmatch_name_only || opt.count)
&& (opt.pre_context || opt.post_context ||
opt.file_break || opt.funcbody))
@@ -894,7 +916,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
hit = grep_objects(&opt, &pathspec, &list);
}
- if (use_threads)
+ if (num_threads)
hit |= wait_all();
if (hit && show_in_pager)
run_pager(&opt, prefix);
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 43b098b..ff20395 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -60,7 +60,7 @@ static void hash_stdin_paths(const char *type, int no_filters, unsigned flags,
{
struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
- while (strbuf_getline(&buf, stdin, '\n') != EOF) {
+ while (strbuf_getline(&buf, stdin) != EOF) {
if (buf.buf[0] == '"') {
strbuf_reset(&nbuf);
if (unquote_c_style(&nbuf, buf.buf, NULL))
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index 46838d2..b99ae4b 100644
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -12,16 +12,18 @@
#include "trailer.h"
static const char * const git_interpret_trailers_usage[] = {
- N_("git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]"),
+ N_("git interpret-trailers [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]"),
NULL
};
int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
{
+ int in_place = 0;
int trim_empty = 0;
struct string_list trailers = STRING_LIST_INIT_DUP;
struct option options[] = {
+ OPT_BOOL(0, "in-place", &in_place, N_("edit files in place")),
OPT_BOOL(0, "trim-empty", &trim_empty, N_("trim empty trailers")),
OPT_STRING_LIST(0, "trailer", &trailers, N_("trailer"),
N_("trailer(s) to add")),
@@ -34,9 +36,12 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
if (argc) {
int i;
for (i = 0; i < argc; i++)
- process_trailers(argv[i], trim_empty, &trailers);
- } else
- process_trailers(NULL, trim_empty, &trailers);
+ process_trailers(argv[i], in_place, trim_empty, &trailers);
+ } else {
+ if (in_place)
+ die(_("no input file given for in-place editing"));
+ process_trailers(NULL, in_place, trim_empty, &trailers);
+ }
string_list_clear(&trailers, 0);
diff --git a/builtin/log.c b/builtin/log.c
index 069bd3a..0d738d6 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -699,6 +699,7 @@ static int do_signoff;
static const char *signature = git_version_string;
static const char *signature_file;
static int config_cover_letter;
+static const char *config_output_directory;
enum {
COVER_UNSET,
@@ -777,6 +778,8 @@ static int git_format_config(const char *var, const char *value, void *cb)
config_cover_letter = git_config_bool(var, value) ? COVER_ON : COVER_OFF;
return 0;
}
+ if (!strcmp(var, "format.outputdirectory"))
+ return git_config_string(&config_output_directory, var, value);
return git_log_config(var, value, cb);
}
@@ -1196,6 +1199,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
int cover_letter = -1;
int boundary_count = 0;
int no_binary_diff = 0;
+ int zero_commit = 0;
struct commit *origin = NULL;
const char *in_reply_to = NULL;
struct patch_ids ids;
@@ -1236,6 +1240,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback },
OPT_BOOL(0, "no-binary", &no_binary_diff,
N_("don't output binary diffs")),
+ OPT_BOOL(0, "zero-commit", &zero_commit,
+ N_("output all-zero hash in From header")),
OPT_BOOL(0, "ignore-if-in-upstream", &ignore_if_in_upstream,
N_("don't include a patch matching a commit upstream")),
{ OPTION_SET_INT, 'p', "no-stat", &use_patch_format, NULL,
@@ -1380,12 +1386,17 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
/* Always generate a patch */
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
+ rev.zero_commit = zero_commit;
+
if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff)
DIFF_OPT_SET(&rev.diffopt, BINARY);
if (rev.show_notes)
init_display_notes(&rev.notes_opt);
+ if (!output_directory && !use_stdout)
+ output_directory = config_output_directory;
+
if (!use_stdout)
output_directory = set_outdir(prefix, output_directory);
else
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index b6a7cb0..dedf02d 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -27,6 +27,7 @@ static int show_killed;
static int show_valid_bit;
static int line_terminator = '\n';
static int debug_mode;
+static int show_eol;
static const char *prefix;
static int max_prefix_len;
@@ -47,6 +48,23 @@ static const char *tag_modified = "";
static const char *tag_skip_worktree = "";
static const char *tag_resolve_undo = "";
+static void write_eolinfo(const struct cache_entry *ce, const char *path)
+{
+ if (!show_eol)
+ return;
+ else {
+ struct stat st;
+ const char *i_txt = "";
+ const char *w_txt = "";
+ const char *a_txt = get_convert_attr_ascii(path);
+ if (ce && S_ISREG(ce->ce_mode))
+ i_txt = get_cached_convert_stats_ascii(ce->name);
+ if (!lstat(path, &st) && S_ISREG(st.st_mode))
+ w_txt = get_wt_convert_stats_ascii(path);
+ printf("i/%-5s w/%-5s attr/%-17s\t", i_txt, w_txt, a_txt);
+ }
+}
+
static void write_name(const char *name)
{
/*
@@ -68,6 +86,7 @@ static void show_dir_entry(const char *tag, struct dir_entry *ent)
return;
fputs(tag, stdout);
+ write_eolinfo(NULL, ent->name);
write_name(ent->name);
}
@@ -170,6 +189,7 @@ static void show_ce_entry(const char *tag, const struct cache_entry *ce)
find_unique_abbrev(ce->sha1,abbrev),
ce_stage(ce));
}
+ write_eolinfo(ce, ce->name);
write_name(ce->name);
if (debug_mode) {
const struct stat_data *sd = &ce->ce_stat_data;
@@ -433,6 +453,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
OPT_BIT(0, "directory", &dir.flags,
N_("show 'other' directories' names only"),
DIR_SHOW_OTHER_DIRECTORIES),
+ OPT_BOOL(0, "eol", &show_eol, N_("show line endings of files")),
OPT_NEGBIT(0, "empty-directory", &dir.flags,
N_("don't show empty directories"),
DIR_HIDE_EMPTY_DIRECTORIES),
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index fa65a84..66cdd45 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -3,9 +3,12 @@
#include "transport.h"
#include "remote.h"
-static const char ls_remote_usage[] =
-"git ls-remote [--heads] [--tags] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url] [<repository> [<refs>...]]";
+static const char * const ls_remote_usage[] = {
+ N_("git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+ " [-q | --quiet] [--exit-code] [--get-url]\n"
+ " [--symref] [<repository> [<refs>...]]"),
+ NULL
+};
/*
* Is there one among the list of patterns that match the tail part
@@ -30,12 +33,12 @@ static int tail_match(const char **pattern, const char *path)
int cmd_ls_remote(int argc, const char **argv, const char *prefix)
{
- int i;
const char *dest = NULL;
unsigned flags = 0;
int get_url = 0;
int quiet = 0;
int status = 0;
+ int show_symref_target = 0;
const char *uploadpack = NULL;
const char **pattern = NULL;
@@ -43,59 +46,36 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
struct transport *transport;
const struct ref *ref;
- if (argc == 2 && !strcmp("-h", argv[1]))
- usage(ls_remote_usage);
+ struct option options[] = {
+ OPT__QUIET(&quiet, N_("do not print remote URL")),
+ OPT_STRING(0, "upload-pack", &uploadpack, N_("exec"),
+ N_("path of git-upload-pack on the remote host")),
+ { OPTION_STRING, 0, "exec", &uploadpack, N_("exec"),
+ N_("path of git-upload-pack on the remote host"),
+ PARSE_OPT_HIDDEN },
+ OPT_BIT('t', "tags", &flags, N_("limit to tags"), REF_TAGS),
+ OPT_BIT('h', "heads", &flags, N_("limit to heads"), REF_HEADS),
+ OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL),
+ OPT_BOOL(0, "get-url", &get_url,
+ N_("take url.<base>.insteadOf into account")),
+ OPT_SET_INT(0, "exit-code", &status,
+ N_("exit with exit code 2 if no matching refs are found"), 2),
+ OPT_BOOL(0, "symref", &show_symref_target,
+ N_("show underlying ref in addition to the object pointed by it")),
+ OPT_END()
+ };
- for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
+ argc = parse_options(argc, argv, prefix, options, ls_remote_usage,
+ PARSE_OPT_STOP_AT_NON_OPTION);
+ dest = argv[0];
- if (*arg == '-') {
- if (starts_with(arg, "--upload-pack=")) {
- uploadpack = arg + 14;
- continue;
- }
- if (starts_with(arg, "--exec=")) {
- uploadpack = arg + 7;
- continue;
- }
- if (!strcmp("--tags", arg) || !strcmp("-t", arg)) {
- flags |= REF_TAGS;
- continue;
- }
- if (!strcmp("--heads", arg) || !strcmp("-h", arg)) {
- flags |= REF_HEADS;
- continue;
- }
- if (!strcmp("--refs", arg)) {
- flags |= REF_NORMAL;
- continue;
- }
- if (!strcmp("--quiet", arg) || !strcmp("-q", arg)) {
- quiet = 1;
- continue;
- }
- if (!strcmp("--get-url", arg)) {
- get_url = 1;
- continue;
- }
- if (!strcmp("--exit-code", arg)) {
- /* return this code if no refs are reported */
- status = 2;
- continue;
- }
- usage(ls_remote_usage);
- }
- dest = arg;
- i++;
- break;
+ if (argc > 1) {
+ int i;
+ pattern = xcalloc(argc, sizeof(const char *));
+ for (i = 1; i < argc; i++)
+ pattern[i - 1] = xstrfmt("*/%s", argv[i]);
}
- if (argv[i]) {
- int j;
- pattern = xcalloc(argc - i + 1, sizeof(const char *));
- for (j = i; j < argc; j++)
- pattern[j - i] = xstrfmt("*/%s", argv[j]);
- }
remote = remote_get(dest);
if (!remote) {
if (dest)
@@ -125,7 +105,9 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
continue;
if (!tail_match(pattern, ref->name))
continue;
- printf("%s %s\n", oid_to_hex(&ref->old_oid), ref->name);
+ if (show_symref_target && ref->symref)
+ printf("ref: %s\t%s\n", ref->symref, ref->name);
+ printf("%s\t%s\n", oid_to_hex(&ref->old_oid), ref->name);
status = 0; /* we found something */
}
return status;
diff --git a/builtin/merge.c b/builtin/merge.c
index 15bf95b..b98a348 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -404,6 +404,7 @@ static void finish(struct commit *head_commit,
* We ignore errors in 'gc --auto', since the
* user should see them.
*/
+ close_all_packs();
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
}
}
diff --git a/builtin/mktree.c b/builtin/mktree.c
index a964d6b..a237caa 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -65,7 +65,7 @@ static const char *mktree_usage[] = {
NULL
};
-static void mktree_line(char *buf, size_t len, int line_termination, int allow_missing)
+static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_missing)
{
char *ptr, *ntr;
unsigned mode;
@@ -97,7 +97,7 @@ static void mktree_line(char *buf, size_t len, int line_termination, int allow_m
*ntr++ = 0; /* now at the beginning of SHA1 */
path = ntr + 41; /* at the beginning of name */
- if (line_termination && path[0] == '"') {
+ if (!nul_term_line && path[0] == '"') {
struct strbuf p_uq = STRBUF_INIT;
if (unquote_c_style(&p_uq, path, NULL))
die("invalid quoting");
@@ -141,23 +141,25 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
{
struct strbuf sb = STRBUF_INIT;
unsigned char sha1[20];
- int line_termination = '\n';
+ int nul_term_line = 0;
int allow_missing = 0;
int is_batch_mode = 0;
int got_eof = 0;
+ strbuf_getline_fn getline_fn;
const struct option option[] = {
- OPT_SET_INT('z', NULL, &line_termination, N_("input is NUL terminated"), '\0'),
+ OPT_BOOL('z', NULL, &nul_term_line, N_("input is NUL terminated")),
OPT_SET_INT( 0 , "missing", &allow_missing, N_("allow missing objects"), 1),
OPT_SET_INT( 0 , "batch", &is_batch_mode, N_("allow creation of more than one tree"), 1),
OPT_END()
};
ac = parse_options(ac, av, prefix, option, mktree_usage, 0);
+ getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
while (!got_eof) {
while (1) {
- if (strbuf_getline(&sb, stdin, line_termination) == EOF) {
+ if (getline_fn(&sb, stdin) == EOF) {
got_eof = 1;
break;
}
@@ -167,7 +169,7 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
break;
die("input format error: (blank line only valid in batch mode)");
}
- mktree_line(sb.buf, sb.len, line_termination, allow_missing);
+ mktree_line(sb.buf, sb.len, nul_term_line, allow_missing);
}
if (is_batch_mode && got_eof && used < 1) {
/*
diff --git a/builtin/notes.c b/builtin/notes.c
index 52aa9af..ed6f222 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -286,11 +286,11 @@ static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
if (!c)
return 0;
} else {
- init_notes(NULL, NULL, NULL, 0);
+ init_notes(NULL, NULL, NULL, NOTES_INIT_WRITABLE);
t = &default_notes_tree;
}
- while (strbuf_getline(&buf, stdin, '\n') != EOF) {
+ while (strbuf_getline_lf(&buf, stdin) != EOF) {
unsigned char from_obj[20], to_obj[20];
struct strbuf **split;
int err;
@@ -329,15 +329,18 @@ static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
return ret;
}
-static struct notes_tree *init_notes_check(const char *subcommand)
+static struct notes_tree *init_notes_check(const char *subcommand,
+ int flags)
{
struct notes_tree *t;
- init_notes(NULL, NULL, NULL, 0);
+ const char *ref;
+ init_notes(NULL, NULL, NULL, flags);
t = &default_notes_tree;
- if (!starts_with(t->ref, "refs/notes/"))
+ ref = (flags & NOTES_INIT_WRITABLE) ? t->update_ref : t->ref;
+ if (!starts_with(ref, "refs/notes/"))
die("Refusing to %s notes in %s (outside of refs/notes/)",
- subcommand, t->ref);
+ subcommand, ref);
return t;
}
@@ -360,7 +363,7 @@ static int list(int argc, const char **argv, const char *prefix)
usage_with_options(git_notes_list_usage, options);
}
- t = init_notes_check("list");
+ t = init_notes_check("list", 0);
if (argc) {
if (get_sha1(argv[0], object))
die(_("Failed to resolve '%s' as a valid ref."), argv[0]);
@@ -420,7 +423,7 @@ static int add(int argc, const char **argv, const char *prefix)
if (get_sha1(object_ref, object))
die(_("Failed to resolve '%s' as a valid ref."), object_ref);
- t = init_notes_check("add");
+ t = init_notes_check("add", NOTES_INIT_WRITABLE);
note = get_note(t, object);
if (note) {
@@ -511,7 +514,7 @@ static int copy(int argc, const char **argv, const char *prefix)
if (get_sha1(object_ref, object))
die(_("Failed to resolve '%s' as a valid ref."), object_ref);
- t = init_notes_check("copy");
+ t = init_notes_check("copy", NOTES_INIT_WRITABLE);
note = get_note(t, object);
if (note) {
@@ -589,7 +592,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
if (get_sha1(object_ref, object))
die(_("Failed to resolve '%s' as a valid ref."), object_ref);
- t = init_notes_check(argv[0]);
+ t = init_notes_check(argv[0], NOTES_INIT_WRITABLE);
note = get_note(t, object);
prepare_note_data(object, &d, edit ? note : NULL);
@@ -652,7 +655,7 @@ static int show(int argc, const char **argv, const char *prefix)
if (get_sha1(object_ref, object))
die(_("Failed to resolve '%s' as a valid ref."), object_ref);
- t = init_notes_check("show");
+ t = init_notes_check("show", 0);
note = get_note(t, object);
if (!note)
@@ -806,10 +809,10 @@ static int merge(int argc, const char **argv, const char *prefix)
o.local_ref = default_notes_ref();
strbuf_addstr(&remote_ref, argv[0]);
- expand_notes_ref(&remote_ref);
+ expand_loose_notes_ref(&remote_ref);
o.remote_ref = remote_ref.buf;
- t = init_notes_check("merge");
+ t = init_notes_check("merge", NOTES_INIT_WRITABLE);
if (strategy) {
if (parse_notes_merge_strategy(strategy, &o.strategy)) {
@@ -901,7 +904,7 @@ static int remove_cmd(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options,
git_notes_remove_usage, 0);
- t = init_notes_check("remove");
+ t = init_notes_check("remove", NOTES_INIT_WRITABLE);
if (!argc && !from_stdin) {
retval = remove_one_note(t, "HEAD", flag);
@@ -943,7 +946,7 @@ static int prune(int argc, const char **argv, const char *prefix)
usage_with_options(git_notes_prune_usage, options);
}
- t = init_notes_check("prune");
+ t = init_notes_check("prune", NOTES_INIT_WRITABLE);
prune_notes(t, (verbose ? NOTES_PRUNE_VERBOSE : 0) |
(show_only ? NOTES_PRUNE_VERBOSE|NOTES_PRUNE_DRYRUN : 0) );
diff --git a/builtin/pull.c b/builtin/pull.c
index 5145fc6..10eff03 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -22,7 +22,8 @@ enum rebase_type {
REBASE_INVALID = -1,
REBASE_FALSE = 0,
REBASE_TRUE,
- REBASE_PRESERVE
+ REBASE_PRESERVE,
+ REBASE_INTERACTIVE
};
/**
@@ -42,6 +43,8 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value,
return REBASE_TRUE;
else if (!strcmp(value, "preserve"))
return REBASE_PRESERVE;
+ else if (!strcmp(value, "interactive"))
+ return REBASE_INTERACTIVE;
if (fatal)
die(_("Invalid value for %s: %s"), key, value);
@@ -95,6 +98,7 @@ static int opt_force;
static char *opt_tags;
static char *opt_prune;
static char *opt_recurse_submodules;
+static char *max_children;
static int opt_dry_run;
static char *opt_keep;
static char *opt_depth;
@@ -112,7 +116,7 @@ static struct option pull_options[] = {
/* Options passed to git-merge or git-rebase */
OPT_GROUP(N_("Options related to merging")),
{ OPTION_CALLBACK, 'r', "rebase", &opt_rebase,
- "false|true|preserve",
+ "false|true|preserve|interactive",
N_("incorporate changes by rebasing rather than merging"),
PARSE_OPT_OPTARG, parse_opt_rebase },
OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
@@ -178,6 +182,9 @@ static struct option pull_options[] = {
N_("on-demand"),
N_("control recursive fetching of submodules"),
PARSE_OPT_OPTARG),
+ OPT_PASSTHRU('j', "jobs", &max_children, N_("n"),
+ N_("number of submodules pulled in parallel"),
+ PARSE_OPT_OPTARG),
OPT_BOOL(0, "dry-run", &opt_dry_run,
N_("dry run")),
OPT_PASSTHRU('k', "keep", &opt_keep, NULL,
@@ -378,7 +385,7 @@ static void get_merge_heads(struct sha1_array *merge_heads)
if (!(fp = fopen(filename, "r")))
die_errno(_("could not open '%s' for reading"), filename);
- while (strbuf_getline(&sb, fp, '\n') != EOF) {
+ while (strbuf_getline_lf(&sb, fp) != EOF) {
if (get_sha1_hex(sb.buf, sha1))
continue; /* invalid line: does not start with SHA1 */
if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t"))
@@ -525,6 +532,8 @@ static int run_fetch(const char *repo, const char **refspecs)
argv_array_push(&args, opt_prune);
if (opt_recurse_submodules)
argv_array_push(&args, opt_recurse_submodules);
+ if (max_children)
+ argv_array_push(&args, max_children);
if (opt_dry_run)
argv_array_push(&args, "--dry-run");
if (opt_keep)
@@ -772,6 +781,8 @@ static int run_rebase(const unsigned char *curr_head,
/* Options passed to git-rebase */
if (opt_rebase == REBASE_PRESERVE)
argv_array_push(&args, "--preserve-merges");
+ else if (opt_rebase == REBASE_INTERACTIVE)
+ argv_array_push(&args, "--interactive");
if (opt_diffstat)
argv_array_push(&args, opt_diffstat);
argv_array_pushv(&args, opt_strategies.argv);
diff --git a/builtin/push.c b/builtin/push.c
index 3bda430..960ffc3 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -9,6 +9,7 @@
#include "transport.h"
#include "parse-options.h"
#include "submodule.h"
+#include "submodule-config.h"
#include "send-pack.h"
static const char * const push_usage[] = {
@@ -21,6 +22,7 @@ static int deleterefs;
static const char *receivepack;
static int verbosity;
static int progress = -1;
+static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
static struct push_cas_option cas;
@@ -452,22 +454,14 @@ static int do_push(const char *repo, int flags)
static int option_parse_recurse_submodules(const struct option *opt,
const char *arg, int unset)
{
- int *flags = opt->value;
+ int *recurse_submodules = opt->value;
- if (*flags & (TRANSPORT_RECURSE_SUBMODULES_CHECK |
- TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND))
- die("%s can only be used once.", opt->long_name);
-
- if (arg) {
- if (!strcmp(arg, "check"))
- *flags |= TRANSPORT_RECURSE_SUBMODULES_CHECK;
- else if (!strcmp(arg, "on-demand"))
- *flags |= TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND;
- else
- die("bad %s argument: %s", opt->long_name, arg);
- } else
- die("option %s needs an argument (check|on-demand)",
- opt->long_name);
+ if (unset)
+ *recurse_submodules = RECURSE_SUBMODULES_OFF;
+ else if (arg)
+ *recurse_submodules = parse_push_recurse_submodules_arg(opt->long_name, arg);
+ else
+ die("%s missing parameter", opt->long_name);
return 0;
}
@@ -522,6 +516,10 @@ static int git_push_config(const char *k, const char *v, void *cb)
return error("Invalid value for '%s'", k);
}
}
+ } else if (!strcmp(k, "push.recursesubmodules")) {
+ const char *value;
+ if (!git_config_get_value("push.recursesubmodules", &value))
+ recurse_submodules = parse_push_recurse_submodules_arg(k, value);
}
return git_default_config(k, v, NULL);
@@ -540,7 +538,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
OPT_BIT( 0 , "all", &flags, N_("push all refs"), TRANSPORT_PUSH_ALL),
OPT_BIT( 0 , "mirror", &flags, N_("mirror all refs"),
(TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
- OPT_BOOL( 0, "delete", &deleterefs, N_("delete refs")),
+ OPT_BOOL('d', "delete", &deleterefs, N_("delete refs")),
OPT_BOOL( 0 , "tags", &tags, N_("push tags (can't be used with --all or --mirror)")),
OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN),
OPT_BIT( 0, "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN),
@@ -549,7 +547,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
0, CAS_OPT_NAME, &cas, N_("refname>:<expect"),
N_("require old value of ref to be at this value"),
PARSE_OPT_OPTARG, parseopt_push_cas_option },
- { OPTION_CALLBACK, 0, "recurse-submodules", &flags, "check|on-demand",
+ { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, "check|on-demand|no",
N_("control recursive pushing of submodules"),
PARSE_OPT_OPTARG, option_parse_recurse_submodules },
OPT_BOOL( 0 , "thin", &thin, N_("use thin pack")),
@@ -580,6 +578,11 @@ int cmd_push(int argc, const char **argv, const char *prefix)
if (deleterefs && argc < 2)
die(_("--delete doesn't make sense without any refs"));
+ if (recurse_submodules == RECURSE_SUBMODULES_CHECK)
+ flags |= TRANSPORT_RECURSE_SUBMODULES_CHECK;
+ else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
+ flags |= TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND;
+
if (tags)
add_refspec("refs/tags/*");
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index ca38131..f2d6761 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1618,7 +1618,7 @@ static void prepare_shallow_update(struct command *commands,
continue;
si->need_reachability_test[i]++;
for (k = 0; k < 32; k++)
- if (si->used_shallow[i][j] & (1 << k))
+ if (si->used_shallow[i][j] & (1U << k))
si->shallow_ref[j * 32 + k]++;
}
@@ -1796,6 +1796,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
"gc", "--auto", "--quiet", NULL,
};
int opt = RUN_GIT_CMD | RUN_COMMAND_STDOUT_TO_STDERR;
+ close_all_packs();
run_command_v_opt(argv_gc_auto, opt);
}
if (auto_update_server_info)
diff --git a/builtin/remote.c b/builtin/remote.c
index 6694cf2..2b2ff9b 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -251,7 +251,7 @@ static int add(int argc, const char **argv)
struct branch_info {
char *remote_name;
struct string_list merge;
- int rebase;
+ enum { NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE } rebase;
};
static struct string_list branch_list;
@@ -311,7 +311,9 @@ static int config_read_branches(const char *key, const char *value, void *cb)
if (v >= 0)
info->rebase = v;
else if (!strcmp(value, "preserve"))
- info->rebase = 1;
+ info->rebase = NORMAL_REBASE;
+ else if (!strcmp(value, "interactive"))
+ info->rebase = INTERACTIVE_REBASE;
}
}
return 0;
@@ -980,7 +982,9 @@ static int show_local_info_item(struct string_list_item *item, void *cb_data)
printf(" %-*s ", show_info->width, item->string);
if (branch_info->rebase) {
- printf_ln(_("rebases onto remote %s"), merge->items[0].string);
+ printf_ln(_(branch_info->rebase == INTERACTIVE_REBASE ?
+ "rebases interactively onto remote %s" :
+ "rebases onto remote %s"), merge->items[0].string);
return 0;
} else if (show_info->any_rebase) {
printf_ln(_(" merges with remote %s"), merge->items[0].string);
diff --git a/builtin/repack.c b/builtin/repack.c
index 9456110..858db38 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -266,7 +266,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
return ret;
out = xfdopen(cmd.out, "r");
- while (strbuf_getline(&line, out, '\n') != EOF) {
+ while (strbuf_getline_lf(&line, out) != EOF) {
if (line.len != 40)
die("repack: Expecting 40 character sha1 lines only from pack-objects.");
string_list_append(&names, line.buf);
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 7e074aa..bd16876 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -383,7 +383,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
/* get the usage up to the first line with a -- on it */
for (;;) {
- if (strbuf_getline(&sb, stdin, '\n') == EOF)
+ if (strbuf_getline(&sb, stdin) == EOF)
die("premature end of input");
ALLOC_GROW(usage, unb + 1, usz);
if (!strcmp("--", sb.buf)) {
@@ -396,7 +396,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
}
/* parse: (<short>|<short>,<long>|<long>)[*=?!]*<arghint>? SP+ <help> */
- while (strbuf_getline(&sb, stdin, '\n') != EOF) {
+ while (strbuf_getline(&sb, stdin) != EOF) {
const char *s;
const char *help;
struct option *o;
diff --git a/builtin/rm.c b/builtin/rm.c
index 80b972f..8829b09 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -211,7 +211,7 @@ static int check_local_mod(unsigned char *head, int index_only)
* "intent to add" entry.
*/
if (local_changes && staged_changes) {
- if (!index_only || !(ce->ce_flags & CE_INTENT_TO_ADD))
+ if (!index_only || !ce_intent_to_add(ce))
string_list_append(&files_staged, name);
}
else if (!index_only) {
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index f6e5d64..5b9dd6a 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -212,7 +212,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
argv_array_push(&all_refspecs, buf);
} else {
struct strbuf line = STRBUF_INIT;
- while (strbuf_getline(&line, stdin, '\n') != EOF)
+ while (strbuf_getline(&line, stdin) != EOF)
argv_array_push(&all_refspecs, line.buf);
strbuf_release(&line);
}
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 35ebd17..bfc082e 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -14,7 +14,26 @@ static char const * const shortlog_usage[] = {
NULL
};
-static int compare_by_number(const void *a1, const void *a2)
+/*
+ * The util field of our string_list_items will contain one of two things:
+ *
+ * - if --summary is not in use, it will point to a string list of the
+ * oneline subjects assigned to this author
+ *
+ * - if --summary is in use, we don't need that list; we only need to know
+ * its size. So we abuse the pointer slot to store our integer counter.
+ *
+ * This macro accesses the latter.
+ */
+#define UTIL_TO_INT(x) ((intptr_t)(x)->util)
+
+static int compare_by_counter(const void *a1, const void *a2)
+{
+ const struct string_list_item *i1 = a1, *i2 = a2;
+ return UTIL_TO_INT(i2) - UTIL_TO_INT(i1);
+}
+
+static int compare_by_list(const void *a1, const void *a2)
{
const struct string_list_item *i1 = a1, *i2 = a2;
const struct string_list *l1 = i1->util, *l2 = i2->util;
@@ -31,13 +50,9 @@ static void insert_one_record(struct shortlog *log,
const char *author,
const char *oneline)
{
- const char *dot3 = log->common_repo_prefix;
- char *buffer, *p;
struct string_list_item *item;
const char *mailbuf, *namebuf;
size_t namelen, maillen;
- const char *eol;
- struct strbuf subject = STRBUF_INIT;
struct strbuf namemailbuf = STRBUF_INIT;
struct ident_split ident;
@@ -56,98 +71,95 @@ static void insert_one_record(struct shortlog *log,
strbuf_addf(&namemailbuf, " <%.*s>", (int)maillen, mailbuf);
item = string_list_insert(&log->list, namemailbuf.buf);
- if (item->util == NULL)
- item->util = xcalloc(1, sizeof(struct string_list));
-
- /* Skip any leading whitespace, including any blank lines. */
- while (*oneline && isspace(*oneline))
- oneline++;
- eol = strchr(oneline, '\n');
- if (!eol)
- eol = oneline + strlen(oneline);
- if (starts_with(oneline, "[PATCH")) {
- char *eob = strchr(oneline, ']');
- if (eob && (!eol || eob < eol))
- oneline = eob + 1;
- }
- while (*oneline && isspace(*oneline) && *oneline != '\n')
- oneline++;
- format_subject(&subject, oneline, " ");
- buffer = strbuf_detach(&subject, NULL);
-
- if (dot3) {
- int dot3len = strlen(dot3);
- if (dot3len > 5) {
- while ((p = strstr(buffer, dot3)) != NULL) {
- int taillen = strlen(p) - dot3len;
- memcpy(p, "/.../", 5);
- memmove(p + 5, p + dot3len, taillen + 1);
+
+ if (log->summary)
+ item->util = (void *)(UTIL_TO_INT(item) + 1);
+ else {
+ const char *dot3 = log->common_repo_prefix;
+ char *buffer, *p;
+ struct strbuf subject = STRBUF_INIT;
+ const char *eol;
+
+ /* Skip any leading whitespace, including any blank lines. */
+ while (*oneline && isspace(*oneline))
+ oneline++;
+ eol = strchr(oneline, '\n');
+ if (!eol)
+ eol = oneline + strlen(oneline);
+ if (starts_with(oneline, "[PATCH")) {
+ char *eob = strchr(oneline, ']');
+ if (eob && (!eol || eob < eol))
+ oneline = eob + 1;
+ }
+ while (*oneline && isspace(*oneline) && *oneline != '\n')
+ oneline++;
+ format_subject(&subject, oneline, " ");
+ buffer = strbuf_detach(&subject, NULL);
+
+ if (dot3) {
+ int dot3len = strlen(dot3);
+ if (dot3len > 5) {
+ while ((p = strstr(buffer, dot3)) != NULL) {
+ int taillen = strlen(p) - dot3len;
+ memcpy(p, "/.../", 5);
+ memmove(p + 5, p + dot3len, taillen + 1);
+ }
}
}
- }
- string_list_append(item->util, buffer);
+ if (item->util == NULL)
+ item->util = xcalloc(1, sizeof(struct string_list));
+ string_list_append(item->util, buffer);
+ }
}
static void read_from_stdin(struct shortlog *log)
{
- char author[1024], oneline[1024];
+ struct strbuf author = STRBUF_INIT;
+ struct strbuf oneline = STRBUF_INIT;
- while (fgets(author, sizeof(author), stdin) != NULL) {
- if (!(author[0] == 'A' || author[0] == 'a') ||
- !starts_with(author + 1, "uthor: "))
+ while (strbuf_getline_lf(&author, stdin) != EOF) {
+ const char *v;
+ if (!skip_prefix(author.buf, "Author: ", &v) &&
+ !skip_prefix(author.buf, "author ", &v))
continue;
- while (fgets(oneline, sizeof(oneline), stdin) &&
- oneline[0] != '\n')
+ while (strbuf_getline_lf(&oneline, stdin) != EOF &&
+ oneline.len)
; /* discard headers */
- while (fgets(oneline, sizeof(oneline), stdin) &&
- oneline[0] == '\n')
+ while (strbuf_getline_lf(&oneline, stdin) != EOF &&
+ !oneline.len)
; /* discard blanks */
- insert_one_record(log, author + 8, oneline);
+ insert_one_record(log, v, oneline.buf);
}
+ strbuf_release(&author);
+ strbuf_release(&oneline);
}
void shortlog_add_commit(struct shortlog *log, struct commit *commit)
{
- const char *author = NULL, *buffer;
- struct strbuf buf = STRBUF_INIT;
- struct strbuf ufbuf = STRBUF_INIT;
-
- pp_commit_easy(CMIT_FMT_RAW, commit, &buf);
- buffer = buf.buf;
- while (*buffer && *buffer != '\n') {
- const char *eol = strchr(buffer, '\n');
-
- if (eol == NULL)
- eol = buffer + strlen(buffer);
+ struct strbuf author = STRBUF_INIT;
+ struct strbuf oneline = STRBUF_INIT;
+ struct pretty_print_context ctx = {0};
+
+ ctx.fmt = CMIT_FMT_USERFORMAT;
+ ctx.abbrev = log->abbrev;
+ ctx.subject = "";
+ ctx.after_subject = "";
+ ctx.date_mode.type = DATE_NORMAL;
+ ctx.output_encoding = get_log_output_encoding();
+
+ format_commit_message(commit, "%an <%ae>", &author, &ctx);
+ if (!log->summary) {
+ if (log->user_format)
+ pretty_print_commit(&ctx, commit, &oneline);
else
- eol++;
-
- if (starts_with(buffer, "author "))
- author = buffer + 7;
- buffer = eol;
- }
- if (!author) {
- warning(_("Missing author: %s"),
- oid_to_hex(&commit->object.oid));
- return;
+ format_commit_message(commit, "%s", &oneline, &ctx);
}
- if (log->user_format) {
- struct pretty_print_context ctx = {0};
- ctx.fmt = CMIT_FMT_USERFORMAT;
- ctx.abbrev = log->abbrev;
- ctx.subject = "";
- ctx.after_subject = "";
- ctx.date_mode.type = DATE_NORMAL;
- ctx.output_encoding = get_log_output_encoding();
- pretty_print_commit(&ctx, commit, &ufbuf);
- buffer = ufbuf.buf;
- } else if (*buffer) {
- buffer++;
- }
- insert_one_record(log, author, !*buffer ? "<none>" : buffer);
- strbuf_release(&ufbuf);
- strbuf_release(&buf);
+
+ insert_one_record(log, author.buf, oneline.len ? oneline.buf : "<none>");
+
+ strbuf_release(&author);
+ strbuf_release(&oneline);
}
static void get_from_rev(struct rev_info *rev, struct shortlog *log)
@@ -294,14 +306,14 @@ void shortlog_output(struct shortlog *log)
if (log->sort_by_number)
qsort(log->list.items, log->list.nr, sizeof(struct string_list_item),
- compare_by_number);
+ log->summary ? compare_by_counter : compare_by_list);
for (i = 0; i < log->list.nr; i++) {
- struct string_list *onelines = log->list.items[i].util;
-
+ const struct string_list_item *item = &log->list.items[i];
if (log->summary) {
- printf("%6d\t%s\n", onelines->nr, log->list.items[i].string);
+ printf("%6d\t%s\n", (int)UTIL_TO_INT(item), item->string);
} else {
- printf("%s (%d):\n", log->list.items[i].string, onelines->nr);
+ struct string_list *onelines = item->util;
+ printf("%s (%d):\n", item->string, onelines->nr);
for (j = onelines->nr - 1; j >= 0; j--) {
const char *msg = onelines->items[j].string;
@@ -314,11 +326,11 @@ void shortlog_output(struct shortlog *log)
printf(" %s\n", msg);
}
putchar('\n');
+ onelines->strdup_strings = 1;
+ string_list_clear(onelines, 0);
+ free(onelines);
}
- onelines->strdup_strings = 1;
- string_list_clear(onelines, 0);
- free(onelines);
log->list.items[i].util = NULL;
}
diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index ce0fde7..9c29a64 100644
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -67,7 +67,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
if (!strcmp(argv[0], "HEAD") &&
!starts_with(argv[1], "refs/"))
die("Refusing to point HEAD outside of refs/");
- create_symref(argv[0], argv[1], msg);
+ ret = !!create_symref(argv[0], argv[1], msg);
break;
default:
usage_with_options(git_symbolic_ref_usage, options);
diff --git a/builtin/tag.c b/builtin/tag.c
index 8db8c87..1705c94 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -44,11 +44,11 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, con
if (!format) {
if (filter->lines) {
to_free = xstrfmt("%s %%(contents:lines=%d)",
- "%(align:15)%(refname:short)%(end)",
+ "%(align:15)%(refname:strip=2)%(end)",
filter->lines);
format = to_free;
} else
- format = "%(refname:short)";
+ format = "%(refname:strip=2)";
}
verify_ref_format(format);
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 7a55334..dbc23a4 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -477,12 +477,14 @@ static void update_one(const char *path)
report("add '%s'", path);
}
-static void read_index_info(int line_termination)
+static void read_index_info(int nul_term_line)
{
struct strbuf buf = STRBUF_INIT;
struct strbuf uq = STRBUF_INIT;
+ strbuf_getline_fn getline_fn;
- while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
+ getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
+ while (getline_fn(&buf, stdin) != EOF) {
char *ptr, *tab;
char *path_name;
unsigned char sha1[20];
@@ -531,7 +533,7 @@ static void read_index_info(int line_termination)
goto bad_line;
path_name = ptr;
- if (line_termination && path_name[0] == '"') {
+ if (!nul_term_line && path_name[0] == '"') {
strbuf_reset(&uq);
if (unquote_c_style(&uq, path_name, NULL)) {
die("git update-index: bad quoting of path name");
@@ -853,12 +855,12 @@ static int cacheinfo_callback(struct parse_opt_ctx_t *ctx,
static int stdin_cacheinfo_callback(struct parse_opt_ctx_t *ctx,
const struct option *opt, int unset)
{
- int *line_termination = opt->value;
+ int *nul_term_line = opt->value;
if (ctx->argc != 1)
return error("option '%s' must be the last argument", opt->long_name);
allow_add = allow_replace = allow_remove = 1;
- read_index_info(*line_termination);
+ read_index_info(*nul_term_line);
return 0;
}
@@ -910,7 +912,7 @@ static int reupdate_callback(struct parse_opt_ctx_t *ctx,
int cmd_update_index(int argc, const char **argv, const char *prefix)
{
- int newfd, entries, has_errors = 0, line_termination = '\n';
+ int newfd, entries, has_errors = 0, nul_term_line = 0;
enum uc_mode untracked_cache = UC_UNSPECIFIED;
int read_from_stdin = 0;
int prefix_length = prefix ? strlen(prefix) : 0;
@@ -921,6 +923,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
int split_index = -1;
struct lock_file *lock_file;
struct parse_opt_ctx_t ctx;
+ strbuf_getline_fn getline_fn;
int parseopt_state = PARSE_OPT_UNKNOWN;
struct option options[] = {
OPT_BIT('q', NULL, &refresh_args.flags,
@@ -972,13 +975,13 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
N_("add to index only; do not add content to object database"), 1),
OPT_SET_INT(0, "force-remove", &force_remove,
N_("remove named paths even if present in worktree"), 1),
- OPT_SET_INT('z', NULL, &line_termination,
- N_("with --stdin: input lines are terminated by null bytes"), '\0'),
+ OPT_BOOL('z', NULL, &nul_term_line,
+ N_("with --stdin: input lines are terminated by null bytes")),
{OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
N_("read list of paths to be updated from standard input"),
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
(parse_opt_cb *) stdin_callback},
- {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &line_termination, NULL,
+ {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &nul_term_line, NULL,
N_("add entries from standard input to the index"),
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
(parse_opt_cb *) stdin_cacheinfo_callback},
@@ -1068,6 +1071,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
}
}
argc = parse_options_end(&ctx);
+
+ getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
if (preferred_index_format) {
if (preferred_index_format < INDEX_FORMAT_LB ||
INDEX_FORMAT_UB < preferred_index_format)
@@ -1084,9 +1089,9 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
setup_work_tree();
- while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
+ while (getline_fn(&buf, stdin) != EOF) {
char *p;
- if (line_termination && buf.buf[0] == '"') {
+ if (!nul_term_line && buf.buf[0] == '"') {
strbuf_reset(&nbuf);
if (unquote_c_style(&nbuf, buf.buf, NULL))
die("line is badly quoted");
diff --git a/cache-tree.c b/cache-tree.c
index a59e6f1..20ee7b5 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -377,7 +377,7 @@ static int update_one(struct cache_tree *it,
* they are not part of generated trees. Invalidate up
* to root to force cache-tree users to read elsewhere.
*/
- if (ce->ce_flags & CE_INTENT_TO_ADD) {
+ if (ce_intent_to_add(ce)) {
to_invalidate = 1;
continue;
}
diff --git a/cache.h b/cache.h
index 255b273..26640b4 100644
--- a/cache.h
+++ b/cache.h
@@ -9,6 +9,7 @@
#include "convert.h"
#include "trace.h"
#include "string-list.h"
+#include "pack-revindex.h"
#include SHA1_HEADER
#ifndef platform_SHA_CTX
@@ -214,7 +215,7 @@ struct cache_entry {
#define CE_INTENT_TO_ADD (1 << 29)
#define CE_SKIP_WORKTREE (1 << 30)
/* CE_EXTENDED2 is for future extension */
-#define CE_EXTENDED2 (1 << 31)
+#define CE_EXTENDED2 (1U << 31)
#define CE_EXTENDED_FLAGS (CE_INTENT_TO_ADD | CE_SKIP_WORKTREE)
@@ -259,6 +260,7 @@ static inline unsigned create_ce_flags(unsigned stage)
#define ce_uptodate(ce) ((ce)->ce_flags & CE_UPTODATE)
#define ce_skip_worktree(ce) ((ce)->ce_flags & CE_SKIP_WORKTREE)
#define ce_mark_uptodate(ce) ((ce)->ce_flags |= CE_UPTODATE)
+#define ce_intent_to_add(ce) ((ce)->ce_flags & CE_INTENT_TO_ADD)
#define ce_permissions(mode) (((mode) & 0100) ? 0755 : 0644)
static inline unsigned int create_ce_mode(unsigned int mode)
@@ -456,7 +458,6 @@ extern char *git_work_tree_cfg;
extern int is_inside_work_tree(void);
extern const char *get_git_dir(void);
extern const char *get_git_common_dir(void);
-extern int is_git_directory(const char *path);
extern char *get_object_directory(void);
extern char *get_index_file(void);
extern char *get_graft_file(void);
@@ -467,6 +468,25 @@ extern const char *get_git_namespace(void);
extern const char *strip_namespace(const char *namespaced_ref);
extern const char *get_git_work_tree(void);
+/*
+ * Return true if the given path is a git directory; note that this _just_
+ * looks at the directory itself. If you want to know whether "foo/.git"
+ * is a repository, you must feed that path, not just "foo".
+ */
+extern int is_git_directory(const char *path);
+
+/*
+ * Return 1 if the given path is the root of a git repository or
+ * submodule, else 0. Will not return 1 for bare repositories with the
+ * exception of creating a bare repository in "foo/.git" and calling
+ * is_git_repository("foo").
+ *
+ * If we run into read errors, we err on the side of saying "yes, it is",
+ * as we usually consider sub-repos precious, and would prefer to err on the
+ * side of not disrupting or deleting them.
+ */
+extern int is_nonbare_repository_dir(struct strbuf *path);
+
#define READ_GITFILE_ERR_STAT_FAILED 1
#define READ_GITFILE_ERR_NOT_A_FILE 2
#define READ_GITFILE_ERR_OPEN_FAILED 3
@@ -831,6 +851,7 @@ extern const char *find_unique_abbrev(const unsigned char *sha1, int len);
extern int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len);
extern const unsigned char null_sha1[GIT_SHA1_RAWSZ];
+extern const struct object_id null_oid;
static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
{
@@ -1298,6 +1319,7 @@ extern struct packed_git {
freshened:1,
do_not_close:1;
unsigned char sha1[20];
+ struct revindex_entry *revindex;
/* something like ".git/objects/pack/xxxxx.pack" */
char pack_name[FLEX_ARRAY]; /* more */
} *packed_git;
diff --git a/compat/basename.c b/compat/basename.c
index d8f8a3c..96bd953 100644
--- a/compat/basename.c
+++ b/compat/basename.c
@@ -1,15 +1,71 @@
#include "../git-compat-util.h"
+#include "../strbuf.h"
/* Adapted from libiberty's basename.c. */
char *gitbasename (char *path)
{
const char *base;
- /* Skip over the disk name in MSDOS pathnames. */
- if (has_dos_drive_prefix(path))
- path += 2;
+
+ if (path)
+ skip_dos_drive_prefix(&path);
+
+ if (!path || !*path)
+ return ".";
+
for (base = path; *path; path++) {
- if (is_dir_sep(*path))
- base = path + 1;
+ if (!is_dir_sep(*path))
+ continue;
+ do {
+ path++;
+ } while (is_dir_sep(*path));
+ if (*path)
+ base = path;
+ else
+ while (--path != base && is_dir_sep(*path))
+ *path = '\0';
}
return (char *)base;
}
+
+char *gitdirname(char *path)
+{
+ static struct strbuf buf = STRBUF_INIT;
+ char *p = path, *slash = NULL, c;
+ int dos_drive_prefix;
+
+ if (!p)
+ return ".";
+
+ if ((dos_drive_prefix = skip_dos_drive_prefix(&p)) && !*p)
+ goto dot;
+
+ /*
+ * POSIX.1-2001 says dirname("/") should return "/", and dirname("//")
+ * should return "//", but dirname("///") should return "/" again.
+ */
+ if (is_dir_sep(*p)) {
+ if (!p[1] || (is_dir_sep(p[1]) && !p[2]))
+ return path;
+ slash = ++p;
+ }
+ while ((c = *(p++)))
+ if (is_dir_sep(c)) {
+ char *tentative = p - 1;
+
+ /* POSIX.1-2001 says to ignore trailing slashes */
+ while (is_dir_sep(*p))
+ p++;
+ if (*p)
+ slash = tentative;
+ }
+
+ if (slash) {
+ *slash = '\0';
+ return path;
+ }
+
+dot:
+ strbuf_reset(&buf);
+ strbuf_addf(&buf, "%.*s.", dos_drive_prefix, path);
+ return buf.buf;
+}
diff --git a/compat/bswap.h b/compat/bswap.h
index 7fed637..d47c003 100644
--- a/compat/bswap.h
+++ b/compat/bswap.h
@@ -149,11 +149,12 @@ static inline uint64_t git_bswap64(uint64_t x)
* and is faster on architectures with memory alignment issues.
*/
-#if defined(__i386__) || defined(__x86_64__) || \
+#if !defined(NO_UNALIGNED_LOADS) && ( \
+ defined(__i386__) || defined(__x86_64__) || \
defined(_M_IX86) || defined(_M_X64) || \
defined(__ppc__) || defined(__ppc64__) || \
defined(__powerpc__) || defined(__powerpc64__) || \
- defined(__s390__) || defined(__s390x__)
+ defined(__s390__) || defined(__s390x__))
#define get_be16(p) ntohs(*(unsigned short *)(p))
#define get_be32(p) ntohl(*(unsigned int *)(p))
diff --git a/compat/mingw.c b/compat/mingw.c
index 90bdb1e..77a51d3 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -6,6 +6,8 @@
#include "../run-command.h"
#include "../cache.h"
+#define HCAST(type, handle) ((type)(intptr_t)handle)
+
static const int delay[] = { 0, 1, 10, 20, 40 };
int err_win_to_posix(DWORD winerr)
@@ -394,6 +396,23 @@ int mingw_fflush(FILE *stream)
return ret;
}
+#undef write
+ssize_t mingw_write(int fd, const void *buf, size_t len)
+{
+ ssize_t result = write(fd, buf, len);
+
+ if (result < 0 && errno == EINVAL && buf) {
+ /* check if fd is a pipe */
+ HANDLE h = (HANDLE) _get_osfhandle(fd);
+ if (GetFileType(h) == FILE_TYPE_PIPE)
+ errno = EPIPE;
+ else
+ errno = EINVAL;
+ }
+
+ return result;
+}
+
int mingw_access(const char *filename, int mode)
{
wchar_t wfilename[MAX_PATH];
@@ -674,13 +693,13 @@ int pipe(int filedes[2])
errno = err_win_to_posix(GetLastError());
return -1;
}
- filedes[0] = _open_osfhandle((int)h[0], O_NOINHERIT);
+ filedes[0] = _open_osfhandle(HCAST(int, h[0]), O_NOINHERIT);
if (filedes[0] < 0) {
CloseHandle(h[0]);
CloseHandle(h[1]);
return -1;
}
- filedes[1] = _open_osfhandle((int)h[1], O_NOINHERIT);
+ filedes[1] = _open_osfhandle(HCAST(int, h[1]), O_NOINHERIT);
if (filedes[1] < 0) {
close(filedes[0]);
CloseHandle(h[1]);
@@ -1829,7 +1848,8 @@ void mingw_open_html(const char *unixpath)
die("cannot run browser");
printf("Launching default browser to display HTML ...\n");
- r = (int)ShellExecute(NULL, "open", htmlpath, NULL, "\\", SW_SHOWNORMAL);
+ r = HCAST(int, ShellExecute(NULL, "open", htmlpath,
+ NULL, "\\", SW_SHOWNORMAL));
FreeLibrary(shell32);
/* see the MSDN documentation referring to the result codes here */
if (r <= 32) {
@@ -1915,28 +1935,31 @@ pid_t waitpid(pid_t pid, int *status, int options)
return -1;
}
+int mingw_skip_dos_drive_prefix(char **path)
+{
+ int ret = has_dos_drive_prefix(*path);
+ *path += ret;
+ return ret;
+}
+
int mingw_offset_1st_component(const char *path)
{
- int offset = 0;
- if (has_dos_drive_prefix(path))
- offset = 2;
+ char *pos = (char *)path;
/* unc paths */
- else if (is_dir_sep(path[0]) && is_dir_sep(path[1])) {
-
+ if (!skip_dos_drive_prefix(&pos) &&
+ is_dir_sep(pos[0]) && is_dir_sep(pos[1])) {
/* skip server name */
- char *pos = strpbrk(path + 2, "\\/");
+ pos = strpbrk(pos + 2, "\\/");
if (!pos)
return 0; /* Error: malformed unc path */
do {
pos++;
} while (*pos && !is_dir_sep(*pos));
-
- offset = pos - path;
}
- return offset + is_dir_sep(path[offset]);
+ return pos + is_dir_sep(*pos) - path;
}
int xutftowcsn(wchar_t *wcs, const char *utfs, size_t wcslen, int utflen)
diff --git a/compat/mingw.h b/compat/mingw.h
index 738865c..8c5bf50 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -1,27 +1,43 @@
+#ifdef __MINGW64_VERSION_MAJOR
+#include <stdint.h>
+#include <wchar.h>
+typedef _sigset_t sigset_t;
+#endif
#include <winsock2.h>
#include <ws2tcpip.h>
+/* MinGW-w64 reports to have flockfile, but it does not actually have it. */
+#ifdef __MINGW64_VERSION_MAJOR
+#undef _POSIX_THREAD_SAFE_FUNCTIONS
+#endif
+
/*
* things that are not available in header files
*/
-typedef int pid_t;
typedef int uid_t;
typedef int socklen_t;
+#ifndef __MINGW64_VERSION_MAJOR
+typedef int pid_t;
#define hstrerror strerror
+#endif
#define S_IFLNK 0120000 /* Symbolic link */
#define S_ISLNK(x) (((x) & S_IFMT) == S_IFLNK)
#define S_ISSOCK(x) 0
+#ifndef S_IRWXG
#define S_IRGRP 0
#define S_IWGRP 0
#define S_IXGRP 0
#define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP)
+#endif
+#ifndef S_IRWXO
#define S_IROTH 0
#define S_IWOTH 0
#define S_IXOTH 0
#define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH)
+#endif
#define S_ISUID 0004000
#define S_ISGID 0002000
@@ -100,8 +116,10 @@ static inline int symlink(const char *oldpath, const char *newpath)
{ errno = ENOSYS; return -1; }
static inline int fchmod(int fildes, mode_t mode)
{ errno = ENOSYS; return -1; }
+#ifndef __MINGW64_VERSION_MAJOR
static inline pid_t fork(void)
{ errno = ENOSYS; return -1; }
+#endif
static inline unsigned int alarm(unsigned int seconds)
{ return 0; }
static inline int fsync(int fd)
@@ -176,8 +194,10 @@ int pipe(int filedes[2]);
unsigned int sleep (unsigned int seconds);
int mkstemp(char *template);
int gettimeofday(struct timeval *tv, void *tz);
+#ifndef __MINGW64_VERSION_MAJOR
struct tm *gmtime_r(const time_t *timep, struct tm *result);
struct tm *localtime_r(const time_t *timep, struct tm *result);
+#endif
int getpagesize(void); /* defined in MinGW's libgcc.a */
struct passwd *getpwuid(uid_t uid);
int setitimer(int type, struct itimerval *in, struct itimerval *out);
@@ -210,6 +230,9 @@ FILE *mingw_freopen (const char *filename, const char *otype, FILE *stream);
int mingw_fflush(FILE *stream);
#define fflush mingw_fflush
+ssize_t mingw_write(int fd, const void *buf, size_t len);
+#define write mingw_write
+
int mingw_access(const char *filename, int mode);
#undef access
#define access mingw_access
@@ -298,8 +321,10 @@ static inline int getrlimit(int resource, struct rlimit *rlp)
/*
* Use mingw specific stat()/lstat()/fstat() implementations on Windows.
*/
+#ifndef __MINGW64_VERSION_MAJOR
#define off_t off64_t
#define lseek _lseeki64
+#endif
/* use struct stat with 64 bit st_size */
#ifdef stat
@@ -358,7 +383,10 @@ HANDLE winansi_get_osfhandle(int fd);
* git specific compatibility
*/
-#define has_dos_drive_prefix(path) (isalpha(*(path)) && (path)[1] == ':')
+#define has_dos_drive_prefix(path) \
+ (isalpha(*(path)) && (path)[1] == ':' ? 2 : 0)
+int mingw_skip_dos_drive_prefix(char **path);
+#define skip_dos_drive_prefix mingw_skip_dos_drive_prefix
#define is_dir_sep(c) ((c) == '/' || (c) == '\\')
static inline char *mingw_find_last_dir_sep(const char *path)
{
@@ -372,8 +400,12 @@ static inline char *mingw_find_last_dir_sep(const char *path)
int mingw_offset_1st_component(const char *path);
#define offset_1st_component mingw_offset_1st_component
#define PATH_SEP ';'
+#ifndef __MINGW64_VERSION_MAJOR
#define PRIuMAX "I64u"
#define PRId64 "I64d"
+#else
+#include <inttypes.h>
+#endif
void mingw_open_html(const char *path);
#define open_html mingw_open_html
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
index f216a2a..b833ff9 100644
--- a/compat/nedmalloc/malloc.c.h
+++ b/compat/nedmalloc/malloc.c.h
@@ -720,6 +720,9 @@ struct mallinfo {
inlining are defined as macros, so these aren't used for them.
*/
+#ifdef __MINGW64_VERSION_MAJOR
+#undef FORCEINLINE
+#endif
#ifndef FORCEINLINE
#if defined(__GNUC__)
#define FORCEINLINE __inline __attribute__ ((always_inline))
@@ -1382,6 +1385,7 @@ LONG __cdecl _InterlockedExchange(LONG volatile *Target, LONG Value);
/*** Atomic operations ***/
#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100
+ #undef _ReadWriteBarrier
#define _ReadWriteBarrier() __sync_synchronize()
#else
static __inline__ __attribute__((always_inline)) long __sync_lock_test_and_set(volatile long * const Target, const long Value)
@@ -1798,9 +1802,10 @@ struct win32_mlock_t
volatile long threadid;
};
+static inline int return_0(int i) { return 0; }
#define MLOCK_T struct win32_mlock_t
#define CURRENT_THREAD win32_getcurrentthreadid()
-#define INITIAL_LOCK(sl) (memset(sl, 0, sizeof(MLOCK_T)), 0)
+#define INITIAL_LOCK(sl) (memset(sl, 0, sizeof(MLOCK_T)), return_0(0))
#define ACQUIRE_LOCK(sl) win32_acquire_lock(sl)
#define RELEASE_LOCK(sl) win32_release_lock(sl)
#define TRY_LOCK(sl) win32_try_lock(sl)
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index db4e03e..b10adc7 100644
--- a/compat/poll/poll.c
+++ b/compat/poll/poll.c
@@ -76,7 +76,7 @@
#ifdef WIN32_NATIVE
-#define IsConsoleHandle(h) (((long) (h) & 3) == 3)
+#define IsConsoleHandle(h) (((long) (intptr_t) (h) & 3) == 3)
static BOOL
IsSocketHandle (HANDLE h)
diff --git a/compat/terminal.c b/compat/terminal.c
index 313897d..fa13ee6 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -122,7 +122,7 @@ char *git_terminal_prompt(const char *prompt, int echo)
fputs(prompt, output_fh);
fflush(output_fh);
- r = strbuf_getline(&buf, input_fh, '\n');
+ r = strbuf_getline_lf(&buf, input_fh);
if (!echo) {
putc('\n', output_fh);
fflush(output_fh);
diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h
index 8ad1873..20b35a2 100644
--- a/compat/win32/pthread.h
+++ b/compat/win32/pthread.h
@@ -18,7 +18,10 @@
*/
#define pthread_mutex_t CRITICAL_SECTION
-#define pthread_mutex_init(a,b) (InitializeCriticalSection((a)), 0)
+static inline int return_0(int i) {
+ return 0;
+}
+#define pthread_mutex_init(a,b) return_0((InitializeCriticalSection((a)), 0))
#define pthread_mutex_destroy(a) DeleteCriticalSection((a))
#define pthread_mutex_lock EnterCriticalSection
#define pthread_mutex_unlock LeaveCriticalSection
@@ -77,7 +80,7 @@ extern pthread_t pthread_self(void);
static inline int pthread_exit(void *ret)
{
- ExitThread((DWORD)ret);
+ ExitThread((DWORD)(intptr_t)ret);
}
typedef DWORD pthread_key_t;
diff --git a/compat/winansi.c b/compat/winansi.c
index ceff55b..5dfa5ed 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -23,6 +23,7 @@ static HANDLE hthread, hread, hwrite;
static HANDLE hconsole1, hconsole2;
#ifdef __MINGW32__
+#if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 5
typedef struct _CONSOLE_FONT_INFOEX {
ULONG cbSize;
DWORD nFont;
@@ -32,6 +33,7 @@ typedef struct _CONSOLE_FONT_INFOEX {
WCHAR FaceName[LF_FACESIZE];
} CONSOLE_FONT_INFOEX, *PCONSOLE_FONT_INFOEX;
#endif
+#endif
typedef BOOL (WINAPI *PGETCURRENTCONSOLEFONTEX)(HANDLE, BOOL,
PCONSOLE_FONT_INFOEX);
@@ -452,7 +454,8 @@ static HANDLE duplicate_handle(HANDLE hnd)
HANDLE hresult, hproc = GetCurrentProcess();
if (!DuplicateHandle(hproc, hnd, hproc, &hresult, 0, TRUE,
DUPLICATE_SAME_ACCESS))
- die_lasterr("DuplicateHandle(%li) failed", (long) hnd);
+ die_lasterr("DuplicateHandle(%li) failed",
+ (long) (intptr_t) hnd);
return hresult;
}
diff --git a/config.mak.uname b/config.mak.uname
index f34dcaa..4b2e1b8 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -518,13 +518,12 @@ ifneq (,$(findstring MINGW,$(uname_S)))
NO_INET_NTOP = YesPlease
NO_POSIX_GOODIES = UnfortunatelyYes
DEFAULT_HELP_FORMAT = html
- COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32
+ COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
compat/win32/pthread.o compat/win32/syslog.o \
compat/win32/dirent.o
BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1
- BASIC_LDFLAGS += -Wl,--large-address-aware
EXTLIBS += -lws2_32
GITLIBS += git.res
PTHREAD_LIBS =
@@ -541,8 +540,34 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
INTERNAL_QSORT = YesPlease
HAVE_LIBCHARSET_H = YesPlease
NO_GETTEXT = YesPlease
+ COMPAT_CLFAGS += -D__USE_MINGW_ACCESS
else
- NO_CURL = YesPlease
+ ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
+ # MSys2
+ prefix = /usr/
+ ifeq (MINGW32,$(MSYSTEM))
+ prefix = /mingw32
+ endif
+ ifeq (MINGW64,$(MSYSTEM))
+ prefix = /mingw64
+ else
+ COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
+ BASIC_LDFLAGS += -Wl,--large-address-aware
+ endif
+ CC = gcc
+ COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0
+ INSTALL = /bin/install
+ NO_R_TO_GCC_LINKER = YesPlease
+ INTERNAL_QSORT = YesPlease
+ HAVE_LIBCHARSET_H = YesPlease
+ NO_GETTEXT = YesPlease
+ USE_LIBPCRE= YesPlease
+ NO_CURL =
+ USE_NED_ALLOCATOR = YesPlease
+ else
+ COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
+ NO_CURL = YesPlease
+ endif
endif
endif
ifeq ($(uname_S),QNX)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index a429e6e..45ec47f 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -664,6 +664,7 @@ __git_list_porcelain_commands ()
check-mailmap) : plumbing;;
check-ref-format) : plumbing;;
checkout-index) : plumbing;;
+ column) : internal helper;;
commit-tree) : plumbing;;
count-objects) : infrequent;;
credential) : credentials;;
@@ -1168,7 +1169,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
--no-prefix --src-prefix= --dst-prefix=
--inter-hunk-context=
--patience --histogram --minimal
- --raw --word-diff
+ --raw --word-diff --word-diff-regex=
--dirstat --dirstat= --dirstat-by-file
--dirstat-by-file= --cumulative
--diff-algorithm=
@@ -1311,6 +1312,7 @@ _git_grep ()
--full-name --line-number
--extended-regexp --basic-regexp --fixed-strings
--perl-regexp
+ --threads
--files-with-matches --name-only
--files-without-match
--max-depth
@@ -1686,8 +1688,12 @@ _git_rebase ()
--preserve-merges --stat --no-stat
--committer-date-is-author-date --ignore-date
--ignore-whitespace --whitespace=
- --autosquash --fork-point --no-fork-point
- --autostash
+ --autosquash --no-autosquash
+ --fork-point --no-fork-point
+ --autostash --no-autostash
+ --verify --no-verify
+ --keep-empty --root --force-rebase --no-ff
+ --exec
"
return
@@ -1807,7 +1813,7 @@ _git_config ()
return
;;
branch.*.rebase)
- __gitcomp "false true"
+ __gitcomp "false true preserve interactive"
return
;;
remote.pushdefault)
@@ -2368,7 +2374,7 @@ _git_show_branch ()
case "$cur" in
--*)
__gitcomp "
- --all --remotes --topo-order --current --more=
+ --all --remotes --topo-order --date-order --current --more=
--list --independent --merge-base --no-name
--color --no-color
--sha1-name --sparse --topics --reflog
@@ -2381,7 +2387,7 @@ _git_show_branch ()
_git_stash ()
{
- local save_opts='--keep-index --no-keep-index --quiet --patch'
+ local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
local subcommands='save list show apply clear drop pop create branch'
local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then
@@ -2403,9 +2409,20 @@ _git_stash ()
apply,--*|pop,--*)
__gitcomp "--index --quiet"
;;
- show,--*|drop,--*|branch,--*)
+ drop,--*)
+ __gitcomp "--quiet"
+ ;;
+ show,--*|branch,--*)
+ ;;
+ branch,*)
+ if [ $cword -eq 3 ]; then
+ __gitcomp_nl "$(__git_refs)";
+ else
+ __gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
+ | sed -n -e 's/:.*//p')"
+ fi
;;
- show,*|apply,*|drop,*|pop,*|branch,*)
+ show,*|apply,*|drop,*|pop,*)
__gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
| sed -n -e 's/:.*//p')"
;;
diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
index 934505b..86c9cfa 100755
--- a/contrib/examples/git-commit.sh
+++ b/contrib/examples/git-commit.sh
@@ -574,10 +574,10 @@ then
if test "$templatefile" != ""
then
# Test whether this is just the unaltered template.
- if cnt=`sed -e '/^#/d' < "$templatefile" |
+ if cnt=$(sed -e '/^#/d' < "$templatefile" |
git stripspace |
diff "$GIT_DIR"/COMMIT_BAREMSG - |
- wc -l` &&
+ wc -l) &&
test 0 -lt $cnt
then
have_commitmsg=t
@@ -630,8 +630,8 @@ then
fi
if test -z "$quiet"
then
- commit=`git diff-tree --always --shortstat --pretty="format:%h: %s"\
- --abbrev --summary --root HEAD --`
+ commit=$(git diff-tree --always --shortstat --pretty="format:%h: %s"\
+ --abbrev --summary --root HEAD --)
echo "Created${initial_commit:+ initial} commit $commit"
fi
fi
diff --git a/contrib/examples/git-fetch.sh b/contrib/examples/git-fetch.sh
index 5540709..57d2e56 100755
--- a/contrib/examples/git-fetch.sh
+++ b/contrib/examples/git-fetch.sh
@@ -146,13 +146,13 @@ esac
reflist=$(get_remote_refs_for_fetch "$@")
if test "$tags"
then
- taglist=`IFS=' ' &&
+ taglist=$(IFS=' ' &&
echo "$ls_remote_result" |
git show-ref --exclude-existing=refs/tags/ |
while read sha1 name
do
echo ".${name}:${name}"
- done` || exit
+ done) || exit
if test "$#" -gt 1
then
# remote URL plus explicit refspecs; we need to merge them.
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 52f2aaf..ee99f1a 100755
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -523,10 +523,10 @@ do
if test "$exit" -eq 1
then
- cnt=`{
+ cnt=$({
git diff-files --name-only
git ls-files --unmerged
- } | wc -l`
+ } | wc -l)
if test $best_cnt -le 0 || test $cnt -le $best_cnt
then
best_strategy=$strategy
diff --git a/contrib/examples/git-repack.sh b/contrib/examples/git-repack.sh
index 96e3fed..672af93 100755
--- a/contrib/examples/git-repack.sh
+++ b/contrib/examples/git-repack.sh
@@ -67,8 +67,8 @@ case ",$all_into_one," in
,t,)
args= existing=
if [ -d "$PACKDIR" ]; then
- for e in `cd "$PACKDIR" && find . -type f -name '*.pack' \
- | sed -e 's/^\.\///' -e 's/\.pack$//'`
+ for e in $(cd "$PACKDIR" && find . -type f -name '*.pack' \
+ | sed -e 's/^\.\///' -e 's/\.pack$//')
do
if [ -e "$PACKDIR/$e.keep" ]; then
: keep
diff --git a/contrib/examples/git-revert.sh b/contrib/examples/git-revert.sh
index 7e2aad5..197838d 100755
--- a/contrib/examples/git-revert.sh
+++ b/contrib/examples/git-revert.sh
@@ -138,8 +138,8 @@ cherry-pick)
}'
logmsg=$(git show -s --pretty=raw --encoding="$encoding" "$commit")
- set_author_env=`echo "$logmsg" |
- LANG=C LC_ALL=C sed -ne "$pick_author_script"`
+ set_author_env=$(echo "$logmsg" |
+ LANG=C LC_ALL=C sed -ne "$pick_author_script")
eval "$set_author_env"
export GIT_AUTHOR_NAME
export GIT_AUTHOR_EMAIL
@@ -160,9 +160,9 @@ cherry-pick)
esac >.msg
eval GITHEAD_$head=HEAD
-eval GITHEAD_$next='`git show -s \
+eval GITHEAD_$next='$(git show -s \
--pretty=oneline --encoding="$encoding" "$commit" |
- sed -e "s/^[^ ]* //"`'
+ sed -e "s/^[^ ]* //")'
export GITHEAD_$head GITHEAD_$next
# This three way merge is an interesting one. We are at
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 3071baf..6afa9aa 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -37,6 +37,7 @@ GIT_SUBTREE_DOC := git-subtree.1
GIT_SUBTREE_XML := git-subtree.xml
GIT_SUBTREE_TXT := git-subtree.txt
GIT_SUBTREE_HTML := git-subtree.html
+GIT_SUBTREE_TEST := ../../git-subtree
all:: $(GIT_SUBTREE)
@@ -71,7 +72,10 @@ $(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)
$(ASCIIDOC) -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
-agit_version=$(GIT_VERSION) $^
-test:
+$(GIT_SUBTREE_TEST): $(GIT_SUBTREE)
+ cp $< $@
+
+test: $(GIT_SUBTREE_TEST)
$(MAKE) -C t/ test
clean:
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index edf36f8..7a39b30 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -245,7 +245,10 @@ find_latest_squash()
case "$a" in
START) sq="$b" ;;
git-subtree-mainline:) main="$b" ;;
- git-subtree-split:) sub="$b" ;;
+ git-subtree-split:)
+ sub="$(git rev-parse "$b^0")" ||
+ die "could not rev-parse split hash $b from commit $sq"
+ ;;
END)
if [ -n "$sub" ]; then
if [ -n "$main" ]; then
@@ -278,7 +281,10 @@ find_existing_splits()
case "$a" in
START) sq="$b" ;;
git-subtree-mainline:) main="$b" ;;
- git-subtree-split:) sub="$b" ;;
+ git-subtree-split:)
+ sub="$(git rev-parse "$b^0")" ||
+ die "could not rev-parse split hash $b from commit $sq"
+ ;;
END)
debug " Main is: '$main'"
if [ -z "$main" -a -n "$sub" ]; then
@@ -479,8 +485,16 @@ copy_or_skip()
p="$p -p $parent"
fi
done
-
- if [ -n "$identical" ]; then
+
+ copycommit=
+ if [ -n "$identical" ] && [ -n "$nonidentical" ]; then
+ extras=$(git rev-list --count $identical..$nonidentical)
+ if [ "$extras" -ne 0 ]; then
+ # we need to preserve history along the other branch
+ copycommit=1
+ fi
+ fi
+ if [ -n "$identical" ] && [ -z "$copycommit" ]; then
echo $identical
else
copy_commit $rev $tree "$p" || exit $?
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 751aee3..3bf96a9 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -1014,4 +1014,64 @@ test_expect_success 'push split to subproj' '
)
'
+#
+# This test covers 2 cases in subtree split copy_or_skip code
+# 1) Merges where one parent is a superset of the changes of the other
+# parent regarding changes to the subtree, in this case the merge
+# commit should be copied
+# 2) Merges where only one parent operate on the subtree, and the merge
+# commit should be skipped
+#
+# (1) is checked by ensuring subtree_tip is a descendent of subtree_branch
+# (2) should have a check added (not_a_subtree_change shouldn't be present
+# on the produced subtree)
+#
+# Other related cases which are not tested (or currently handled correctly)
+# - Case (1) where there are more than 2 parents, it will sometimes correctly copy
+# the merge, and sometimes not
+# - Merge commit where both parents have same tree as the merge, currently
+# will always be skipped, even if they reached that state via different
+# set of commits.
+#
+
+next_test
+test_expect_success 'subtree descendant check' '
+ subtree_test_create_repo "$subtree_test_count" &&
+ test_create_commit "$subtree_test_count" folder_subtree/a &&
+ (
+ cd "$subtree_test_count" &&
+ git branch branch
+ ) &&
+ test_create_commit "$subtree_test_count" folder_subtree/0 &&
+ test_create_commit "$subtree_test_count" folder_subtree/b &&
+ cherry=$(cd "$subtree_test_count"; git rev-parse HEAD) &&
+ (
+ cd "$subtree_test_count" &&
+ git checkout branch
+ ) &&
+ test_create_commit "$subtree_test_count" commit_on_branch &&
+ (
+ cd "$subtree_test_count" &&
+ git cherry-pick $cherry &&
+ git checkout master &&
+ git merge -m "merge should be kept on subtree" branch &&
+ git branch no_subtree_work_branch
+ ) &&
+ test_create_commit "$subtree_test_count" folder_subtree/d &&
+ (
+ cd "$subtree_test_count" &&
+ git checkout no_subtree_work_branch
+ ) &&
+ test_create_commit "$subtree_test_count" not_a_subtree_change &&
+ (
+ cd "$subtree_test_count" &&
+ git checkout master &&
+ git merge -m "merge should be skipped on subtree" no_subtree_work_branch &&
+
+ git subtree split --prefix folder_subtree/ --branch subtree_tip master &&
+ git subtree split --prefix folder_subtree/ --branch subtree_branch branch &&
+ check_equal $(git rev-list --count subtree_tip..subtree_branch) 0
+ )
+'
+
test_done
diff --git a/contrib/thunderbird-patch-inline/appp.sh b/contrib/thunderbird-patch-inline/appp.sh
index 8dc73ec..1053872 100755
--- a/contrib/thunderbird-patch-inline/appp.sh
+++ b/contrib/thunderbird-patch-inline/appp.sh
@@ -31,8 +31,8 @@ BODY=$(sed -e "1,/${SEP}/d" $1)
CMT_MSG=$(sed -e '1,/^$/d' -e '/^---$/,$d' "${PATCH}")
DIFF=$(sed -e '1,/^---$/d' "${PATCH}")
-CCS=`echo -e "$CMT_MSG\n$HEADERS" | sed -n -e 's/^Cc: \(.*\)$/\1,/gp' \
- -e 's/^Signed-off-by: \(.*\)/\1,/gp'`
+CCS=$(echo -e "$CMT_MSG\n$HEADERS" | sed -n -e 's/^Cc: \(.*\)$/\1,/gp' \
+ -e 's/^Signed-off-by: \(.*\)/\1,/gp')
echo "$SUBJECT" > $1
echo "Cc: $CCS" >> $1
diff --git a/convert.c b/convert.c
index 814e814..4bb4ec1 100644
--- a/convert.c
+++ b/convert.c
@@ -13,6 +13,11 @@
* translation when the "text" attribute or "auto_crlf" option is set.
*/
+/* Stat bits: When BIN is set, the txt bits are unset */
+#define CONVERT_STAT_BITS_TXT_LF 0x1
+#define CONVERT_STAT_BITS_TXT_CRLF 0x2
+#define CONVERT_STAT_BITS_BIN 0x4
+
enum crlf_action {
CRLF_GUESS = -1,
CRLF_BINARY = 0,
@@ -75,26 +80,75 @@ static void gather_stats(const char *buf, unsigned long size, struct text_stat *
/*
* The same heuristics as diff.c::mmfile_is_binary()
+ * We treat files with bare CR as binary
*/
-static int is_binary(unsigned long size, struct text_stat *stats)
+static int convert_is_binary(unsigned long size, const struct text_stat *stats)
{
-
+ if (stats->cr != stats->crlf)
+ return 1;
if (stats->nul)
return 1;
if ((stats->printable >> 7) < stats->nonprintable)
return 1;
- /*
- * Other heuristics? Average line length might be relevant,
- * as might LF vs CR vs CRLF counts..
- *
- * NOTE! It might be normal to have a low ratio of CRLF to LF
- * (somebody starts with a LF-only file and edits it with an editor
- * that adds CRLF only to lines that are added..). But do we
- * want to support CR-only? Probably not.
- */
return 0;
}
+static unsigned int gather_convert_stats(const char *data, unsigned long size)
+{
+ struct text_stat stats;
+ if (!data || !size)
+ return 0;
+ gather_stats(data, size, &stats);
+ if (convert_is_binary(size, &stats))
+ return CONVERT_STAT_BITS_BIN;
+ else if (stats.crlf && stats.crlf == stats.lf)
+ return CONVERT_STAT_BITS_TXT_CRLF;
+ else if (stats.crlf && stats.lf)
+ return CONVERT_STAT_BITS_TXT_CRLF | CONVERT_STAT_BITS_TXT_LF;
+ else if (stats.lf)
+ return CONVERT_STAT_BITS_TXT_LF;
+ else
+ return 0;
+}
+
+static const char *gather_convert_stats_ascii(const char *data, unsigned long size)
+{
+ unsigned int convert_stats = gather_convert_stats(data, size);
+
+ if (convert_stats & CONVERT_STAT_BITS_BIN)
+ return "-text";
+ switch (convert_stats) {
+ case CONVERT_STAT_BITS_TXT_LF:
+ return "lf";
+ case CONVERT_STAT_BITS_TXT_CRLF:
+ return "crlf";
+ case CONVERT_STAT_BITS_TXT_LF | CONVERT_STAT_BITS_TXT_CRLF:
+ return "mixed";
+ default:
+ return "none";
+ }
+}
+
+const char *get_cached_convert_stats_ascii(const char *path)
+{
+ const char *ret;
+ unsigned long sz;
+ void *data = read_blob_data_from_cache(path, &sz);
+ ret = gather_convert_stats_ascii(data, sz);
+ free(data);
+ return ret;
+}
+
+const char *get_wt_convert_stats_ascii(const char *path)
+{
+ const char *ret = "";
+ struct strbuf sb = STRBUF_INIT;
+ if (strbuf_read_file(&sb, path, 0) >= 0)
+ ret = gather_convert_stats_ascii(sb.buf, sb.len);
+ strbuf_release(&sb);
+ return ret;
+}
+
static enum eol output_eol(enum crlf_action crlf_action)
{
switch (crlf_action) {
@@ -187,18 +241,7 @@ static int crlf_to_git(const char *path, const char *src, size_t len,
gather_stats(src, len, &stats);
if (crlf_action == CRLF_AUTO || crlf_action == CRLF_GUESS) {
- /*
- * We're currently not going to even try to convert stuff
- * that has bare CR characters. Does anybody do that crazy
- * stuff?
- */
- if (stats.cr != stats.crlf)
- return 0;
-
- /*
- * And add some heuristics for binary vs text, of course...
- */
- if (is_binary(len, &stats))
+ if (convert_is_binary(len, &stats))
return 0;
if (crlf_action == CRLF_GUESS) {
@@ -277,11 +320,7 @@ static int crlf_to_worktree(const char *path, const char *src, size_t len,
return 0;
}
- /* If we have any bare CR characters, we're not going to touch it */
- if (stats.cr != stats.crlf)
- return 0;
-
- if (is_binary(len, &stats))
+ if (convert_is_binary(len, &stats))
return 0;
}
@@ -777,6 +816,30 @@ int would_convert_to_git_filter_fd(const char *path)
return apply_filter(path, NULL, 0, -1, NULL, ca.drv->clean);
}
+const char *get_convert_attr_ascii(const char *path)
+{
+ struct conv_attrs ca;
+ enum crlf_action crlf_action;
+
+ convert_attrs(&ca, path);
+ crlf_action = input_crlf_action(ca.crlf_action, ca.eol_attr);
+ switch (crlf_action) {
+ case CRLF_GUESS:
+ return "";
+ case CRLF_BINARY:
+ return "-text";
+ case CRLF_TEXT:
+ return "text";
+ case CRLF_INPUT:
+ return "text eol=lf";
+ case CRLF_CRLF:
+ return "text=auto eol=crlf";
+ case CRLF_AUTO:
+ return "text=auto";
+ }
+ return "";
+}
+
int convert_to_git(const char *path, const char *src, size_t len,
struct strbuf *dst, enum safe_crlf checksafe)
{
diff --git a/convert.h b/convert.h
index d9d853c..ccf436b 100644
--- a/convert.h
+++ b/convert.h
@@ -32,6 +32,9 @@ enum eol {
};
extern enum eol core_eol;
+extern const char *get_cached_convert_stats_ascii(const char *path);
+extern const char *get_wt_convert_stats_ascii(const char *path);
+extern const char *get_convert_attr_ascii(const char *path);
/* returns 1 if *dst was used */
extern int convert_to_git(const char *path, const char *src, size_t len,
diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c
index 9365f2c..cc65a9c 100644
--- a/credential-cache--daemon.c
+++ b/credential-cache--daemon.c
@@ -96,12 +96,12 @@ static int read_request(FILE *fh, struct credential *c,
static struct strbuf item = STRBUF_INIT;
const char *p;
- strbuf_getline(&item, fh, '\n');
+ strbuf_getline_lf(&item, fh);
if (!skip_prefix(item.buf, "action=", &p))
return error("client sent bogus action line: %s", item.buf);
strbuf_addstr(action, p);
- strbuf_getline(&item, fh, '\n');
+ strbuf_getline_lf(&item, fh);
if (!skip_prefix(item.buf, "timeout=", &p))
return error("client sent bogus timeout line: %s", item.buf);
*timeout = atoi(p);
diff --git a/credential-store.c b/credential-store.c
index fc67d16..5714167 100644
--- a/credential-store.c
+++ b/credential-store.c
@@ -23,7 +23,7 @@ static int parse_credential_file(const char *fn,
return found_credential;
}
- while (strbuf_getline(&line, fh, '\n') != EOF) {
+ while (strbuf_getline_lf(&line, fh) != EOF) {
credential_from_url(&entry, line.buf);
if (entry.username && entry.password &&
credential_match(c, &entry)) {
@@ -64,8 +64,7 @@ static void rewrite_credential_file(const char *fn, struct credential *c,
print_line(extra);
parse_credential_file(fn, c, NULL, print_line);
if (commit_lock_file(&credential_lock) < 0)
- die_errno("unable to write credential store: %s",
- strerror(errno));
+ die_errno("unable to write credential store");
}
static void store_credential_file(const char *fn, struct credential *c)
diff --git a/credential.c b/credential.c
index b146ad8..7d6501d 100644
--- a/credential.c
+++ b/credential.c
@@ -142,7 +142,7 @@ int credential_read(struct credential *c, FILE *fp)
{
struct strbuf line = STRBUF_INIT;
- while (strbuf_getline(&line, fp, '\n') != EOF) {
+ while (strbuf_getline_lf(&line, fp) != EOF) {
char *key = line.buf;
char *value = strchr(key, '=');
diff --git a/daemon.c b/daemon.c
index be70cd4..46b411c 100644
--- a/daemon.c
+++ b/daemon.c
@@ -424,7 +424,7 @@ static void copy_to_log(int fd)
return;
}
- while (strbuf_getline(&line, fp, '\n') != EOF) {
+ while (strbuf_getline_lf(&line, fp) != EOF) {
logerror("%s", line.buf);
strbuf_setlen(&line, 0);
}
diff --git a/diff-no-index.c b/diff-no-index.c
index 8e0fd27..03daadb 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -237,12 +237,12 @@ static void fixup_paths(const char **path, struct strbuf *replacement)
}
void diff_no_index(struct rev_info *revs,
- int argc, const char **argv,
- const char *prefix)
+ int argc, const char **argv)
{
int i, prefixlen;
const char *paths[2];
struct strbuf replacement = STRBUF_INIT;
+ const char *prefix = revs->prefix;
diff_setup(&revs->diffopt);
for (i = 1; i < argc - 2; ) {
@@ -252,7 +252,8 @@ void diff_no_index(struct rev_info *revs,
else if (!strcmp(argv[i], "--"))
i++;
else {
- j = diff_opt_parse(&revs->diffopt, argv + i, argc - i);
+ j = diff_opt_parse(&revs->diffopt, argv + i, argc - i,
+ revs->prefix);
if (j <= 0)
die("invalid diff option/value: %s", argv[i]);
i += j;
diff --git a/diff.c b/diff.c
index 80eb0c2..2136b69 100644
--- a/diff.c
+++ b/diff.c
@@ -3693,12 +3693,16 @@ static int parse_ws_error_highlight(struct diff_options *opt, const char *arg)
return 1;
}
-int diff_opt_parse(struct diff_options *options, const char **av, int ac)
+int diff_opt_parse(struct diff_options *options,
+ const char **av, int ac, const char *prefix)
{
const char *arg = av[0];
const char *optarg;
int argcount;
+ if (!prefix)
+ prefix = "";
+
/* Output format options */
if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch")
|| opt_arg(arg, 'U', "unified", &options->context))
@@ -3915,7 +3919,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
else if (!strcmp(arg, "--pickaxe-regex"))
options->pickaxe_opts |= DIFF_PICKAXE_REGEX;
else if ((argcount = short_opt('O', av, &optarg))) {
- options->orderfile = optarg;
+ const char *path = prefix_filename(prefix, strlen(prefix), optarg);
+ options->orderfile = xstrdup(path);
return argcount;
}
else if ((argcount = parse_long_opt("diff-filter", av, &optarg))) {
@@ -3954,9 +3959,10 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
else if (!strcmp(arg, "--no-function-context"))
DIFF_OPT_CLR(options, FUNCCONTEXT);
else if ((argcount = parse_long_opt("output", av, &optarg))) {
- options->file = fopen(optarg, "w");
+ const char *path = prefix_filename(prefix, strlen(prefix), optarg);
+ options->file = fopen(path, "w");
if (!options->file)
- die_errno("Could not open '%s'", optarg);
+ die_errno("Could not open '%s'", path);
options->close_file = 1;
return argcount;
} else
diff --git a/diff.h b/diff.h
index f7208ad..70b2d70 100644
--- a/diff.h
+++ b/diff.h
@@ -91,7 +91,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
#define DIFF_OPT_FUNCCONTEXT (1 << 29)
#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
-#define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1 << 31)
+#define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1U << 31)
#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
#define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags & DIFF_OPT_##flag)
@@ -268,7 +268,7 @@ extern int parse_long_opt(const char *opt, const char **argv,
extern int git_diff_basic_config(const char *var, const char *value, void *cb);
extern int git_diff_ui_config(const char *var, const char *value, void *cb);
extern void diff_setup(struct diff_options *);
-extern int diff_opt_parse(struct diff_options *, const char **, int);
+extern int diff_opt_parse(struct diff_options *, const char **, int, const char *);
extern void diff_setup_done(struct diff_options *);
#define DIFF_DETECT_RENAME 1
@@ -345,7 +345,7 @@ extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
extern int diff_result_code(struct diff_options *, int);
-extern void diff_no_index(struct rev_info *, int, const char **, const char *);
+extern void diff_no_index(struct rev_info *, int, const char **);
extern int index_differs_from(const char *def, int diff_flags);
diff --git a/dir.c b/dir.c
index 42d3b6b..f0b6d0a 100644
--- a/dir.c
+++ b/dir.c
@@ -564,9 +564,7 @@ void clear_exclude_list(struct exclude_list *el)
free(el->excludes);
free(el->filebuf);
- el->nr = 0;
- el->excludes = NULL;
- el->filebuf = NULL;
+ memset(el, 0, sizeof(*el));
}
static void trim_trailing_spaces(char *buf)
@@ -882,25 +880,6 @@ int match_pathname(const char *pathname, int pathlen,
*/
if (!patternlen && !namelen)
return 1;
- /*
- * This can happen when we ignore some exclude rules
- * on directories in other to see if negative rules
- * may match. E.g.
- *
- * /abc
- * !/abc/def/ghi
- *
- * The pattern of interest is "/abc". On the first
- * try, we should match path "abc" with this pattern
- * in the "if" statement right above, but the caller
- * ignores it.
- *
- * On the second try with paths within "abc",
- * e.g. "abc/xyz", we come here and try to match it
- * with "/abc".
- */
- if (!patternlen && namelen && *name == '/')
- return 1;
}
return fnmatch_icase_mem(pattern, patternlen,
@@ -909,48 +888,6 @@ int match_pathname(const char *pathname, int pathlen,
}
/*
- * Return non-zero if pathname is a directory and an ancestor of the
- * literal path in a (negative) pattern. This is used to keep
- * descending in "foo" and "foo/bar" when the pattern is
- * "!foo/bar/.gitignore". "foo/notbar" will not be descended however.
- */
-static int match_neg_path(const char *pathname, int pathlen, int *dtype,
- const char *base, int baselen,
- const char *pattern, int prefix, int patternlen,
- int flags)
-{
- assert((flags & EXC_FLAG_NEGATIVE) && !(flags & EXC_FLAG_NODIR));
-
- if (*dtype == DT_UNKNOWN)
- *dtype = get_dtype(NULL, pathname, pathlen);
- if (*dtype != DT_DIR)
- return 0;
-
- if (*pattern == '/') {
- pattern++;
- patternlen--;
- prefix--;
- }
-
- if (baselen) {
- if (((pathlen < baselen && base[pathlen] == '/') ||
- pathlen == baselen) &&
- !strncmp_icase(pathname, base, pathlen))
- return 1;
- pathname += baselen + 1;
- pathlen -= baselen + 1;
- }
-
-
- if (prefix &&
- ((pathlen < prefix && pattern[pathlen] == '/') &&
- !strncmp_icase(pathname, pattern, pathlen)))
- return 1;
-
- return 0;
-}
-
-/*
* Scan the given exclude list in reverse to see whether pathname
* should be ignored. The first match (i.e. the last on the list), if
* any, determines the fate. Returns the exclude_list element which
@@ -963,7 +900,7 @@ static struct exclude *last_exclude_matching_from_list(const char *pathname,
struct exclude_list *el)
{
struct exclude *exc = NULL; /* undecided */
- int i, matched_negative_path = 0;
+ int i;
if (!el->nr)
return NULL; /* undefined */
@@ -998,18 +935,7 @@ static struct exclude *last_exclude_matching_from_list(const char *pathname,
exc = x;
break;
}
-
- if ((x->flags & EXC_FLAG_NEGATIVE) && !matched_negative_path &&
- match_neg_path(pathname, pathlen, dtype, x->base,
- x->baselen ? x->baselen - 1 : 0,
- exclude, prefix, x->patternlen, x->flags))
- matched_negative_path = 1;
- }
- if (exc &&
- !(exc->flags & EXC_FLAG_NEGATIVE) &&
- !(exc->flags & EXC_FLAG_NODIR) &&
- matched_negative_path)
- exc = NULL;
+ }
return exc;
}
diff --git a/environment.c b/environment.c
index b329024..6dec9d0 100644
--- a/environment.c
+++ b/environment.c
@@ -242,8 +242,6 @@ void set_git_work_tree(const char *new_work_tree)
}
git_work_tree_initialized = 1;
work_tree = xstrdup(real_path(new_work_tree));
- if (setenv(GIT_WORK_TREE_ENVIRONMENT, work_tree, 1))
- die("could not set GIT_WORK_TREE to '%s'", work_tree);
}
const char *get_git_work_tree(void)
diff --git a/fast-import.c b/fast-import.c
index 3c65edb..bf01b34 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1888,7 +1888,7 @@ static int read_next_command(void)
struct recent_command *rc;
strbuf_detach(&command_buf, NULL);
- stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
+ stdin_eof = strbuf_getline_lf(&command_buf, stdin);
if (stdin_eof)
return EOF;
@@ -1960,7 +1960,7 @@ static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res)
strbuf_detach(&command_buf, NULL);
for (;;) {
- if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
+ if (strbuf_getline_lf(&command_buf, stdin) == EOF)
die("EOF in data (terminator '%s' not found)", term);
if (term_len == command_buf.len
&& !strcmp(term, command_buf.buf))
diff --git a/git-compat-util.h b/git-compat-util.h
index 8e39867..693a336 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -253,6 +253,8 @@ struct itimerval {
#else
#define basename gitbasename
extern char *gitbasename(char *);
+#define dirname gitdirname
+extern char *gitdirname(char *);
#endif
#ifndef NO_ICONV
@@ -335,6 +337,14 @@ static inline int git_has_dos_drive_prefix(const char *path)
#define has_dos_drive_prefix git_has_dos_drive_prefix
#endif
+#ifndef skip_dos_drive_prefix
+static inline int git_skip_dos_drive_prefix(char **path)
+{
+ return 0;
+}
+#define skip_dos_drive_prefix git_skip_dos_drive_prefix
+#endif
+
#ifndef is_dir_sep
static inline int git_is_dir_sep(int c)
{
@@ -733,6 +743,7 @@ extern int xmkstemp_mode(char *template, int mode);
extern int odb_mkstemp(char *template, size_t limit, const char *pattern);
extern int odb_pack_keep(char *name, size_t namesz, const unsigned char *sha1);
extern char *xgetcwd(void);
+extern FILE *fopen_for_writing(const char *path);
#define REALLOC_ARRAY(x, alloc) (x) = xrealloc((x), (alloc) * sizeof(*(x)))
@@ -929,9 +940,6 @@ int access_or_die(const char *path, int mode, unsigned flag);
/* Warn on an inaccessible file that ought to be accessible */
void warn_on_inaccessible(const char *path);
-/* Get the passwd entry for the UID of the current process. */
-struct passwd *xgetpwuid_self(void);
-
#ifdef GMTIME_UNRELIABLE_ERRORS
struct tm *git_gmtime(const time_t *);
struct tm *git_gmtime_r(const time_t *, struct tm *);
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 98f1779..86b2ff1 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -404,7 +404,7 @@ while read commit parents; do
then
tree=$(git write-tree)
else
- tree="$commit^{tree}"
+ tree=$(git rev-parse "$commit^{tree}")
fi
workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
"$tree" $parentstr < ../message > ../map/$commit ||
diff --git a/git-gui/po/glossary/txt-to-pot.sh b/git-gui/po/glossary/txt-to-pot.sh
index 49bf7c5..8249915 100755
--- a/git-gui/po/glossary/txt-to-pot.sh
+++ b/git-gui/po/glossary/txt-to-pot.sh
@@ -11,7 +11,7 @@
if [ $# -eq 0 ]
then
cat <<!
-Usage: `basename $0` git-gui-glossary.txt > git-gui-glossary.pot
+Usage: $(basename $0) git-gui-glossary.txt > git-gui-glossary.pot
!
exit 1;
fi
@@ -33,7 +33,7 @@ cat <<!
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: `date +'%Y-%m-%d %H:%M%z'`\n"
+"POT-Creation-Date: $(date +'%Y-%m-%d %H:%M%z')\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"
diff --git a/git-p4.py b/git-p4.py
index 7a9dd6a..825b9f3 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -253,8 +253,8 @@ def p4_add(f):
def p4_delete(f):
p4_system(["delete", wildcard_encode(f)])
-def p4_edit(f):
- p4_system(["edit", wildcard_encode(f)])
+def p4_edit(f, *options):
+ p4_system(["edit"] + list(options) + [wildcard_encode(f)])
def p4_revert(f):
p4_system(["revert", wildcard_encode(f)])
@@ -822,39 +822,37 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
die("cannot use --changes-block-size with non-numeric revisions")
block_size = None
- # Accumulate change numbers in a dictionary to avoid duplicates
- changes = {}
+ changes = []
- for p in depotPaths:
- # Retrieve changes a block at a time, to prevent running
- # into a MaxResults/MaxScanRows error from the server.
+ # Retrieve changes a block at a time, to prevent running
+ # into a MaxResults/MaxScanRows error from the server.
- while True:
- cmd = ['changes']
+ while True:
+ cmd = ['changes']
- if block_size:
- end = min(changeEnd, changeStart + block_size)
- revisionRange = "%d,%d" % (changeStart, end)
- else:
- revisionRange = "%s,%s" % (changeStart, changeEnd)
+ if block_size:
+ end = min(changeEnd, changeStart + block_size)
+ revisionRange = "%d,%d" % (changeStart, end)
+ else:
+ revisionRange = "%s,%s" % (changeStart, changeEnd)
+ for p in depotPaths:
cmd += ["%s...@%s" % (p, revisionRange)]
- for line in p4_read_pipe_lines(cmd):
- changeNum = int(line.split(" ")[1])
- changes[changeNum] = True
+ # Insert changes in chronological order
+ for line in reversed(p4_read_pipe_lines(cmd)):
+ changes.append(int(line.split(" ")[1]))
- if not block_size:
- break
+ if not block_size:
+ break
- if end >= changeEnd:
- break
+ if end >= changeEnd:
+ break
- changeStart = end + 1
+ changeStart = end + 1
- changelist = changes.keys()
- changelist.sort()
- return changelist
+ changes = sorted(changes)
+ return changes
def p4PathStartsWith(path, prefix):
# This method tries to remedy a potential mixed-case issue:
@@ -1458,6 +1456,8 @@ class P4Submit(Command, P4UserMap):
Remove lines in the Files section that show changes to files
outside the depot path we're committing into."""
+ [upstream, settings] = findUpstreamBranchPoint()
+
template = ""
inFilesSection = False
for line in p4_read_pipe_lines(['change', '-o']):
@@ -1470,8 +1470,13 @@ class P4Submit(Command, P4UserMap):
lastTab = path.rfind("\t")
if lastTab != -1:
path = path[:lastTab]
- if not p4PathStartsWith(path, self.depotPath):
- continue
+ if settings.has_key('depot-paths'):
+ if not [p for p in settings['depot-paths']
+ if p4PathStartsWith(path, p)]:
+ continue
+ else:
+ if not p4PathStartsWith(path, self.depotPath):
+ continue
else:
inFilesSection = False
else:
@@ -1549,6 +1554,7 @@ class P4Submit(Command, P4UserMap):
diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (self.diffOpts, id, id))
filesToAdd = set()
+ filesToChangeType = set()
filesToDelete = set()
editedFiles = set()
pureRenameCopy = set()
@@ -1609,6 +1615,8 @@ class P4Submit(Command, P4UserMap):
os.unlink(dest)
filesToDelete.add(src)
editedFiles.add(dest)
+ elif modifier == "T":
+ filesToChangeType.add(path)
else:
die("unknown modifier %s for %s" % (modifier, path))
@@ -1668,6 +1676,8 @@ class P4Submit(Command, P4UserMap):
#
system(applyPatchCmd)
+ for f in filesToChangeType:
+ p4_edit(f, "-t", "auto")
for f in filesToAdd:
p4_add(f)
for f in filesToDelete:
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index b938a6d..c0cfe88 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -81,17 +81,13 @@ rewritten_pending="$state_dir"/rewritten-pending
# and leaves CR at the end instead.
cr=$(printf "\015")
-strategy_args=
-if test -n "$do_merge"
-then
- strategy_args=${strategy:+--strategy=$strategy}
- eval '
- for strategy_opt in '"$strategy_opts"'
- do
- strategy_args="$strategy_args -X$(git rev-parse --sq-quote "${strategy_opt#--}")"
- done
- '
-fi
+strategy_args=${strategy:+--strategy=$strategy}
+eval '
+ for strategy_opt in '"$strategy_opts"'
+ do
+ strategy_args="$strategy_args -X$(git rev-parse --sq-quote "${strategy_opt#--}")"
+ done
+'
GIT_CHERRY_PICK_HELP="$resolvemsg"
export GIT_CHERRY_PICK_HELP
diff --git a/git-rebase.sh b/git-rebase.sh
index af7ba5f..cf60c43 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -176,7 +176,7 @@ You can run "git stash pop" or "git stash drop" at any time.
finish_rebase () {
apply_autostash &&
- git gc --auto &&
+ { git gc --auto || true; } &&
rm -rf "$state_dir"
}
diff --git a/git-send-email.perl b/git-send-email.perl
index 2a3873b..d356901 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -524,8 +524,13 @@ my %parse_alias = (
if (/^\s*alias\s+(?:-group\s+\S+\s+)*(\S+)\s+(.*)$/) {
my ($alias, $addr) = ($1, $2);
$addr =~ s/#.*$//; # mutt allows # comments
- # commas delimit multiple addresses
- $aliases{$alias} = [ split_addrs($addr) ];
+ # commas delimit multiple addresses
+ my @addr = split_addrs($addr);
+
+ # quotes may be escaped in the file,
+ # unescape them so we do not double-escape them later.
+ s/\\"/"/g foreach @addr;
+ $aliases{$alias} = \@addr
}}},
mailrc => sub { my $fh = shift; while (<$fh>) {
if (/^alias\s+(\S+)\s+(.*)$/) {
@@ -1332,6 +1337,13 @@ Message-Id: $message_id
require Net::SMTP::SSL;
$smtp_domain ||= maildomain();
require IO::Socket::SSL;
+
+ # Suppress "variable accessed once" warning.
+ {
+ no warnings 'once';
+ $IO::Socket::SSL::DEBUG = 1;
+ }
+
# Net::SMTP::SSL->new() does not forward any SSL options
IO::Socket::SSL::set_client_defaults(
ssl_verify_params());
diff --git a/git.c b/git.c
index 6ed824c..da278c3 100644
--- a/git.c
+++ b/git.c
@@ -25,14 +25,14 @@ static const char *env_names[] = {
GIT_PREFIX_ENVIRONMENT
};
static char *orig_env[4];
-static int saved_environment;
+static int saved_env_before_alias;
-static void save_env(void)
+static void save_env_before_alias(void)
{
int i;
- if (saved_environment)
+ if (saved_env_before_alias)
return;
- saved_environment = 1;
+ saved_env_before_alias = 1;
orig_cwd = xgetcwd();
for (i = 0; i < ARRAY_SIZE(env_names); i++) {
orig_env[i] = getenv(env_names[i]);
@@ -41,13 +41,16 @@ static void save_env(void)
}
}
-static void restore_env(void)
+static void restore_env(int external_alias)
{
int i;
- if (orig_cwd && chdir(orig_cwd))
+ if (!external_alias && orig_cwd && chdir(orig_cwd))
die_errno("could not move to %s", orig_cwd);
free(orig_cwd);
for (i = 0; i < ARRAY_SIZE(env_names); i++) {
+ if (external_alias &&
+ !strcmp(env_names[i], GIT_PREFIX_ENVIRONMENT))
+ continue;
if (orig_env[i])
setenv(env_names[i], orig_env[i], 1);
else
@@ -226,14 +229,14 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
static int handle_alias(int *argcp, const char ***argv)
{
int envchanged = 0, ret = 0, saved_errno = errno;
- const char *subdir;
int count, option_count;
const char **new_argv;
const char *alias_command;
char *alias_string;
int unused_nongit;
- subdir = setup_git_directory_gently(&unused_nongit);
+ save_env_before_alias();
+ setup_git_directory_gently(&unused_nongit);
alias_command = (*argv)[0];
alias_string = alias_lookup(alias_command);
@@ -243,6 +246,7 @@ static int handle_alias(int *argcp, const char ***argv)
int argc = *argcp, i;
commit_pager_choice();
+ restore_env(1);
/* build alias_argv */
alias_argv = xmalloc(sizeof(*alias_argv) * (argc + 1));
@@ -291,8 +295,7 @@ static int handle_alias(int *argcp, const char ***argv)
ret = 1;
}
- if (subdir && chdir(subdir))
- die_errno("Cannot change to '%s'", subdir);
+ restore_env(0);
errno = saved_errno;
@@ -307,7 +310,6 @@ static int handle_alias(int *argcp, const char ***argv)
* RUN_SETUP for reading from the configuration file.
*/
#define NEED_WORK_TREE (1<<3)
-#define NO_SETUP (1<<4)
struct cmd_struct {
const char *cmd;
@@ -389,7 +391,7 @@ static struct cmd_struct commands[] = {
{ "cherry", cmd_cherry, RUN_SETUP },
{ "cherry-pick", cmd_cherry_pick, RUN_SETUP | NEED_WORK_TREE },
{ "clean", cmd_clean, RUN_SETUP | NEED_WORK_TREE },
- { "clone", cmd_clone, NO_SETUP },
+ { "clone", cmd_clone },
{ "column", cmd_column, RUN_SETUP_GENTLY },
{ "commit", cmd_commit, RUN_SETUP | NEED_WORK_TREE },
{ "commit-tree", cmd_commit_tree, RUN_SETUP },
@@ -415,8 +417,8 @@ static struct cmd_struct commands[] = {
{ "hash-object", cmd_hash_object },
{ "help", cmd_help },
{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY },
- { "init", cmd_init_db, NO_SETUP },
- { "init-db", cmd_init_db, NO_SETUP },
+ { "init", cmd_init_db },
+ { "init-db", cmd_init_db },
{ "interpret-trailers", cmd_interpret_trailers, RUN_SETUP_GENTLY },
{ "log", cmd_log, RUN_SETUP },
{ "ls-files", cmd_ls_files, RUN_SETUP },
@@ -530,9 +532,13 @@ static void handle_builtin(int argc, const char **argv)
builtin = get_builtin(cmd);
if (builtin) {
- if (saved_environment && (builtin->option & NO_SETUP))
- restore_env();
- else
+ /*
+ * XXX: if we can figure out cases where it is _safe_
+ * to do, we can avoid spawning a new process when
+ * saved_env_before_alias is true
+ * (i.e. setup_git_dir* has been run once)
+ */
+ if (!saved_env_before_alias)
exit(run_builtin(builtin, argc, argv));
}
}
@@ -590,7 +596,6 @@ static int run_argv(int *argcp, const char ***argv)
*/
if (done_alias)
break;
- save_env();
if (!handle_alias(argcp, argv))
break;
done_alias = 1;
diff --git a/gitk-git/gitk b/gitk-git/gitk
index fcc606e..5f1255c 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -1943,6 +1943,8 @@ proc confirm_popup {msg {owner .}} {
}
proc setoptions {} {
+ global use_ttk
+
if {[tk windowingsystem] ne "win32"} {
option add *Panedwindow.showHandle 1 startupFile
option add *Panedwindow.sashRelief raised startupFile
@@ -1965,6 +1967,18 @@ proc setoptions {} {
option add *Listbox.font mainfont startupFile
}
+proc setttkstyle {} {
+ eval font configure TkDefaultFont [fontflags mainfont]
+ eval font configure TkTextFont [fontflags textfont]
+ eval font configure TkHeadingFont [fontflags mainfont]
+ eval font configure TkCaptionFont [fontflags mainfont] -weight bold
+ eval font configure TkTooltipFont [fontflags uifont]
+ eval font configure TkFixedFont [fontflags textfont]
+ eval font configure TkIconFont [fontflags uifont]
+ eval font configure TkMenuFont [fontflags uifont]
+ eval font configure TkSmallCaptionFont [fontflags uifont]
+}
+
# Make a menu and submenus.
# m is the window name for the menu, items is the list of menu items to add.
# Each item is a list {mc label type description options...}
@@ -2251,7 +2265,7 @@ proc makewindow {} {
set h [expr {[font metrics uifont -linespace] + 2}]
set progresscanv .tf.bar.progress
canvas $progresscanv -relief sunken -height $h -borderwidth 2
- set progressitem [$progresscanv create rect -1 0 0 $h -fill green]
+ set progressitem [$progresscanv create rect -1 0 0 $h -fill lime]
set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
}
@@ -2347,6 +2361,9 @@ proc makewindow {} {
${NS}::frame .bleft.mid
${NS}::frame .bleft.bottom
+ # gap between sub-widgets
+ set wgap [font measure uifont "i"]
+
${NS}::button .bleft.top.search -text [mc "Search"] -command dosearch
pack .bleft.top.search -side left -padx 5
set sstring .bleft.top.sstring
@@ -2361,8 +2378,9 @@ proc makewindow {} {
-command changediffdisp -variable diffelide -value {0 1}
${NS}::radiobutton .bleft.mid.new -text [mc "New version"] \
-command changediffdisp -variable diffelide -value {1 0}
+
${NS}::label .bleft.mid.labeldiffcontext -text " [mc "Lines of context"]: "
- pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left
+ pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left -ipadx $wgap
spinbox .bleft.mid.diffcontext -width 5 \
-from 0 -increment 1 -to 10000000 \
-validate all -validatecommand "diffcontextvalidate %P" \
@@ -2370,7 +2388,7 @@ proc makewindow {} {
.bleft.mid.diffcontext set $diffcontext
trace add variable diffcontextstring write diffcontextchange
lappend entries .bleft.mid.diffcontext
- pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext -side left
+ pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext -side left -ipadx $wgap
${NS}::checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \
-command changeignorespace -variable ignorespace
pack .bleft.mid.ignspace -side left -padx 5
@@ -3379,7 +3397,7 @@ set rectmask {
0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
}
-image create bitmap reficon-H -background black -foreground green \
+image create bitmap reficon-H -background black -foreground lime \
-data $rectdata -maskdata $rectmask
image create bitmap reficon-o -background black -foreground "#ddddff" \
-data $rectdata -maskdata $rectmask
@@ -12170,7 +12188,7 @@ if {[tk windowingsystem] eq "aqua"} {
set extdifftool "meld"
}
-set colors {green red blue magenta darkgrey brown orange}
+set colors {lime red blue magenta darkgrey brown orange}
if {[tk windowingsystem] eq "win32"} {
set uicolor SystemButtonFace
set uifgcolor SystemButtonText
@@ -12188,12 +12206,12 @@ if {[tk windowingsystem] eq "win32"} {
}
set diffcolors {red "#00a000" blue}
set diffcontext 3
-set mergecolors {red blue green purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
+set mergecolors {red blue lime purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
set ignorespace 0
set worddiff ""
set markbgcolor "#e0e0ff"
-set headbgcolor green
+set headbgcolor lime
set headfgcolor black
set headoutlinecolor black
set remotebgcolor #ffddaa
@@ -12208,7 +12226,7 @@ set linehoverfgcolor black
set linehoveroutlinecolor black
set mainheadcirclecolor yellow
set workingfilescirclecolor red
-set indexcirclecolor green
+set indexcirclecolor lime
set circlecolors {white blue gray blue blue}
set linkfgcolor blue
set circleoutlinecolor $fgcolor
@@ -12356,6 +12374,10 @@ if {![info exists have_ttk]} {
set use_ttk [expr {$have_ttk && $want_ttk}]
set NS [expr {$use_ttk ? "ttk" : ""}]
+if {$use_ttk} {
+ setttkstyle
+}
+
regexp {^git version ([\d.]*\d)} [exec git version] _ git_version
set show_notes {}
diff --git a/gitk-git/po/ja.po b/gitk-git/po/ja.po
index 59e42a8..f143753 100644
--- a/gitk-git/po/ja.po
+++ b/gitk-git/po/ja.po
@@ -1,7 +1,8 @@
# Japanese translations for gitk package.
-# Copyright (C) 2005-2009 Paul Mackerras
+# Copyright (C) 2005-2015 Paul Mackerras
# This file is distributed under the same license as the gitk package.
#
+# YOKOTA Hiroshi <yokota@netlab.cs.tsukuba.ac.jp>, 2015.
# Mizar <mizar.jp@gmail.com>, 2009.
# Junio C Hamano <gitster@pobox.com>, 2009.
msgid ""
@@ -9,10 +10,10 @@ msgstr ""
"Project-Id-Version: gitk\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 14:32+1000\n"
-"PO-Revision-Date: 2009-11-06 01:45+0900\n"
-"Last-Translator: Mizar <mizar.jp@gmail.com>\n"
+"PO-Revision-Date: 2015-11-12 13:00+0900\n"
+"Last-Translator: YOKOTA Hiroshi <yokota@netlab.cs.tsukuba.ac.jp>\n"
"Language-Team: Japanese\n"
-"Language: \n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,11 +25,11 @@ msgstr "マージã•ã‚Œã¦ã„ãªã„ファイルã®ãƒªã‚¹ãƒˆã‚’å–å¾—ã§ãã¾ã›
#: gitk:212 gitk:2381
msgid "Color words"
-msgstr ""
+msgstr "変更をç€è‰²"
-#: gitk:217 gitk:2381 gitk:8220 gitk:8253
+#: gitk:217 gitk:2381 gitk:8221 gitk:8254
msgid "Markup words"
-msgstr ""
+msgstr "変更をマークアップ"
#: gitk:324
msgid "Error parsing revisions:"
@@ -60,15 +61,15 @@ msgstr "git log 実行エラー:"
msgid "Reading"
msgstr "読ã¿è¾¼ã¿ä¸­"
-#: gitk:496 gitk:4525
+#: gitk:496 gitk:4526
msgid "Reading commits..."
msgstr "コミット読ã¿è¾¼ã¿ä¸­..."
-#: gitk:499 gitk:1637 gitk:4528
+#: gitk:499 gitk:1637 gitk:4529
msgid "No commits selected"
msgstr "コミットãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: gitk:1445 gitk:4045 gitk:12432
+#: gitk:1445 gitk:4046 gitk:12447
msgid "Command line"
msgstr "コマンド行"
@@ -80,12 +81,12 @@ msgstr "git log ã®å‡ºåŠ›ã‚’解æžã§ãã¾ã›ã‚“:"
msgid "No commit information available"
msgstr "有効ãªã‚³ãƒŸãƒƒãƒˆã®æƒ…å ±ãŒã‚ã‚Šã¾ã›ã‚“"
-#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
+#: gitk:1903 gitk:1932 gitk:4316 gitk:9684 gitk:11256 gitk:11536
msgid "OK"
msgstr "OK"
-#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
-#: gitk:11242 gitk:11522
+#: gitk:1934 gitk:4318 gitk:9197 gitk:9276 gitk:9406 gitk:9455 gitk:9686
+#: gitk:11257 gitk:11537
msgid "Cancel"
msgstr "キャンセル"
@@ -127,25 +128,25 @@ msgstr "編集(&E)"
#: gitk:2084
msgid "&New view..."
-msgstr "æ–°è¦ãƒ“ュー...(&N)"
+msgstr "æ–°è¦ãƒ“ュー(&N)..."
#: gitk:2085
msgid "&Edit view..."
-msgstr "ビュー編集...(&E)"
+msgstr "ビュー編集(&E)..."
#: gitk:2086
msgid "&Delete view"
msgstr "ビュー削除(&D)"
-#: gitk:2088 gitk:4043
+#: gitk:2088
msgid "&All files"
msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«(&A)"
-#: gitk:2083 gitk:4067
+#: gitk:2083
msgid "&View"
msgstr "ビュー(&V)"
-#: gitk:2093 gitk:2103 gitk:3012
+#: gitk:2093 gitk:2103
msgid "&About gitk"
msgstr "gitk ã«ã¤ã„ã¦(&A)"
@@ -157,7 +158,7 @@ msgstr "キーãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°(&K)"
msgid "&Help"
msgstr "ヘルプ(&H)"
-#: gitk:2185 gitk:8652
+#: gitk:2185 gitk:8653
msgid "SHA1 ID:"
msgstr "SHA1 ID:"
@@ -173,53 +174,53 @@ msgstr "検索"
msgid "commit"
msgstr "コミット"
-#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
-#: gitk:6912
+#: gitk:2299 gitk:2301 gitk:4688 gitk:4711 gitk:4735 gitk:6756 gitk:6828
+#: gitk:6913
msgid "containing:"
msgstr "å«ã‚€:"
-#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
+#: gitk:2302 gitk:3527 gitk:3532 gitk:4764
msgid "touching paths:"
msgstr "パスã®ä¸€éƒ¨:"
-#: gitk:2303 gitk:4777
+#: gitk:2303 gitk:4778
msgid "adding/removing string:"
-msgstr "追加/除去ã™ã‚‹æ–‡å­—列:"
+msgstr "追加/除去ã•ã‚Œã‚‹æ–‡å­—列:"
-#: gitk:2304 gitk:4779
+#: gitk:2304 gitk:4780
msgid "changing lines matching:"
-msgstr ""
+msgstr "変更ã•ã‚Œã‚‹æ–‡å­—列"
-#: gitk:2313 gitk:2315 gitk:4766
+#: gitk:2313 gitk:2315 gitk:4767
msgid "Exact"
msgstr "英字ã®å¤§å°ã‚’区別ã™ã‚‹"
-#: gitk:2315 gitk:4854 gitk:6723
+#: gitk:2315 gitk:4855 gitk:6724
msgid "IgnCase"
msgstr "英字ã®å¤§å°ã‚’区別ã—ãªã„"
-#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
+#: gitk:2315 gitk:4737 gitk:4853 gitk:6720
msgid "Regexp"
msgstr "æ­£è¦è¡¨ç¾"
-#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
+#: gitk:2317 gitk:2318 gitk:4875 gitk:4905 gitk:4912 gitk:6849 gitk:6917
msgid "All fields"
msgstr "å…¨ã¦ã®é …ç›®"
-#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
+#: gitk:2318 gitk:4872 gitk:4905 gitk:6787
msgid "Headline"
msgstr "ヘッドライン"
-#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
+#: gitk:2319 gitk:4872 gitk:6787 gitk:6917 gitk:7390
msgid "Comments"
msgstr "コメント"
-#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
-#: gitk:8845
+#: gitk:2319 gitk:4872 gitk:4877 gitk:4912 gitk:6787 gitk:7325 gitk:8831
+#: gitk:8846
msgid "Author"
msgstr "作者"
-#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
+#: gitk:2319 gitk:4872 gitk:6787 gitk:7327
msgid "Committer"
msgstr "コミット者"
@@ -247,9 +248,9 @@ msgstr "文脈行数"
msgid "Ignore space change"
msgstr "空白ã®é•ã„を無視"
-#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
+#: gitk:2378 gitk:2380 gitk:7960 gitk:8207
msgid "Line diff"
-msgstr ""
+msgstr "行毎ã®diff"
#: gitk:2445
msgid "Patch"
@@ -259,111 +260,115 @@ msgstr "パッãƒ"
msgid "Tree"
msgstr "ツリー"
-#: gitk:2617 gitk:2637
+#: gitk:2617 gitk:2638
msgid "Diff this -> selected"
msgstr "ã“ã‚Œã¨é¸æŠžã—ãŸã‚³ãƒŸãƒƒãƒˆã®diffを見る"
-#: gitk:2618 gitk:2638
+#: gitk:2618 gitk:2639
msgid "Diff selected -> this"
msgstr "é¸æŠžã—ãŸã‚³ãƒŸãƒƒãƒˆã¨ã“ã‚Œã®diffを見る"
-#: gitk:2619 gitk:2639
+#: gitk:2619 gitk:2640
msgid "Make patch"
msgstr "パッãƒä½œæˆ"
-#: gitk:2620 gitk:9254
+#: gitk:2620 gitk:9255
msgid "Create tag"
msgstr "タグ生æˆ"
-#: gitk:2621 gitk:9371
+#: gitk:2621
+msgid "Copy commit summary"
+msgstr "コミットã®è¦ç´„をコピーã™ã‚‹"
+
+#: gitk:2622 gitk:9386
msgid "Write commit to file"
msgstr "コミットをファイルã«æ›¸ã出ã™"
-#: gitk:2622 gitk:9428
+#: gitk:2623 gitk:9443
msgid "Create new branch"
msgstr "æ–°è¦ãƒ–ランãƒç”Ÿæˆ"
-#: gitk:2623
+#: gitk:2624
msgid "Cherry-pick this commit"
msgstr "ã“ã®ã‚³ãƒŸãƒƒãƒˆã‚’ãƒã‚§ãƒªãƒ¼ãƒ”ックã™ã‚‹"
-#: gitk:2624
+#: gitk:2625
msgid "Reset HEAD branch to here"
msgstr "ブランãƒã®HEADã‚’ã“ã“ã«ãƒªã‚»ãƒƒãƒˆã™ã‚‹"
-#: gitk:2625
+#: gitk:2626
msgid "Mark this commit"
msgstr "ã“ã®ã‚³ãƒŸãƒƒãƒˆã«ãƒžãƒ¼ã‚¯ã‚’ã¤ã‘ã‚‹"
-#: gitk:2626
+#: gitk:2627
msgid "Return to mark"
msgstr "マークを付ã‘ãŸæ‰€ã«æˆ»ã‚‹"
-#: gitk:2627
+#: gitk:2628
msgid "Find descendant of this and mark"
msgstr "ã“ã‚Œã¨ãƒžãƒ¼ã‚¯ã‚’ã¤ã‘ãŸæ‰€ã¨ã®å­å­«ã‚’見ã¤ã‘ã‚‹"
-#: gitk:2628
+#: gitk:2629
msgid "Compare with marked commit"
msgstr "マークを付ã‘ãŸã‚³ãƒŸãƒƒãƒˆã¨æ¯”較ã™ã‚‹"
-#: gitk:2629 gitk:2640
-#, fuzzy
+#: gitk:2630 gitk:2641
msgid "Diff this -> marked commit"
msgstr "ã“ã‚Œã¨é¸æŠžã—ãŸã‚³ãƒŸãƒƒãƒˆã®diffを見る"
-#: gitk:2630 gitk:2641
-#, fuzzy
+#: gitk:2631 gitk:2642
msgid "Diff marked commit -> this"
msgstr "é¸æŠžã—ãŸã‚³ãƒŸãƒƒãƒˆã¨ã“ã‚Œã®diffを見る"
-#: gitk:2631
-#, fuzzy
+#: gitk:2632
msgid "Revert this commit"
-msgstr "ã“ã®ã‚³ãƒŸãƒƒãƒˆã«ãƒžãƒ¼ã‚¯ã‚’ã¤ã‘ã‚‹"
+msgstr "ã“ã®ã‚³ãƒŸãƒƒãƒˆã‚’撤回ã™ã‚‹"
-#: gitk:2647
+#: gitk:2648
msgid "Check out this branch"
msgstr "ã“ã®ãƒ–ランãƒã‚’ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã™ã‚‹"
-#: gitk:2648
+#: gitk:2649
msgid "Remove this branch"
msgstr "ã“ã®ãƒ–ランãƒã‚’除去ã™ã‚‹"
-#: gitk:2649
+#: gitk:2650
msgid "Copy branch name"
-msgstr ""
+msgstr "ブランãƒåをコピーã™ã‚‹"
-#: gitk:2656
+#: gitk:2657
msgid "Highlight this too"
msgstr "ã“れもãƒã‚¤ãƒ©ã‚¤ãƒˆã•ã›ã‚‹"
-#: gitk:2657
+#: gitk:2658
msgid "Highlight this only"
msgstr "ã“ã‚Œã ã‘ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã•ã›ã‚‹"
-#: gitk:2658
+#: gitk:2659
msgid "External diff"
msgstr "外部diffツール"
-#: gitk:2659
+#: gitk:2660
msgid "Blame parent commit"
msgstr "親コミットã‹ã‚‰ blame ã‚’ã‹ã‘ã‚‹"
-#: gitk:2660
+#: gitk:2661
msgid "Copy path"
-msgstr ""
+msgstr "パスåをコピーã™ã‚‹"
-#: gitk:2667
+#: gitk:2668
msgid "Show origin of this line"
msgstr "ã“ã®è¡Œã®å‡ºè‡ªã‚’表示ã™ã‚‹"
-#: gitk:2668
+#: gitk:2669
msgid "Run git gui blame on this line"
msgstr "ã“ã®è¡Œã« git gui 㧠blame ã‚’ã‹ã‘ã‚‹"
-#: gitk:3014
-#, fuzzy
+#: gitk:3013
+msgid "About gitk"
+msgstr "gitk ã«ã¤ã„ã¦"
+
+#: gitk:3015
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
@@ -375,324 +380,327 @@ msgstr ""
"\n"
"Gitk - gitコミットビューア\n"
"\n"
-"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
+"Copyright © 2005-2014 Paul Mackerras\n"
"\n"
"使用ãŠã‚ˆã³å†é…布㯠GNU General Public License ã«å¾“ã£ã¦ãã ã•ã„"
-#: gitk:3022 gitk:3089 gitk:9857
+#: gitk:3023 gitk:3090 gitk:9872
msgid "Close"
msgstr "é–‰ã˜ã‚‹"
-#: gitk:3043
+#: gitk:3044
msgid "Gitk key bindings"
msgstr "Gitk キーãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°"
-#: gitk:3046
+#: gitk:3047
msgid "Gitk key bindings:"
msgstr "Gitk キーãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°:"
-#: gitk:3048
+#: gitk:3049
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\t終了"
-#: gitk:3049
-#, fuzzy, tcl-format
+#: gitk:3050
+#, tcl-format
msgid "<%s-W>\t\tClose window"
-msgstr "<%s-F>\t\t検索"
+msgstr "<%s-W>\t\tウィンドウを閉ã˜ã‚‹"
-#: gitk:3050
+#: gitk:3051
msgid "<Home>\t\tMove to first commit"
msgstr "<Home>\t\t最åˆã®ã‚³ãƒŸãƒƒãƒˆã«ç§»å‹•"
-#: gitk:3051
+#: gitk:3052
msgid "<End>\t\tMove to last commit"
msgstr "<End>\t\t最後ã®ã‚³ãƒŸãƒƒãƒˆã«ç§»å‹•"
-#: gitk:3052
-#, fuzzy
+#: gitk:3053
msgid "<Up>, p, k\tMove up one commit"
-msgstr "<Up>, p, i\t一ã¤ä¸Šã®ã‚³ãƒŸãƒƒãƒˆã«ç§»å‹•"
+msgstr "<Up>, p, k\t一ã¤ä¸Šã®ã‚³ãƒŸãƒƒãƒˆã«ç§»å‹•"
-#: gitk:3053
-#, fuzzy
+#: gitk:3054
msgid "<Down>, n, j\tMove down one commit"
-msgstr "<Down>, n, k\t一ã¤ä¸‹ã®ã‚³ãƒŸãƒƒãƒˆã«ç§»å‹•"
+msgstr "<Down>, n, j\t一ã¤ä¸‹ã®ã‚³ãƒŸãƒƒãƒˆã«ç§»å‹•"
-#: gitk:3054
-#, fuzzy
+#: gitk:3055
msgid "<Left>, z, h\tGo back in history list"
-msgstr "<Left>, z, j\t履歴ã®å‰ã«æˆ»ã‚‹"
+msgstr "<Left>, z, h\t履歴ã®å‰ã«æˆ»ã‚‹"
-#: gitk:3055
+#: gitk:3056
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Right>, x, l\t履歴ã®æ¬¡ã¸é€²ã‚€"
-#: gitk:3056
+#: gitk:3057
#, tcl-format
msgid "<%s-n>\tGo to n-th parent of current commit in history list"
-msgstr ""
+msgstr "<%s-n(æ•°å­—)>\t履歴上ã§ç¾åœ¨ã®ã‚³ãƒŸãƒƒãƒˆã®è¦ªã‚³ãƒŸãƒƒãƒˆã®å†…ã®n(æ•°å­—)番目ã®ã‚³ãƒŸãƒƒãƒˆã¸ç§»å‹•"
-#: gitk:3057
+#: gitk:3058
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<PageUp>\tコミットリストã®ä¸€ã¤ä¸Šã®ãƒšãƒ¼ã‚¸ã«ç§»å‹•"
-#: gitk:3058
+#: gitk:3059
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<PageDown>\tコミットリストã®ä¸€ã¤ä¸‹ã®ãƒšãƒ¼ã‚¸ã«ç§»å‹•"
-#: gitk:3059
+#: gitk:3060
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Home>\tコミットリストã®ä¸€ç•ªä¸Šã«ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã™ã‚‹"
-#: gitk:3060
+#: gitk:3061
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-End>\tコミットリストã®ä¸€ç•ªä¸‹ã«ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã™ã‚‹"
-#: gitk:3061
+#: gitk:3062
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Up>\tコミットリストã®ä¸€ã¤ä¸‹ã®è¡Œã«ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã™ã‚‹"
-#: gitk:3062
+#: gitk:3063
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Down>\tコミットリストã®ä¸€ã¤ä¸‹ã®è¡Œã«ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã™ã‚‹"
-#: gitk:3063
+#: gitk:3064
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-PageUp>\tコミットリストã®ä¸Šã®ãƒšãƒ¼ã‚¸ã«ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã™ã‚‹"
-#: gitk:3064
+#: gitk:3065
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-PageDown>\tコミットリストã®ä¸‹ã®ãƒšãƒ¼ã‚¸ã«ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã™ã‚‹"
-#: gitk:3065
+#: gitk:3066
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr "<Shift-Up>\t後方を検索 (上方ã®ãƒ»æ–°ã—ã„コミット)"
-#: gitk:3066
+#: gitk:3067
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr "<Shift-Down>\tå‰æ–¹ã‚’検索(下方ã®ãƒ»å¤ã„コミット)"
-#: gitk:3067
+#: gitk:3068
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Delete>, b\tdiffç”»é¢ã‚’上ã®ãƒšãƒ¼ã‚¸ã«ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã™ã‚‹"
-#: gitk:3068
+#: gitk:3069
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Backspace>\tdiffç”»é¢ã‚’上ã®ãƒšãƒ¼ã‚¸ã«ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã™ã‚‹"
-#: gitk:3069
+#: gitk:3070
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Space>\t\tdiffç”»é¢ã‚’下ã®ãƒšãƒ¼ã‚¸ã«ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã™ã‚‹"
-#: gitk:3070
+#: gitk:3071
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tdiffç”»é¢ã‚’上ã«18行スクロールã™ã‚‹"
-#: gitk:3071
+#: gitk:3072
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tdiffç”»é¢ã‚’下ã«18行スクロールã™ã‚‹"
-#: gitk:3072
+#: gitk:3073
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\t検索"
-#: gitk:3073
+#: gitk:3074
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\t次を検索ã—ã¦ç§»å‹•"
-#: gitk:3074
+#: gitk:3075
msgid "<Return>\tMove to next find hit"
msgstr "<Return>\t次を検索ã—ã¦ç§»å‹•"
-#: gitk:3075
-#, fuzzy
+#: gitk:3076
msgid "g\t\tGo to commit"
-msgstr "<End>\t\t最後ã®ã‚³ãƒŸãƒƒãƒˆã«ç§»å‹•"
+msgstr "g\t\t指定ã—ã¦ã‚³ãƒŸãƒƒãƒˆã«ç§»å‹•"
-#: gitk:3076
+#: gitk:3077
msgid "/\t\tFocus the search box"
msgstr "/\t\t検索ボックスã«ãƒ•ã‚©ãƒ¼ã‚«ã‚¹"
-#: gitk:3077
+#: gitk:3078
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tå‰ã‚’検索ã—ã¦ç§»å‹•"
-#: gitk:3078
+#: gitk:3079
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\t次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«diffç”»é¢ã‚’スクロールã™ã‚‹"
-#: gitk:3079
+#: gitk:3080
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tdiffç”»é¢ã®æ¬¡ã‚’検索"
-#: gitk:3080
+#: gitk:3081
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tdiffç”»é¢ã®å‰ã‚’検索"
-#: gitk:3081
+#: gitk:3082
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-KP+>\t文字サイズを拡大"
-#: gitk:3082
+#: gitk:3083
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-plus>\t文字サイズを拡大"
-#: gitk:3083
+#: gitk:3084
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-KP->\t文字サイズを縮å°"
-#: gitk:3084
+#: gitk:3085
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-minus>\t文字サイズを縮å°"
-#: gitk:3085
+#: gitk:3086
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tæ›´æ–°"
-#: gitk:3550 gitk:3559
+#: gitk:3551 gitk:3560
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "一時ディレクトリ %s 生æˆæ™‚エラー:"
-#: gitk:3572
+#: gitk:3573
#, tcl-format
msgid "Error getting \"%s\" from %s:"
msgstr "\"%s\" ã®ã‚¨ãƒ©ãƒ¼ãŒ %s ã«ç™ºç”Ÿ:"
-#: gitk:3635
+#: gitk:3636
msgid "command failed:"
msgstr "コマンド失敗:"
-#: gitk:3784
+#: gitk:3785
msgid "No such commit"
msgstr "ãã®ã‚ˆã†ãªã‚³ãƒŸãƒƒãƒˆã¯ã‚ã‚Šã¾ã›ã‚“"
-#: gitk:3798
+#: gitk:3799
msgid "git gui blame: command failed:"
msgstr "git gui blame: コマンド失敗:"
-#: gitk:3829
+#: gitk:3830
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "マージã™ã‚‹ HEAD を読ã¿è¾¼ã‚ã¾ã›ã‚“: %s"
-#: gitk:3837
+#: gitk:3838
#, tcl-format
msgid "Error reading index: %s"
msgstr "インデックス読ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: %s"
-#: gitk:3862
+#: gitk:3863
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "git blame を始ã‚られã¾ã›ã‚“: %s"
-#: gitk:3865 gitk:6754
+#: gitk:3866 gitk:6755
msgid "Searching"
msgstr "検索中"
-#: gitk:3897
+#: gitk:3898
#, tcl-format
msgid "Error running git blame: %s"
msgstr "git blame 実行エラー: %s"
-#: gitk:3925
+#: gitk:3926
#, tcl-format
msgid "That line comes from commit %s, which is not in this view"
msgstr "コミット %s ã«ç”±æ¥ã™ã‚‹ãã®è¡Œã¯ã€ã“ã®ãƒ“ューã«è¡¨ç¤ºã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: gitk:3939
+#: gitk:3940
msgid "External diff viewer failed:"
msgstr "外部diffビューアãŒå¤±æ•—:"
-#: gitk:4070
+#: gitk:4044
+msgid "All files"
+msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«"
+
+#: gitk:4068
+msgid "View"
+msgstr "ビュー"
+
+#: gitk:4071
msgid "Gitk view definition"
msgstr "Gitk ビュー定義"
-#: gitk:4074
+#: gitk:4075
msgid "Remember this view"
msgstr "ã“ã®ãƒ“ューを記憶ã™ã‚‹"
-#: gitk:4075
+#: gitk:4076
msgid "References (space separated list):"
msgstr "リファレンス(スペース区切りã®ãƒªã‚¹ãƒˆï¼‰:"
-#: gitk:4076
+#: gitk:4077
msgid "Branches & tags:"
msgstr "ブランãƒï¼†ã‚¿ã‚°:"
-#: gitk:4077
+#: gitk:4078
msgid "All refs"
msgstr "å…¨ã¦ã®ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹"
-#: gitk:4078
+#: gitk:4079
msgid "All (local) branches"
msgstr "å…¨ã¦ã®ï¼ˆãƒ­ãƒ¼ã‚«ãƒ«ãªï¼‰ãƒ–ランãƒ"
-#: gitk:4079
+#: gitk:4080
msgid "All tags"
msgstr "å…¨ã¦ã®ã‚¿ã‚°"
-#: gitk:4080
+#: gitk:4081
msgid "All remote-tracking branches"
msgstr "å…¨ã¦ã®ãƒªãƒ¢ãƒ¼ãƒˆè¿½è·¡ãƒ–ランãƒ"
-#: gitk:4081
+#: gitk:4082
msgid "Commit Info (regular expressions):"
msgstr "コミット情報(正è¦è¡¨ç¾ï¼‰:"
-#: gitk:4082
+#: gitk:4083
msgid "Author:"
msgstr "作者:"
-#: gitk:4083
+#: gitk:4084
msgid "Committer:"
msgstr "コミット者:"
-#: gitk:4084
+#: gitk:4085
msgid "Commit Message:"
msgstr "コミットメッセージ:"
-#: gitk:4085
+#: gitk:4086
msgid "Matches all Commit Info criteria"
msgstr "コミット情報ã®å…¨ã¦ã®æ¡ä»¶ã«ä¸€è‡´"
-#: gitk:4086
-#, fuzzy
+#: gitk:4087
msgid "Matches no Commit Info criteria"
-msgstr "コミット情報ã®å…¨ã¦ã®æ¡ä»¶ã«ä¸€è‡´"
+msgstr "コミット情報ã®å…¨ã¦ã®æ¡ä»¶ã«ä¸ä¸€è‡´"
-#: gitk:4087
+#: gitk:4088
msgid "Changes to Files:"
msgstr "変更ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«:"
-#: gitk:4088
+#: gitk:4089
msgid "Fixed String"
msgstr "固定文字列"
-#: gitk:4089
+#: gitk:4090
msgid "Regular Expression"
msgstr "æ­£è¦è¡¨ç¾"
-#: gitk:4090
+#: gitk:4091
msgid "Search string:"
msgstr "検索文字列:"
-#: gitk:4091
+#: gitk:4092
msgid ""
"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
@@ -700,202 +708,201 @@ msgstr ""
"コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
-#: gitk:4092
+#: gitk:4093
msgid "Since:"
msgstr "期間ã®å§‹ã‚:"
-#: gitk:4093
+#: gitk:4094
msgid "Until:"
msgstr "期間ã®çµ‚ã‚ã‚Š:"
-#: gitk:4094
+#: gitk:4095
msgid "Limit and/or skip a number of revisions (positive integer):"
msgstr "制é™ãƒ»çœç•¥ã™ã‚‹ãƒªãƒ“ジョンã®æ•°ï¼ˆæ­£ã®æ•´æ•°ï¼‰:"
-#: gitk:4095
+#: gitk:4096
msgid "Number to show:"
msgstr "表示ã™ã‚‹æ•°:"
-#: gitk:4096
+#: gitk:4097
msgid "Number to skip:"
msgstr "çœç•¥ã™ã‚‹æ•°:"
-#: gitk:4097
+#: gitk:4098
msgid "Miscellaneous options:"
msgstr "ãã®ä»–ã®ã‚ªãƒ—ション:"
-#: gitk:4098
+#: gitk:4099
msgid "Strictly sort by date"
msgstr "厳密ã«æ—¥ä»˜é †ã§ä¸¦ã³æ›¿ãˆ"
-#: gitk:4099
+#: gitk:4100
msgid "Mark branch sides"
msgstr "å´æžãƒžãƒ¼ã‚¯"
-#: gitk:4100
+#: gitk:4101
msgid "Limit to first parent"
msgstr "最åˆã®è¦ªã«åˆ¶é™"
-#: gitk:4101
+#: gitk:4102
msgid "Simple history"
msgstr "簡易ãªå±¥æ­´"
-#: gitk:4102
+#: gitk:4103
msgid "Additional arguments to git log:"
msgstr "git log ã¸ã®è¿½åŠ ã®å¼•æ•°:"
-#: gitk:4103
+#: gitk:4104
msgid "Enter files and directories to include, one per line:"
msgstr "å«ã¾ã‚Œã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ãƒ»ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’一行ã”ã¨ã«å…¥åŠ›:"
-#: gitk:4104
+#: gitk:4105
msgid "Command to generate more commits to include:"
msgstr "コミット追加コマンド:"
-#: gitk:4228
+#: gitk:4229
msgid "Gitk: edit view"
msgstr "Gitk: ビュー編集"
-#: gitk:4236
+#: gitk:4237
msgid "-- criteria for selecting revisions"
msgstr "― リビジョンã®é¸æŠžæ¡ä»¶"
-#: gitk:4241
-#, fuzzy
+#: gitk:4242
msgid "View Name"
msgstr "ビューå:"
-#: gitk:4316
+#: gitk:4317
msgid "Apply (F5)"
msgstr "é©ç”¨ (F5)"
-#: gitk:4354
+#: gitk:4355
msgid "Error in commit selection arguments:"
msgstr "コミットé¸æŠžå¼•æ•°ã®ã‚¨ãƒ©ãƒ¼:"
-#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
+#: gitk:4410 gitk:4463 gitk:4925 gitk:4939 gitk:6209 gitk:12388 gitk:12389
msgid "None"
msgstr "ç„¡ã—"
-#: gitk:5021 gitk:5026
+#: gitk:5022 gitk:5027
msgid "Descendant"
msgstr "å­å­«"
-#: gitk:5022
+#: gitk:5023
msgid "Not descendant"
msgstr "éžå­å­«"
-#: gitk:5029 gitk:5034
+#: gitk:5030 gitk:5035
msgid "Ancestor"
msgstr "祖先"
-#: gitk:5030
+#: gitk:5031
msgid "Not ancestor"
msgstr "éžç¥–å…ˆ"
-#: gitk:5324
+#: gitk:5325
msgid "Local changes checked in to index but not committed"
msgstr "ステージã•ã‚ŒãŸã€ã‚³ãƒŸãƒƒãƒˆå‰ã®ãƒ­ãƒ¼ã‚«ãƒ«ãªå¤‰æ›´"
-#: gitk:5360
+#: gitk:5361
msgid "Local uncommitted changes, not checked in to index"
msgstr "ステージã•ã‚Œã¦ã„ãªã„ã€ã‚³ãƒŸãƒƒãƒˆå‰ã®ãƒ­ãƒ¼ã‚«ãƒ«ãªå¤‰æ›´"
-#: gitk:7134
+#: gitk:7135
msgid "and many more"
-msgstr ""
+msgstr "他多数"
-#: gitk:7137
+#: gitk:7138
msgid "many"
msgstr "多数"
-#: gitk:7328
+#: gitk:7329
msgid "Tags:"
msgstr "ã‚¿ã‚°:"
-#: gitk:7345 gitk:7351 gitk:8825
+#: gitk:7346 gitk:7352 gitk:8826
msgid "Parent"
msgstr "親"
-#: gitk:7356
+#: gitk:7357
msgid "Child"
msgstr "å­"
-#: gitk:7365
+#: gitk:7366
msgid "Branch"
msgstr "ブランãƒ"
-#: gitk:7368
+#: gitk:7369
msgid "Follows"
msgstr "下ä½"
-#: gitk:7371
+#: gitk:7372
msgid "Precedes"
msgstr "上ä½"
-#: gitk:7966
+#: gitk:7967
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "diffå–得エラー: %s"
-#: gitk:8650
+#: gitk:8651
msgid "Goto:"
msgstr "Goto:"
-#: gitk:8671
+#: gitk:8672
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "%s ã‚’å«ã‚€ SHA1 ID ã¯è¤‡æ•°å­˜åœ¨ã—ã¾ã™"
-#: gitk:8678
+#: gitk:8679
#, tcl-format
msgid "Revision %s is not known"
msgstr "リビジョン %s ã¯ä¸æ˜Žã§ã™"
-#: gitk:8688
+#: gitk:8689
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "SHA1 id %s ã¯ä¸æ˜Žã§ã™"
-#: gitk:8690
+#: gitk:8691
#, tcl-format
msgid "Revision %s is not in the current view"
msgstr "リビジョン %s ã¯ç¾åœ¨ã®ãƒ“ューã«ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: gitk:8832 gitk:8847
+#: gitk:8833 gitk:8848
msgid "Date"
msgstr "日付"
-#: gitk:8835
+#: gitk:8836
msgid "Children"
msgstr "å­"
-#: gitk:8898
+#: gitk:8899
#, tcl-format
msgid "Reset %s branch to here"
msgstr "%s ブランãƒã‚’ã“ã“ã«ãƒªã‚»ãƒƒãƒˆã™ã‚‹"
-#: gitk:8900
+#: gitk:8901
msgid "Detached head: can't reset"
msgstr "切り離ã•ã‚ŒãŸHEAD: リセットã§ãã¾ã›ã‚“"
-#: gitk:9005 gitk:9011
+#: gitk:9006 gitk:9012
msgid "Skipping merge commit "
msgstr "コミットマージをスキップ: "
-#: gitk:9020 gitk:9025
+#: gitk:9021 gitk:9026
msgid "Error getting patch ID for "
msgstr "パッãƒå–得エラー: ID "
-#: gitk:9021 gitk:9026
+#: gitk:9022 gitk:9027
msgid " - stopping\n"
msgstr " - åœæ­¢\n"
-#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
+#: gitk:9032 gitk:9035 gitk:9043 gitk:9057 gitk:9066
msgid "Commit "
msgstr "コミット "
-#: gitk:9035
+#: gitk:9036
msgid ""
" is the same patch as\n"
" "
@@ -903,7 +910,7 @@ msgstr ""
" ã¯ä¸‹è¨˜ã®ãƒ‘ッãƒã¨åŒç­‰\n"
" "
-#: gitk:9043
+#: gitk:9044
msgid ""
" differs from\n"
" "
@@ -911,7 +918,7 @@ msgstr ""
" 下記ã‹ã‚‰ã®diff\n"
" "
-#: gitk:9045
+#: gitk:9046
msgid ""
"Diff of commits:\n"
"\n"
@@ -919,131 +926,130 @@ msgstr ""
"コミットã®diff:\n"
"\n"
-#: gitk:9057 gitk:9066
+#: gitk:9058 gitk:9067
#, tcl-format
msgid " has %s children - stopping\n"
msgstr " ã«ã¯ %s ã®å­ãŒã‚ã‚Šã¾ã™ - åœæ­¢\n"
-#: gitk:9085
+#: gitk:9086
#, tcl-format
msgid "Error writing commit to file: %s"
msgstr "ファイルã¸ã®ã‚³ãƒŸãƒƒãƒˆæ›¸ã出ã—エラー: %s"
-#: gitk:9091
+#: gitk:9092
#, tcl-format
msgid "Error diffing commits: %s"
msgstr "コミットã®diff実行エラー: %s"
-#: gitk:9137
+#: gitk:9138
msgid "Top"
msgstr "Top"
-#: gitk:9138
+#: gitk:9139
msgid "From"
msgstr "From"
-#: gitk:9143
+#: gitk:9144
msgid "To"
msgstr "To"
-#: gitk:9167
+#: gitk:9168
msgid "Generate patch"
msgstr "パッãƒç”Ÿæˆ"
-#: gitk:9169
+#: gitk:9170
msgid "From:"
msgstr "From:"
-#: gitk:9178
+#: gitk:9179
msgid "To:"
msgstr "To:"
-#: gitk:9187
+#: gitk:9188
msgid "Reverse"
msgstr "逆"
-#: gitk:9189 gitk:9385
+#: gitk:9190 gitk:9400
msgid "Output file:"
msgstr "出力ファイル:"
-#: gitk:9195
+#: gitk:9196
msgid "Generate"
msgstr "生æˆ"
-#: gitk:9233
+#: gitk:9234
msgid "Error creating patch:"
msgstr "パッãƒç”Ÿæˆã‚¨ãƒ©ãƒ¼:"
-#: gitk:9256 gitk:9373 gitk:9430
+#: gitk:9257 gitk:9388 gitk:9445
msgid "ID:"
msgstr "ID:"
-#: gitk:9265
+#: gitk:9266
msgid "Tag name:"
msgstr "ã‚¿ã‚°å:"
-#: gitk:9268
+#: gitk:9269
msgid "Tag message is optional"
-msgstr ""
+msgstr "タグメッセージを付ã‘る事も出æ¥ã¾ã™"
-#: gitk:9270
-#, fuzzy
+#: gitk:9271
msgid "Tag message:"
-msgstr "ã‚¿ã‚°å:"
+msgstr "タグメッセージ:"
-#: gitk:9274 gitk:9439
+#: gitk:9275 gitk:9454
msgid "Create"
msgstr "生æˆ"
-#: gitk:9292
+#: gitk:9293
msgid "No tag name specified"
msgstr "ã‚¿ã‚°ã®å称ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: gitk:9296
+#: gitk:9297
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "ã‚¿ã‚° \"%s\" ã¯æ—¢ã«å­˜åœ¨ã—ã¾ã™"
-#: gitk:9306
+#: gitk:9307
msgid "Error creating tag:"
msgstr "タグ生æˆã‚¨ãƒ©ãƒ¼:"
-#: gitk:9382
+#: gitk:9397
msgid "Command:"
msgstr "コマンド:"
-#: gitk:9390
+#: gitk:9405
msgid "Write"
msgstr "書ã出ã—"
-#: gitk:9408
+#: gitk:9423
msgid "Error writing commit:"
msgstr "コミット書ã出ã—エラー:"
-#: gitk:9435
+#: gitk:9450
msgid "Name:"
msgstr "åå‰:"
-#: gitk:9458
+#: gitk:9473
msgid "Please specify a name for the new branch"
msgstr "æ–°ã—ã„ブランãƒã®åå‰ã‚’指定ã—ã¦ãã ã•ã„"
-#: gitk:9463
+#: gitk:9478
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "ブランム'%s' ã¯æ—¢ã«å­˜åœ¨ã—ã¾ã™ã€‚上書ãã—ã¾ã™ã‹ï¼Ÿ"
-#: gitk:9530
+#: gitk:9545
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr ""
"コミット %s ã¯æ—¢ã«ãƒ–ランム%s ã«å«ã¾ã‚Œã¦ã„ã¾ã™ ― 本当ã«ã“れをå†é©ç”¨ã—ã¾ã™ã‹ï¼Ÿ"
-#: gitk:9535
+#: gitk:9550
msgid "Cherry-picking"
msgstr "ãƒã‚§ãƒªãƒ¼ãƒ”ック中"
-#: gitk:9544
+#: gitk:9559
#, tcl-format
msgid ""
"Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1053,7 +1059,7 @@ msgstr ""
"ã‚ãªãŸã®å¤‰æ›´ã« commit, reset, stash ã®ã„ãšã‚Œã‹ã‚’è¡Œã£ã¦ã‹ã‚‰ã‚„ã‚Šç›´ã—ã¦ãã ã•"
"ã„。"
-#: gitk:9550
+#: gitk:9565
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
@@ -1061,62 +1067,56 @@ msgstr ""
"マージã®è¡çªã«ã‚ˆã£ã¦ãƒã‚§ãƒªãƒ¼ãƒ”ックã¯å¤±æ•—ã—ã¾ã—ãŸã€‚\n"
"ã“ã®è§£æ±ºã®ãŸã‚ã« git citool を実行ã—ãŸã„ã§ã™ã‹ï¼Ÿ"
-#: gitk:9566 gitk:9624
+#: gitk:9581 gitk:9639
msgid "No changes committed"
msgstr "何ã®å¤‰æ›´ã‚‚コミットã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: gitk:9593
-#, fuzzy, tcl-format
+#: gitk:9608
+#, tcl-format
msgid "Commit %s is not included in branch %s -- really revert it?"
-msgstr ""
-"コミット %s ã¯æ—¢ã«ãƒ–ランム%s ã«å«ã¾ã‚Œã¦ã„ã¾ã™ ― 本当ã«ã“れをå†é©ç”¨ã—ã¾ã™ã‹ï¼Ÿ"
+msgstr "コミット %s ã¯æ—¢ã«ãƒ–ランム%s ã«å«ã¾ã‚Œã¦ã„ã¾ã™ ― 本当ã«ã“れを撤回ã—ã¾ã™ã‹ï¼Ÿ"
-#: gitk:9598
-#, fuzzy
+#: gitk:9613
msgid "Reverting"
-msgstr "リセット中"
+msgstr "撤回中"
-#: gitk:9606
-#, fuzzy, tcl-format
+#: gitk:9621
+#, tcl-format
msgid ""
"Revert failed because of local changes to the following files:%s Please "
"commit, reset or stash your changes and try again."
-msgstr ""
-"ファイル '%s' ã®ãƒ­ãƒ¼ã‚«ãƒ«ãªå¤‰æ›´ã®ãŸã‚ã«ãƒã‚§ãƒªãƒ¼ãƒ”ックã¯å¤±æ•—ã—ã¾ã—ãŸã€‚\n"
-"ã‚ãªãŸã®å¤‰æ›´ã« commit, reset, stash ã®ã„ãšã‚Œã‹ã‚’è¡Œã£ã¦ã‹ã‚‰ã‚„ã‚Šç›´ã—ã¦ãã ã•"
-"ã„。"
+msgstr "ファイル '%s' ã®ãƒ­ãƒ¼ã‚«ãƒ«ãªå¤‰æ›´ã®ãŸã‚ã«æ’¤å›žã¯å¤±æ•—ã—ã¾ã—ãŸã€‚ ã‚ãªãŸã®å¤‰æ›´ã« commit, reset, stash ã®ã„ãšã‚Œã‹ã‚’è¡Œã£ã¦ã‹ã‚‰ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。"
-#: gitk:9610
-#, fuzzy
+#: gitk:9625
msgid ""
"Revert failed because of merge conflict.\n"
" Do you wish to run git citool to resolve it?"
msgstr ""
-"マージã®è¡çªã«ã‚ˆã£ã¦ãƒã‚§ãƒªãƒ¼ãƒ”ックã¯å¤±æ•—ã—ã¾ã—ãŸã€‚\n"
+"マージã®è¡çªã«ã‚ˆã£ã¦æ’¤å›žã¯å¤±æ•—ã—ã¾ã—ãŸã€‚\n"
"ã“ã®è§£æ±ºã®ãŸã‚ã« git citool を実行ã—ãŸã„ã§ã™ã‹ï¼Ÿ"
-#: gitk:9653
+#: gitk:9668
msgid "Confirm reset"
msgstr "確èªã‚’å–り消ã™"
-#: gitk:9655
+#: gitk:9670
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "ブランム%s ã‚’ %s ã«ãƒªã‚»ãƒƒãƒˆã—ã¾ã™ã‹ï¼Ÿ"
-#: gitk:9657
+#: gitk:9672
msgid "Reset type:"
msgstr "Reset タイプ:"
-#: gitk:9660
+#: gitk:9675
msgid "Soft: Leave working tree and index untouched"
msgstr "Soft: 作業ツリーもインデックスもãã®ã¾ã¾ã«ã™ã‚‹"
-#: gitk:9663
+#: gitk:9678
msgid "Mixed: Leave working tree untouched, reset index"
msgstr "Mixed: 作業ツリーをãã®ã¾ã¾ã«ã—ã¦ã€ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’リセット"
-#: gitk:9666
+#: gitk:9681
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
@@ -1124,19 +1124,19 @@ msgstr ""
"Hard: 作業ツリーやインデックスをリセット\n"
"(「全ã¦ã®ã€ãƒ­ãƒ¼ã‚«ãƒ«ãªå¤‰æ›´ã‚’破棄)"
-#: gitk:9683
+#: gitk:9698
msgid "Resetting"
msgstr "リセット中"
-#: gitk:9743
+#: gitk:9758
msgid "Checking out"
msgstr "ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ"
-#: gitk:9796
+#: gitk:9811
msgid "Cannot delete the currently checked-out branch"
msgstr "ç¾åœ¨ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã•ã‚Œã¦ã„るブランãƒã‚’削除ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“"
-#: gitk:9802
+#: gitk:9817
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
@@ -1145,16 +1145,16 @@ msgstr ""
"ブランム%s ã«ã¯ä»–ã®ãƒ–ランãƒã«å­˜åœ¨ã—ãªã„コミットãŒã‚ã‚Šã¾ã™ã€‚\n"
"本当ã«ãƒ–ランム%s を削除ã—ã¾ã™ã‹ï¼Ÿ"
-#: gitk:9833
+#: gitk:9848
#, tcl-format
msgid "Tags and heads: %s"
msgstr "ã‚¿ã‚°ã¨HEAD: %s"
-#: gitk:9850
+#: gitk:9865
msgid "Filter"
msgstr "フィルター"
-#: gitk:10146
+#: gitk:10161
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
@@ -1162,237 +1162,217 @@ msgstr ""
"コミット構造情報読ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼; ブランãƒåŠã³ä¸Šä½/下ä½ã®ã‚¿ã‚°æƒ…å ±ãŒä¸å®Œå…¨ã§ã‚ã‚‹"
"よã†ã§ã™ã€‚"
-#: gitk:11123
+#: gitk:11138
msgid "Tag"
msgstr "ã‚¿ã‚°"
-#: gitk:11127
+#: gitk:11142
msgid "Id"
msgstr "ID"
-#: gitk:11210
+#: gitk:11225
msgid "Gitk font chooser"
msgstr "Gitk フォントé¸æŠž"
-#: gitk:11227
+#: gitk:11242
msgid "B"
msgstr "B"
-#: gitk:11230
+#: gitk:11245
msgid "I"
msgstr "I"
-#: gitk:11348
+#: gitk:11363
msgid "Commit list display options"
msgstr "コミットリスト表示オプション"
-#: gitk:11351
+#: gitk:11366
msgid "Maximum graph width (lines)"
msgstr "最大グラフ幅(線ã®æœ¬æ•°ï¼‰"
-#: gitk:11355
+#: gitk:11370
#, no-tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "最大グラフ幅(ペインã«å¯¾ã™ã‚‹ï¼…)"
-#: gitk:11358
+#: gitk:11373
msgid "Show local changes"
msgstr "ローカルãªå¤‰æ›´ã‚’表示"
-#: gitk:11361
-#, fuzzy
+#: gitk:11376
msgid "Auto-select SHA1 (length)"
-msgstr "SHA1 ã®è‡ªå‹•é¸æŠž"
+msgstr "SHA1 ã®è‡ªå‹•é¸æŠž (é¸æŠžæ–‡å­—数指定)"
-#: gitk:11365
+#: gitk:11380
msgid "Hide remote refs"
msgstr "リモートリファレンスを隠ã™"
-#: gitk:11369
+#: gitk:11384
msgid "Diff display options"
msgstr "diff表示オプション"
-#: gitk:11371
+#: gitk:11386
msgid "Tab spacing"
msgstr "タブ空白幅"
-#: gitk:11374
-#, fuzzy
+#: gitk:11389
msgid "Display nearby tags/heads"
-msgstr "è¿‘ãã®ã‚¿ã‚°ã‚’表示ã™ã‚‹"
+msgstr "è¿‘ãã® ã‚¿ã‚°/head を表示ã™ã‚‹"
-#: gitk:11377
+#: gitk:11392
msgid "Maximum # tags/heads to show"
-msgstr ""
+msgstr "ã‚¿ã‚°/head ã®æœ€å¤§è¡¨ç¤ºæ•°"
-#: gitk:11380
+#: gitk:11395
msgid "Limit diffs to listed paths"
msgstr "diff をリストã®ãƒ‘スã«åˆ¶é™"
-#: gitk:11383
+#: gitk:11398
msgid "Support per-file encodings"
msgstr "ファイルã”ã¨ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã®ã‚µãƒãƒ¼ãƒˆ"
-#: gitk:11389 gitk:11536
+#: gitk:11404 gitk:11551
msgid "External diff tool"
msgstr "外部diffツール"
-#: gitk:11390
+#: gitk:11405
msgid "Choose..."
msgstr "é¸æŠž..."
-#: gitk:11395
-#, fuzzy
+#: gitk:11410
msgid "General options"
-msgstr "パッãƒç”Ÿæˆ"
+msgstr "全体設定"
-#: gitk:11398
+#: gitk:11413
msgid "Use themed widgets"
-msgstr ""
+msgstr "テーマウィジェットを使用ã™ã‚‹"
-#: gitk:11400
+#: gitk:11415
msgid "(change requires restart)"
-msgstr ""
+msgstr "(変更ã«ã¯å†èµ·å‹•ãŒå¿…è¦ã§ã™)"
-#: gitk:11402
+#: gitk:11417
msgid "(currently unavailable)"
-msgstr ""
+msgstr "(ç¾åœ¨ã¯ä½¿ç”¨å‡ºæ¥ã¾ã›ã‚“)"
-#: gitk:11413
+#: gitk:11428
msgid "Colors: press to choose"
msgstr "色: ボタンを押ã—ã¦é¸æŠž"
-#: gitk:11416
+#: gitk:11431
msgid "Interface"
msgstr "インターフェイス"
-#: gitk:11417
+#: gitk:11432
msgid "interface"
msgstr "インターフェイス"
-#: gitk:11420
+#: gitk:11435
msgid "Background"
msgstr "背景"
-#: gitk:11421 gitk:11451
+#: gitk:11436 gitk:11466
msgid "background"
msgstr "背景"
-#: gitk:11424
+#: gitk:11439
msgid "Foreground"
msgstr "å‰æ™¯"
-#: gitk:11425
+#: gitk:11440
msgid "foreground"
msgstr "å‰æ™¯"
-#: gitk:11428
+#: gitk:11443
msgid "Diff: old lines"
msgstr "Diff: æ—§ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: gitk:11429
+#: gitk:11444
msgid "diff old lines"
msgstr "diff æ—§ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: gitk:11433
+#: gitk:11448
msgid "Diff: new lines"
msgstr "Diff: æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: gitk:11434
+#: gitk:11449
msgid "diff new lines"
msgstr "diff æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: gitk:11438
+#: gitk:11453
msgid "Diff: hunk header"
msgstr "Diff: hunkヘッダ"
-#: gitk:11440
+#: gitk:11455
msgid "diff hunk header"
msgstr "diff hunkヘッダ"
-#: gitk:11444
+#: gitk:11459
msgid "Marked line bg"
msgstr "マーク行ã®èƒŒæ™¯"
-#: gitk:11446
+#: gitk:11461
msgid "marked line background"
msgstr "マーク行ã®èƒŒæ™¯"
-#: gitk:11450
+#: gitk:11465
msgid "Select bg"
msgstr "é¸æŠžã®èƒŒæ™¯"
-#: gitk:11459
+#: gitk:11474
msgid "Fonts: press to choose"
msgstr "フォント: ボタンを押ã—ã¦é¸æŠž"
-#: gitk:11461
+#: gitk:11476
msgid "Main font"
msgstr "主フォント"
-#: gitk:11462
+#: gitk:11477
msgid "Diff display font"
msgstr "Diff表示用フォント"
-#: gitk:11463
+#: gitk:11478
msgid "User interface font"
msgstr "UI用フォント"
-#: gitk:11485
+#: gitk:11500
msgid "Gitk preferences"
msgstr "Gitk 設定"
-#: gitk:11494
-#, fuzzy
+#: gitk:11509
msgid "General"
-msgstr "生æˆ"
+msgstr "一般"
-#: gitk:11495
+#: gitk:11510
msgid "Colors"
-msgstr ""
+msgstr "色"
-#: gitk:11496
+#: gitk:11511
msgid "Fonts"
-msgstr ""
+msgstr "フォント"
-#: gitk:11546
+#: gitk:11561
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: 「%s〠ã®è‰²ã‚’é¸æŠž"
-#: gitk:12059
+#: gitk:12074
msgid ""
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
" Gitk requires at least Tcl/Tk 8.4."
msgstr ""
+"申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Tcl/Tk ã§ã¯ gitk を実行出æ¥ã¾ã›ã‚“。\n"
+"Gitkã®å®Ÿè¡Œã«ã¯ Tcl/Tk 8.4 以上ãŒå¿…è¦ã§ã™ã€‚"
-#: gitk:12269
+#: gitk:12284
msgid "Cannot find a git repository here."
msgstr "ã“ã“ã«ã¯gitリãƒã‚¸ãƒˆãƒªãŒã‚ã‚Šã¾ã›ã‚“。"
-#: gitk:12316
+#: gitk:12331
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "ã‚ã„ã¾ã„ãªå¼•æ•° '%s': リビジョンã¨ãƒ•ã‚¡ã‚¤ãƒ«åã®ä¸¡æ–¹ã«è§£é‡ˆã§ãã¾ã™"
-#: gitk:12328
+#: gitk:12343
msgid "Bad arguments to gitk:"
msgstr "gitkã¸ã®ä¸æ­£ãªå¼•æ•°:"
-
-#~ msgid "mc"
-#~ msgstr "mc"
-
-#~ msgid "SHA1 ID: "
-#~ msgstr "SHA1 ID: "
-
-#~ msgid "next"
-#~ msgstr "次"
-
-#~ msgid "prev"
-#~ msgstr "å‰"
-
-#~ msgid "CDate"
-#~ msgstr "作æˆæ—¥"
-
-#~ msgid "Cannot find the git directory \"%s\"."
-#~ msgstr "gitディレクトリ \"%s\" を見ã¤ã‘られã¾ã›ã‚“。"
diff --git a/gitk-git/po/sv.po b/gitk-git/po/sv.po
index 75317f4..d9d4e87 100644
--- a/gitk-git/po/sv.po
+++ b/gitk-git/po/sv.po
@@ -1,5 +1,5 @@
# Swedish translation for gitk
-# Copyright (C) 2005-2013 Paul Mackerras
+# Copyright (C) 2005-2015 Paul Mackerras
# This file is distributed under the same license as the gitk package.
#
# Mikael Magnusson <mikachu@gmail.com>, 2008.
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-17 14:32+1000\n"
-"PO-Revision-Date: 2015-03-27 10:31+0100\n"
+"POT-Creation-Date: 2015-12-09 09:40+0100\n"
+"PO-Revision-Date: 2015-12-11 09:46+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -28,7 +28,7 @@ msgstr "Kunde inte hämta lista över ej sammanslagna filer:"
msgid "Color words"
msgstr "Färga ord"
-#: gitk:217 gitk:2381 gitk:8220 gitk:8253
+#: gitk:217 gitk:2381 gitk:8221 gitk:8254
msgid "Markup words"
msgstr "Märk upp ord"
@@ -62,15 +62,15 @@ msgstr "Fel vid körning av git log:"
msgid "Reading"
msgstr "Läser"
-#: gitk:496 gitk:4525
+#: gitk:496 gitk:4526
msgid "Reading commits..."
msgstr "Läser incheckningar..."
-#: gitk:499 gitk:1637 gitk:4528
+#: gitk:499 gitk:1637 gitk:4529
msgid "No commits selected"
msgstr "Inga incheckningar markerade"
-#: gitk:1445 gitk:4045 gitk:12432
+#: gitk:1445 gitk:4046 gitk:12447
msgid "Command line"
msgstr "Kommandorad"
@@ -82,84 +82,84 @@ msgstr "Kan inte tolka utdata från git log:"
msgid "No commit information available"
msgstr "Ingen incheckningsinformation är tillgänglig"
-#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
+#: gitk:1903 gitk:1932 gitk:4316 gitk:9684 gitk:11256 gitk:11536
msgid "OK"
msgstr "OK"
-#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
-#: gitk:11242 gitk:11522
+#: gitk:1934 gitk:4318 gitk:9197 gitk:9276 gitk:9406 gitk:9455 gitk:9686
+#: gitk:11257 gitk:11537
msgid "Cancel"
msgstr "Avbryt"
#: gitk:2069
msgid "&Update"
-msgstr "Uppdatera"
+msgstr "&Uppdatera"
#: gitk:2070
msgid "&Reload"
-msgstr "Ladda om"
+msgstr "Läs &om"
#: gitk:2071
msgid "Reread re&ferences"
-msgstr "Läs om referenser"
+msgstr "Läs om &referenser"
#: gitk:2072
msgid "&List references"
-msgstr "Visa referenser"
+msgstr "&Visa referenser"
#: gitk:2074
msgid "Start git &gui"
-msgstr "Starta git gui"
+msgstr "Starta git &gui"
#: gitk:2076
msgid "&Quit"
-msgstr "Avsluta"
+msgstr "&Avsluta"
#: gitk:2068
msgid "&File"
-msgstr "Arkiv"
+msgstr "&Arkiv"
#: gitk:2080
msgid "&Preferences"
-msgstr "Inställningar"
+msgstr "&Inställningar"
#: gitk:2079
msgid "&Edit"
-msgstr "Redigera"
+msgstr "&Redigera"
#: gitk:2084
msgid "&New view..."
-msgstr "Ny vy..."
+msgstr "&Ny vy..."
#: gitk:2085
msgid "&Edit view..."
-msgstr "Ändra vy..."
+msgstr "&Ändra vy..."
#: gitk:2086
msgid "&Delete view"
-msgstr "Ta bort vy"
+msgstr "&Ta bort vy"
-#: gitk:2088 gitk:4043
+#: gitk:2088
msgid "&All files"
-msgstr "Alla filer"
+msgstr "&Alla filer"
-#: gitk:2083 gitk:4067
+#: gitk:2083
msgid "&View"
-msgstr "Visa"
+msgstr "&Visa"
-#: gitk:2093 gitk:2103 gitk:3012
+#: gitk:2093 gitk:2103
msgid "&About gitk"
-msgstr "Om gitk"
+msgstr "&Om gitk"
#: gitk:2094 gitk:2108
msgid "&Key bindings"
-msgstr "Tangentbordsbindningar"
+msgstr "&Tangentbordsbindningar"
#: gitk:2092 gitk:2107
msgid "&Help"
-msgstr "Hjälp"
+msgstr "&Hjälp"
-#: gitk:2185 gitk:8652
+#: gitk:2185 gitk:8653
msgid "SHA1 ID:"
msgstr "SHA1-id:"
@@ -175,53 +175,53 @@ msgstr "Sök"
msgid "commit"
msgstr "incheckning"
-#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
-#: gitk:6912
+#: gitk:2299 gitk:2301 gitk:4688 gitk:4711 gitk:4735 gitk:6756 gitk:6828
+#: gitk:6913
msgid "containing:"
msgstr "som innehåller:"
-#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
+#: gitk:2302 gitk:3527 gitk:3532 gitk:4764
msgid "touching paths:"
msgstr "som rör sökväg:"
-#: gitk:2303 gitk:4777
+#: gitk:2303 gitk:4778
msgid "adding/removing string:"
msgstr "som lägger/till tar bort sträng:"
-#: gitk:2304 gitk:4779
+#: gitk:2304 gitk:4780
msgid "changing lines matching:"
msgstr "ändrar rader som matchar:"
-#: gitk:2313 gitk:2315 gitk:4766
+#: gitk:2313 gitk:2315 gitk:4767
msgid "Exact"
msgstr "Exakt"
-#: gitk:2315 gitk:4854 gitk:6723
+#: gitk:2315 gitk:4855 gitk:6724
msgid "IgnCase"
msgstr "IgnVersaler"
-#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
+#: gitk:2315 gitk:4737 gitk:4853 gitk:6720
msgid "Regexp"
msgstr "Reg.uttr."
-#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
+#: gitk:2317 gitk:2318 gitk:4875 gitk:4905 gitk:4912 gitk:6849 gitk:6917
msgid "All fields"
msgstr "Alla fält"
-#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
+#: gitk:2318 gitk:4872 gitk:4905 gitk:6787
msgid "Headline"
msgstr "Rubrik"
-#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
+#: gitk:2319 gitk:4872 gitk:6787 gitk:6917 gitk:7390
msgid "Comments"
msgstr "Kommentarer"
-#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
-#: gitk:8845
+#: gitk:2319 gitk:4872 gitk:4877 gitk:4912 gitk:6787 gitk:7325 gitk:8831
+#: gitk:8846
msgid "Author"
msgstr "Författare"
-#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
+#: gitk:2319 gitk:4872 gitk:6787 gitk:7327
msgid "Committer"
msgstr "Incheckare"
@@ -249,7 +249,7 @@ msgstr "Rader sammanhang"
msgid "Ignore space change"
msgstr "Ignorera ändringar i blanksteg"
-#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
+#: gitk:2378 gitk:2380 gitk:7960 gitk:8207
msgid "Line diff"
msgstr "Rad-diff"
@@ -261,107 +261,115 @@ msgstr "Patch"
msgid "Tree"
msgstr "Träd"
-#: gitk:2617 gitk:2637
+#: gitk:2617 gitk:2638
msgid "Diff this -> selected"
msgstr "Diff denna -> markerad"
-#: gitk:2618 gitk:2638
+#: gitk:2618 gitk:2639
msgid "Diff selected -> this"
msgstr "Diff markerad -> denna"
-#: gitk:2619 gitk:2639
+#: gitk:2619 gitk:2640
msgid "Make patch"
msgstr "Skapa patch"
-#: gitk:2620 gitk:9254
+#: gitk:2620 gitk:9255
msgid "Create tag"
msgstr "Skapa tagg"
-#: gitk:2621 gitk:9371
+#: gitk:2621
+msgid "Copy commit summary"
+msgstr "Kopiera incheckningssammanfattning"
+
+#: gitk:2622 gitk:9386
msgid "Write commit to file"
msgstr "Skriv incheckning till fil"
-#: gitk:2622 gitk:9428
+#: gitk:2623 gitk:9443
msgid "Create new branch"
msgstr "Skapa ny gren"
-#: gitk:2623
+#: gitk:2624
msgid "Cherry-pick this commit"
msgstr "Plocka denna incheckning"
-#: gitk:2624
+#: gitk:2625
msgid "Reset HEAD branch to here"
msgstr "Återställ HEAD-grenen hit"
-#: gitk:2625
+#: gitk:2626
msgid "Mark this commit"
msgstr "Markera denna incheckning"
-#: gitk:2626
+#: gitk:2627
msgid "Return to mark"
msgstr "Återgå till markering"
-#: gitk:2627
+#: gitk:2628
msgid "Find descendant of this and mark"
msgstr "Hitta efterföljare till denna och markera"
-#: gitk:2628
+#: gitk:2629
msgid "Compare with marked commit"
msgstr "Jämför med markerad incheckning"
-#: gitk:2629 gitk:2640
+#: gitk:2630 gitk:2641
msgid "Diff this -> marked commit"
msgstr "Diff denna -> markerad incheckning"
-#: gitk:2630 gitk:2641
+#: gitk:2631 gitk:2642
msgid "Diff marked commit -> this"
msgstr "Diff markerad incheckning -> denna"
-#: gitk:2631
+#: gitk:2632
msgid "Revert this commit"
msgstr "Ã…ngra denna incheckning"
-#: gitk:2647
+#: gitk:2648
msgid "Check out this branch"
msgstr "Checka ut denna gren"
-#: gitk:2648
+#: gitk:2649
msgid "Remove this branch"
msgstr "Ta bort denna gren"
-#: gitk:2649
+#: gitk:2650
msgid "Copy branch name"
-msgstr ""
+msgstr "Kopiera namn på gren"
-#: gitk:2656
+#: gitk:2657
msgid "Highlight this too"
msgstr "Markera även detta"
-#: gitk:2657
+#: gitk:2658
msgid "Highlight this only"
msgstr "Markera bara detta"
-#: gitk:2658
+#: gitk:2659
msgid "External diff"
msgstr "Extern diff"
-#: gitk:2659
+#: gitk:2660
msgid "Blame parent commit"
msgstr "Klandra föräldraincheckning"
-#: gitk:2660
+#: gitk:2661
msgid "Copy path"
-msgstr ""
+msgstr "Kopiera sökväg"
-#: gitk:2667
+#: gitk:2668
msgid "Show origin of this line"
msgstr "Visa ursprunget för den här raden"
-#: gitk:2668
+#: gitk:2669
msgid "Run git gui blame on this line"
msgstr "Kör git gui blame på den här raden"
-#: gitk:3014
+#: gitk:3013
+msgid "About gitk"
+msgstr "Om gitk"
+
+#: gitk:3015
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
@@ -377,317 +385,323 @@ msgstr ""
"\n"
"Använd och vidareförmedla enligt villkoren i GNU General Public License"
-#: gitk:3022 gitk:3089 gitk:9857
+#: gitk:3023 gitk:3090 gitk:9872
msgid "Close"
msgstr "Stäng"
-#: gitk:3043
+#: gitk:3044
msgid "Gitk key bindings"
msgstr "Tangentbordsbindningar för Gitk"
-#: gitk:3046
+#: gitk:3047
msgid "Gitk key bindings:"
msgstr "Tangentbordsbindningar för Gitk:"
-#: gitk:3048
+#: gitk:3049
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tAvsluta"
-#: gitk:3049
+#: gitk:3050
#, tcl-format
msgid "<%s-W>\t\tClose window"
msgstr "<%s-W>\t\tStäng fönster"
-#: gitk:3050
+#: gitk:3051
msgid "<Home>\t\tMove to first commit"
msgstr "<Home>\t\tGå till första incheckning"
-#: gitk:3051
+#: gitk:3052
msgid "<End>\t\tMove to last commit"
msgstr "<End>\t\tGÃ¥ till sista incheckning"
-#: gitk:3052
+#: gitk:3053
msgid "<Up>, p, k\tMove up one commit"
msgstr "<Upp>, p, k\tGÃ¥ en incheckning upp"
-#: gitk:3053
+#: gitk:3054
msgid "<Down>, n, j\tMove down one commit"
msgstr "<Ned>, n, j\tGÃ¥ en incheckning ned"
-#: gitk:3054
+#: gitk:3055
msgid "<Left>, z, h\tGo back in history list"
msgstr "<Vänster>, z, h\tGå bakåt i historiken"
-#: gitk:3055
+#: gitk:3056
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Höger>, x, l\tGå framåt i historiken"
-#: gitk:3056
+#: gitk:3057
#, tcl-format
msgid "<%s-n>\tGo to n-th parent of current commit in history list"
msgstr "<%s-n>\tGå till aktuell inchecknings n:te förälder i historielistan"
-#: gitk:3057
+#: gitk:3058
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<PageUp>\tGÃ¥ upp en sida i incheckningslistan"
-#: gitk:3058
+#: gitk:3059
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<PageDown>\tGÃ¥ ned en sida i incheckningslistan"
-#: gitk:3059
+#: gitk:3060
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Home>\tRulla till början av incheckningslistan"
-#: gitk:3060
+#: gitk:3061
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-End>\tRulla till slutet av incheckningslistan"
-#: gitk:3061
+#: gitk:3062
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg"
-#: gitk:3062
+#: gitk:3063
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg"
-#: gitk:3063
+#: gitk:3064
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida"
-#: gitk:3064
+#: gitk:3065
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida"
-#: gitk:3065
+#: gitk:3066
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)"
-#: gitk:3066
+#: gitk:3067
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)"
-#: gitk:3067
+#: gitk:3068
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Delete>, b\tRulla diffvisningen upp en sida"
-#: gitk:3068
+#: gitk:3069
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Baksteg>\tRulla diffvisningen upp en sida"
-#: gitk:3069
+#: gitk:3070
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Blanksteg>\tRulla diffvisningen ned en sida"
-#: gitk:3070
+#: gitk:3071
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tRulla diffvisningen upp 18 rader"
-#: gitk:3071
+#: gitk:3072
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tRulla diffvisningen ned 18 rader"
-#: gitk:3072
+#: gitk:3073
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tSök"
-#: gitk:3073
+#: gitk:3074
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tGå till nästa sökträff"
-#: gitk:3074
+#: gitk:3075
msgid "<Return>\tMove to next find hit"
msgstr "<Return>\t\tGå till nästa sökträff"
-#: gitk:3075
-#, fuzzy
+#: gitk:3076
msgid "g\t\tGo to commit"
-msgstr "<End>\t\tGÃ¥ till sista incheckning"
+msgstr "g\t\tGÃ¥ till incheckning"
-#: gitk:3076
+#: gitk:3077
msgid "/\t\tFocus the search box"
msgstr "/\t\tFokusera sökrutan"
-#: gitk:3077
+#: gitk:3078
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tGå till föregående sökträff"
-#: gitk:3078
+#: gitk:3079
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tRulla diffvisningen till nästa fil"
-#: gitk:3079
+#: gitk:3080
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen"
-#: gitk:3080
+#: gitk:3081
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen"
-#: gitk:3081
+#: gitk:3082
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-Num+>\tÖka teckenstorlek"
-#: gitk:3082
+#: gitk:3083
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-plus>\tÖka teckenstorlek"
-#: gitk:3083
+#: gitk:3084
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-Num->\tMinska teckenstorlek"
-#: gitk:3084
+#: gitk:3085
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-minus>\tMinska teckenstorlek"
-#: gitk:3085
+#: gitk:3086
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tUppdatera"
-#: gitk:3550 gitk:3559
+#: gitk:3551 gitk:3560
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "Fel vid skapande av temporär katalog %s:"
-#: gitk:3572
+#: gitk:3573
#, tcl-format
msgid "Error getting \"%s\" from %s:"
msgstr "Fel vid hämtning av \"%s\" från %s:"
-#: gitk:3635
+#: gitk:3636
msgid "command failed:"
msgstr "kommando misslyckades:"
-#: gitk:3784
+#: gitk:3785
msgid "No such commit"
msgstr "Incheckning saknas"
-#: gitk:3798
+#: gitk:3799
msgid "git gui blame: command failed:"
msgstr "git gui blame: kommando misslyckades:"
-#: gitk:3829
+#: gitk:3830
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "Kunde inte läsa sammanslagningshuvud: %s"
-#: gitk:3837
+#: gitk:3838
#, tcl-format
msgid "Error reading index: %s"
msgstr "Fel vid läsning av index: %s"
-#: gitk:3862
+#: gitk:3863
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "Kunde inte starta git blame: %s"
-#: gitk:3865 gitk:6754
+#: gitk:3866 gitk:6755
msgid "Searching"
msgstr "Söker"
-#: gitk:3897
+#: gitk:3898
#, tcl-format
msgid "Error running git blame: %s"
msgstr "Fel vid körning av git blame: %s"
-#: gitk:3925
+#: gitk:3926
#, tcl-format
msgid "That line comes from commit %s, which is not in this view"
msgstr "Raden kommer från incheckningen %s, som inte finns i denna vy"
-#: gitk:3939
+#: gitk:3940
msgid "External diff viewer failed:"
msgstr "Externt diff-verktyg misslyckades:"
-#: gitk:4070
+#: gitk:4044
+msgid "All files"
+msgstr "Alla filer"
+
+#: gitk:4068
+msgid "View"
+msgstr "Visa"
+
+#: gitk:4071
msgid "Gitk view definition"
msgstr "Definition av Gitk-vy"
-#: gitk:4074
+#: gitk:4075
msgid "Remember this view"
msgstr "Spara denna vy"
-#: gitk:4075
+#: gitk:4076
msgid "References (space separated list):"
msgstr "Referenser (blankstegsavdelad lista):"
-#: gitk:4076
+#: gitk:4077
msgid "Branches & tags:"
msgstr "Grenar & taggar:"
-#: gitk:4077
+#: gitk:4078
msgid "All refs"
msgstr "Alla referenser"
-#: gitk:4078
+#: gitk:4079
msgid "All (local) branches"
msgstr "Alla (lokala) grenar"
-#: gitk:4079
+#: gitk:4080
msgid "All tags"
msgstr "Alla taggar"
-#: gitk:4080
+#: gitk:4081
msgid "All remote-tracking branches"
msgstr "Alla fjärrspårande grenar"
-#: gitk:4081
+#: gitk:4082
msgid "Commit Info (regular expressions):"
msgstr "Incheckningsinfo (reguljära uttryck):"
-#: gitk:4082
+#: gitk:4083
msgid "Author:"
msgstr "Författare:"
-#: gitk:4083
+#: gitk:4084
msgid "Committer:"
msgstr "Incheckare:"
-#: gitk:4084
+#: gitk:4085
msgid "Commit Message:"
msgstr "Incheckningsmeddelande:"
-#: gitk:4085
+#: gitk:4086
msgid "Matches all Commit Info criteria"
msgstr "Motsvarar alla kriterier för incheckningsinfo"
-#: gitk:4086
-#, fuzzy
+#: gitk:4087
msgid "Matches no Commit Info criteria"
msgstr "Motsvarar inga kriterier för incheckningsinfo"
-#: gitk:4087
+#: gitk:4088
msgid "Changes to Files:"
msgstr "Ändringar av filer:"
-#: gitk:4088
+#: gitk:4089
msgid "Fixed String"
msgstr "Fast sträng"
-#: gitk:4089
+#: gitk:4090
msgid "Regular Expression"
msgstr "Reguljärt uttryck"
-#: gitk:4090
+#: gitk:4091
msgid "Search string:"
msgstr "Söksträng:"
-#: gitk:4091
+#: gitk:4092
msgid ""
"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
@@ -695,201 +709,201 @@ msgstr ""
"Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
-#: gitk:4092
+#: gitk:4093
msgid "Since:"
msgstr "Från:"
-#: gitk:4093
+#: gitk:4094
msgid "Until:"
msgstr "Till:"
-#: gitk:4094
+#: gitk:4095
msgid "Limit and/or skip a number of revisions (positive integer):"
msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):"
-#: gitk:4095
+#: gitk:4096
msgid "Number to show:"
msgstr "Antal att visa:"
-#: gitk:4096
+#: gitk:4097
msgid "Number to skip:"
msgstr "Antal att hoppa över:"
-#: gitk:4097
+#: gitk:4098
msgid "Miscellaneous options:"
msgstr "Diverse alternativ:"
-#: gitk:4098
+#: gitk:4099
msgid "Strictly sort by date"
msgstr "Strikt datumsortering"
-#: gitk:4099
+#: gitk:4100
msgid "Mark branch sides"
msgstr "Markera sidogrenar"
-#: gitk:4100
+#: gitk:4101
msgid "Limit to first parent"
msgstr "Begränsa till första förälder"
-#: gitk:4101
+#: gitk:4102
msgid "Simple history"
msgstr "Enkel historik"
-#: gitk:4102
+#: gitk:4103
msgid "Additional arguments to git log:"
msgstr "Ytterligare argument till git log:"
-#: gitk:4103
+#: gitk:4104
msgid "Enter files and directories to include, one per line:"
msgstr "Ange filer och kataloger att ta med, en per rad:"
-#: gitk:4104
+#: gitk:4105
msgid "Command to generate more commits to include:"
msgstr "Kommando för att generera fler incheckningar att ta med:"
-#: gitk:4228
+#: gitk:4229
msgid "Gitk: edit view"
msgstr "Gitk: redigera vy"
-#: gitk:4236
+#: gitk:4237
msgid "-- criteria for selecting revisions"
msgstr " - kriterier för val av revisioner"
-#: gitk:4241
+#: gitk:4242
msgid "View Name"
msgstr "Namn på vy"
-#: gitk:4316
+#: gitk:4317
msgid "Apply (F5)"
msgstr "Använd (F5)"
-#: gitk:4354
+#: gitk:4355
msgid "Error in commit selection arguments:"
msgstr "Fel i argument för val av incheckningar:"
-#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
+#: gitk:4410 gitk:4463 gitk:4925 gitk:4939 gitk:6209 gitk:12388 gitk:12389
msgid "None"
msgstr "Inget"
-#: gitk:5021 gitk:5026
+#: gitk:5022 gitk:5027
msgid "Descendant"
msgstr "Avkomling"
-#: gitk:5022
+#: gitk:5023
msgid "Not descendant"
msgstr "Inte avkomling"
-#: gitk:5029 gitk:5034
+#: gitk:5030 gitk:5035
msgid "Ancestor"
msgstr "Förfader"
-#: gitk:5030
+#: gitk:5031
msgid "Not ancestor"
msgstr "Inte förfader"
-#: gitk:5324
+#: gitk:5325
msgid "Local changes checked in to index but not committed"
msgstr "Lokala ändringar sparade i indexet men inte incheckade"
-#: gitk:5360
+#: gitk:5361
msgid "Local uncommitted changes, not checked in to index"
msgstr "Lokala ändringar, ej sparade i indexet"
-#: gitk:7134
+#: gitk:7135
msgid "and many more"
msgstr "med många flera"
-#: gitk:7137
+#: gitk:7138
msgid "many"
msgstr "många"
-#: gitk:7328
+#: gitk:7329
msgid "Tags:"
msgstr "Taggar:"
-#: gitk:7345 gitk:7351 gitk:8825
+#: gitk:7346 gitk:7352 gitk:8826
msgid "Parent"
msgstr "Förälder"
-#: gitk:7356
+#: gitk:7357
msgid "Child"
msgstr "Barn"
-#: gitk:7365
+#: gitk:7366
msgid "Branch"
msgstr "Gren"
-#: gitk:7368
+#: gitk:7369
msgid "Follows"
msgstr "Följer"
-#: gitk:7371
+#: gitk:7372
msgid "Precedes"
msgstr "Föregår"
-#: gitk:7966
+#: gitk:7967
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "Fel vid hämtning av diff: %s"
-#: gitk:8650
+#: gitk:8651
msgid "Goto:"
msgstr "GÃ¥ till:"
-#: gitk:8671
+#: gitk:8672
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "Förkortat SHA1-id %s är tvetydigt"
-#: gitk:8678
+#: gitk:8679
#, tcl-format
msgid "Revision %s is not known"
msgstr "Revisionen %s är inte känd"
-#: gitk:8688
+#: gitk:8689
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "SHA-id:t %s är inte känt"
-#: gitk:8690
+#: gitk:8691
#, tcl-format
msgid "Revision %s is not in the current view"
msgstr "Revisionen %s finns inte i den nuvarande vyn"
-#: gitk:8832 gitk:8847
+#: gitk:8833 gitk:8848
msgid "Date"
msgstr "Datum"
-#: gitk:8835
+#: gitk:8836
msgid "Children"
msgstr "Barn"
-#: gitk:8898
+#: gitk:8899
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Återställ grenen %s hit"
-#: gitk:8900
+#: gitk:8901
msgid "Detached head: can't reset"
msgstr "Frånkopplad head: kan inte återställa"
-#: gitk:9005 gitk:9011
+#: gitk:9006 gitk:9012
msgid "Skipping merge commit "
msgstr "Hoppar över sammanslagningsincheckning "
-#: gitk:9020 gitk:9025
+#: gitk:9021 gitk:9026
msgid "Error getting patch ID for "
msgstr "Fel vid hämtning av patch-id för "
-#: gitk:9021 gitk:9026
+#: gitk:9022 gitk:9027
msgid " - stopping\n"
msgstr " - stannar\n"
-#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
+#: gitk:9032 gitk:9035 gitk:9043 gitk:9057 gitk:9066
msgid "Commit "
msgstr "Incheckning "
-#: gitk:9035
+#: gitk:9036
msgid ""
" is the same patch as\n"
" "
@@ -897,7 +911,7 @@ msgstr ""
" är samma patch som\n"
" "
-#: gitk:9043
+#: gitk:9044
msgid ""
" differs from\n"
" "
@@ -905,7 +919,7 @@ msgstr ""
" skiljer sig från\n"
" "
-#: gitk:9045
+#: gitk:9046
msgid ""
"Diff of commits:\n"
"\n"
@@ -913,131 +927,131 @@ msgstr ""
"Skillnad mellan incheckningar:\n"
"\n"
-#: gitk:9057 gitk:9066
+#: gitk:9058 gitk:9067
#, tcl-format
msgid " has %s children - stopping\n"
msgstr " har %s barn - stannar\n"
-#: gitk:9085
+#: gitk:9086
#, tcl-format
msgid "Error writing commit to file: %s"
msgstr "Fel vid skrivning av incheckning till fil: %s"
-#: gitk:9091
+#: gitk:9092
#, tcl-format
msgid "Error diffing commits: %s"
msgstr "Fel vid jämförelse av incheckningar: %s"
-#: gitk:9137
+#: gitk:9138
msgid "Top"
msgstr "Topp"
-#: gitk:9138
+#: gitk:9139
msgid "From"
msgstr "Från"
-#: gitk:9143
+#: gitk:9144
msgid "To"
msgstr "Till"
-#: gitk:9167
+#: gitk:9168
msgid "Generate patch"
msgstr "Generera patch"
-#: gitk:9169
+#: gitk:9170
msgid "From:"
msgstr "Från:"
-#: gitk:9178
+#: gitk:9179
msgid "To:"
msgstr "Till:"
-#: gitk:9187
+#: gitk:9188
msgid "Reverse"
msgstr "Vänd"
-#: gitk:9189 gitk:9385
+#: gitk:9190 gitk:9400
msgid "Output file:"
msgstr "Utdatafil:"
-#: gitk:9195
+#: gitk:9196
msgid "Generate"
msgstr "Generera"
-#: gitk:9233
+#: gitk:9234
msgid "Error creating patch:"
msgstr "Fel vid generering av patch:"
-#: gitk:9256 gitk:9373 gitk:9430
+#: gitk:9257 gitk:9388 gitk:9445
msgid "ID:"
msgstr "Id:"
-#: gitk:9265
+#: gitk:9266
msgid "Tag name:"
msgstr "Taggnamn:"
-#: gitk:9268
+#: gitk:9269
msgid "Tag message is optional"
msgstr "Taggmeddelandet är valfritt"
-#: gitk:9270
+#: gitk:9271
msgid "Tag message:"
msgstr "Taggmeddelande:"
-#: gitk:9274 gitk:9439
+#: gitk:9275 gitk:9454
msgid "Create"
msgstr "Skapa"
-#: gitk:9292
+#: gitk:9293
msgid "No tag name specified"
msgstr "Inget taggnamn angavs"
-#: gitk:9296
+#: gitk:9297
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "Taggen \"%s\" finns redan"
-#: gitk:9306
+#: gitk:9307
msgid "Error creating tag:"
msgstr "Fel vid skapande av tagg:"
-#: gitk:9382
+#: gitk:9397
msgid "Command:"
msgstr "Kommando:"
-#: gitk:9390
+#: gitk:9405
msgid "Write"
msgstr "Skriv"
-#: gitk:9408
+#: gitk:9423
msgid "Error writing commit:"
msgstr "Fel vid skrivning av incheckning:"
-#: gitk:9435
+#: gitk:9450
msgid "Name:"
msgstr "Namn:"
-#: gitk:9458
+#: gitk:9473
msgid "Please specify a name for the new branch"
msgstr "Ange ett namn för den nya grenen"
-#: gitk:9463
+#: gitk:9478
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "Grenen \"%s\" finns redan. Skriva över?"
-#: gitk:9530
+#: gitk:9545
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr ""
"Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras "
"på nytt?"
-#: gitk:9535
+#: gitk:9550
msgid "Cherry-picking"
msgstr "Plockar"
-#: gitk:9544
+#: gitk:9559
#, tcl-format
msgid ""
"Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1047,7 +1061,7 @@ msgstr ""
"Checka in, återställ eller spara undan (stash) dina ändringar och försök "
"igen."
-#: gitk:9550
+#: gitk:9565
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
@@ -1055,20 +1069,20 @@ msgstr ""
"Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n"
"Vill du köra git citool för att lösa den?"
-#: gitk:9566 gitk:9624
+#: gitk:9581 gitk:9639
msgid "No changes committed"
msgstr "Inga ändringar incheckade"
-#: gitk:9593
+#: gitk:9608
#, tcl-format
msgid "Commit %s is not included in branch %s -- really revert it?"
msgstr "Incheckningen %s finns inte på grenen %s -- vill du verkligen ångra?"
-#: gitk:9598
+#: gitk:9613
msgid "Reverting"
msgstr "Ã…ngrar"
-#: gitk:9606
+#: gitk:9621
#, tcl-format
msgid ""
"Revert failed because of local changes to the following files:%s Please "
@@ -1078,7 +1092,7 @@ msgstr ""
"Checka in, återställ eller spara undan (stash) dina ändringar och försök "
"igen."
-#: gitk:9610
+#: gitk:9625
msgid ""
"Revert failed because of merge conflict.\n"
" Do you wish to run git citool to resolve it?"
@@ -1086,28 +1100,28 @@ msgstr ""
"Misslyckades med att ångra på grund av en sammanslagningskonflikt.\n"
" Vill du köra git citool för att lösa den?"
-#: gitk:9653
+#: gitk:9668
msgid "Confirm reset"
msgstr "Bekräfta återställning"
-#: gitk:9655
+#: gitk:9670
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Återställa grenen %s till %s?"
-#: gitk:9657
+#: gitk:9672
msgid "Reset type:"
msgstr "Typ av återställning:"
-#: gitk:9660
+#: gitk:9675
msgid "Soft: Leave working tree and index untouched"
msgstr "Mjuk: Rör inte utcheckning och index"
-#: gitk:9663
+#: gitk:9678
msgid "Mixed: Leave working tree untouched, reset index"
msgstr "Blandad: Rör inte utcheckning, återställ index"
-#: gitk:9666
+#: gitk:9681
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
@@ -1115,19 +1129,19 @@ msgstr ""
"Hård: Återställ utcheckning och index\n"
"(förkastar ALLA lokala ändringar)"
-#: gitk:9683
+#: gitk:9698
msgid "Resetting"
msgstr "Återställer"
-#: gitk:9743
+#: gitk:9758
msgid "Checking out"
msgstr "Checkar ut"
-#: gitk:9796
+#: gitk:9811
msgid "Cannot delete the currently checked-out branch"
msgstr "Kan inte ta bort den just nu utcheckade grenen"
-#: gitk:9802
+#: gitk:9817
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
@@ -1136,16 +1150,16 @@ msgstr ""
"Incheckningarna på grenen %s existerar inte på någon annan gren.\n"
"Vill du verkligen ta bort grenen %s?"
-#: gitk:9833
+#: gitk:9848
#, tcl-format
msgid "Tags and heads: %s"
msgstr "Taggar och huvuden: %s"
-#: gitk:9850
+#: gitk:9865
msgid "Filter"
msgstr "Filter"
-#: gitk:10146
+#: gitk:10161
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
@@ -1153,201 +1167,201 @@ msgstr ""
"Fel vid läsning av information om incheckningstopologi; information om "
"grenar och föregående/senare taggar kommer inte vara komplett."
-#: gitk:11123
+#: gitk:11138
msgid "Tag"
msgstr "Tagg"
-#: gitk:11127
+#: gitk:11142
msgid "Id"
msgstr "Id"
-#: gitk:11210
+#: gitk:11225
msgid "Gitk font chooser"
msgstr "Teckensnittsväljare för Gitk"
-#: gitk:11227
+#: gitk:11242
msgid "B"
msgstr "F"
-#: gitk:11230
+#: gitk:11245
msgid "I"
msgstr "K"
-#: gitk:11348
+#: gitk:11363
msgid "Commit list display options"
msgstr "Alternativ för incheckningslistvy"
-#: gitk:11351
+#: gitk:11366
msgid "Maximum graph width (lines)"
msgstr "Maximal grafbredd (rader)"
-#: gitk:11355
+#: gitk:11370
#, no-tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Maximal grafbredd (% av ruta)"
-#: gitk:11358
+#: gitk:11373
msgid "Show local changes"
msgstr "Visa lokala ändringar"
-#: gitk:11361
+#: gitk:11376
msgid "Auto-select SHA1 (length)"
msgstr "Välj SHA1 (längd) automatiskt"
-#: gitk:11365
+#: gitk:11380
msgid "Hide remote refs"
msgstr "Dölj fjärr-referenser"
-#: gitk:11369
+#: gitk:11384
msgid "Diff display options"
msgstr "Alternativ för diffvy"
-#: gitk:11371
+#: gitk:11386
msgid "Tab spacing"
msgstr "Blanksteg för tabulatortecken"
-#: gitk:11374
+#: gitk:11389
msgid "Display nearby tags/heads"
msgstr "Visa närliggande taggar/huvuden"
-#: gitk:11377
+#: gitk:11392
msgid "Maximum # tags/heads to show"
msgstr "Maximalt antal taggar/huvuden att visa"
-#: gitk:11380
+#: gitk:11395
msgid "Limit diffs to listed paths"
msgstr "Begränsa diff till listade sökvägar"
-#: gitk:11383
+#: gitk:11398
msgid "Support per-file encodings"
msgstr "Stöd för filspecifika teckenkodningar"
-#: gitk:11389 gitk:11536
+#: gitk:11404 gitk:11551
msgid "External diff tool"
msgstr "Externt diff-verktyg"
-#: gitk:11390
+#: gitk:11405
msgid "Choose..."
msgstr "Välj..."
-#: gitk:11395
+#: gitk:11410
msgid "General options"
msgstr "Allmänna inställningar"
-#: gitk:11398
+#: gitk:11413
msgid "Use themed widgets"
msgstr "Använd tema på fönsterelement"
-#: gitk:11400
+#: gitk:11415
msgid "(change requires restart)"
msgstr "(ändringen kräver omstart)"
-#: gitk:11402
+#: gitk:11417
msgid "(currently unavailable)"
msgstr "(för närvarande inte tillgängligt)"
-#: gitk:11413
+#: gitk:11428
msgid "Colors: press to choose"
msgstr "Färger: tryck för att välja"
-#: gitk:11416
+#: gitk:11431
msgid "Interface"
msgstr "Gränssnitt"
-#: gitk:11417
+#: gitk:11432
msgid "interface"
msgstr "gränssnitt"
-#: gitk:11420
+#: gitk:11435
msgid "Background"
msgstr "Bakgrund"
-#: gitk:11421 gitk:11451
+#: gitk:11436 gitk:11466
msgid "background"
msgstr "bakgrund"
-#: gitk:11424
+#: gitk:11439
msgid "Foreground"
msgstr "Förgrund"
-#: gitk:11425
+#: gitk:11440
msgid "foreground"
msgstr "förgrund"
-#: gitk:11428
+#: gitk:11443
msgid "Diff: old lines"
msgstr "Diff: gamla rader"
-#: gitk:11429
+#: gitk:11444
msgid "diff old lines"
msgstr "diff gamla rader"
-#: gitk:11433
+#: gitk:11448
msgid "Diff: new lines"
msgstr "Diff: nya rader"
-#: gitk:11434
+#: gitk:11449
msgid "diff new lines"
msgstr "diff nya rader"
-#: gitk:11438
+#: gitk:11453
msgid "Diff: hunk header"
msgstr "Diff: delhuvud"
-#: gitk:11440
+#: gitk:11455
msgid "diff hunk header"
msgstr "diff delhuvud"
-#: gitk:11444
+#: gitk:11459
msgid "Marked line bg"
msgstr "Markerad rad bakgrund"
-#: gitk:11446
+#: gitk:11461
msgid "marked line background"
msgstr "markerad rad bakgrund"
-#: gitk:11450
+#: gitk:11465
msgid "Select bg"
msgstr "Markerad bakgrund"
-#: gitk:11459
+#: gitk:11474
msgid "Fonts: press to choose"
msgstr "Teckensnitt: tryck för att välja"
-#: gitk:11461
+#: gitk:11476
msgid "Main font"
msgstr "Huvudteckensnitt"
-#: gitk:11462
+#: gitk:11477
msgid "Diff display font"
msgstr "Teckensnitt för diffvisning"
-#: gitk:11463
+#: gitk:11478
msgid "User interface font"
msgstr "Teckensnitt för användargränssnitt"
-#: gitk:11485
+#: gitk:11500
msgid "Gitk preferences"
msgstr "Inställningar för Gitk"
-#: gitk:11494
+#: gitk:11509
msgid "General"
msgstr "Allmänt"
-#: gitk:11495
+#: gitk:11510
msgid "Colors"
msgstr "Färger"
-#: gitk:11496
+#: gitk:11511
msgid "Fonts"
msgstr "Teckensnitt"
-#: gitk:11546
+#: gitk:11561
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: välj färg för %s"
-#: gitk:12059
+#: gitk:12074
msgid ""
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
" Gitk requires at least Tcl/Tk 8.4."
@@ -1355,16 +1369,16 @@ msgstr ""
"Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n"
" Gitk kräver åtminstone Tcl/Tk 8.4."
-#: gitk:12269
+#: gitk:12284
msgid "Cannot find a git repository here."
msgstr "Hittar inget git-arkiv här."
-#: gitk:12316
+#: gitk:12331
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "Tvetydigt argument \"%s\": både revision och filnamn"
-#: gitk:12328
+#: gitk:12343
msgid "Bad arguments to gitk:"
msgstr "Felaktiga argument till gitk:"
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 7a5b23a..05d7910 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -7576,7 +7576,7 @@ sub git_object {
git_cmd(), 'cat-file', '-t', $object_id) . ' 2> /dev/null'
or die_error(404, "Object does not exist");
$type = <$fd>;
- chomp $type;
+ defined $type && chomp $type;
close $fd
or die_error(404, "Object does not exist");
diff --git a/http.c b/http.c
index 0da9e66..dfc53c1 100644
--- a/http.c
+++ b/http.c
@@ -62,6 +62,26 @@ static long curl_low_speed_limit = -1;
static long curl_low_speed_time = -1;
static int curl_ftp_no_epsv;
static const char *curl_http_proxy;
+static const char *http_proxy_authmethod;
+static struct {
+ const char *name;
+ long curlauth_param;
+} proxy_authmethods[] = {
+ { "basic", CURLAUTH_BASIC },
+ { "digest", CURLAUTH_DIGEST },
+ { "negotiate", CURLAUTH_GSSNEGOTIATE },
+ { "ntlm", CURLAUTH_NTLM },
+#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
+ { "anyauth", CURLAUTH_ANY },
+#endif
+ /*
+ * CURLAUTH_DIGEST_IE has no corresponding command-line option in
+ * curl(1) and is not included in CURLAUTH_ANY, so we leave it out
+ * here, too
+ */
+};
+static struct credential proxy_auth = CREDENTIAL_INIT;
+static const char *curl_proxyuserpwd;
static const char *curl_cookie_file;
static int curl_save_cookies;
struct credential http_auth = CREDENTIAL_INIT;
@@ -159,6 +179,9 @@ static void finish_active_slot(struct active_request_slot *slot)
#else
slot->results->auth_avail = 0;
#endif
+
+ curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CONNECTCODE,
+ &slot->results->http_connectcode);
}
/* Run callback if appropriate */
@@ -256,6 +279,9 @@ static int http_options(const char *var, const char *value, void *cb)
if (!strcmp("http.proxy", var))
return git_config_string(&curl_http_proxy, var, value);
+ if (!strcmp("http.proxyauthmethod", var))
+ return git_config_string(&http_proxy_authmethod, var, value);
+
if (!strcmp("http.cookiefile", var))
return git_config_string(&curl_cookie_file, var, value);
if (!strcmp("http.savecookies", var)) {
@@ -304,6 +330,64 @@ static void init_curl_http_auth(CURL *result)
#endif
}
+/* *var must be free-able */
+static void var_override(const char **var, char *value)
+{
+ if (value) {
+ free((void *)*var);
+ *var = xstrdup(value);
+ }
+}
+
+static void set_proxyauth_name_password(CURL *result)
+{
+#if LIBCURL_VERSION_NUM >= 0x071301
+ curl_easy_setopt(result, CURLOPT_PROXYUSERNAME,
+ proxy_auth.username);
+ curl_easy_setopt(result, CURLOPT_PROXYPASSWORD,
+ proxy_auth.password);
+#else
+ struct strbuf s = STRBUF_INIT;
+
+ strbuf_addstr_urlencode(&s, proxy_auth.username, 1);
+ strbuf_addch(&s, ':');
+ strbuf_addstr_urlencode(&s, proxy_auth.password, 1);
+ curl_proxyuserpwd = strbuf_detach(&s, NULL);
+ curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, curl_proxyuserpwd);
+#endif
+}
+
+static void init_curl_proxy_auth(CURL *result)
+{
+ if (proxy_auth.username) {
+ if (!proxy_auth.password)
+ credential_fill(&proxy_auth);
+ set_proxyauth_name_password(result);
+ }
+
+ var_override(&http_proxy_authmethod, getenv("GIT_HTTP_PROXY_AUTHMETHOD"));
+
+#if LIBCURL_VERSION_NUM >= 0x070a07 /* CURLOPT_PROXYAUTH and CURLAUTH_ANY */
+ if (http_proxy_authmethod) {
+ int i;
+ for (i = 0; i < ARRAY_SIZE(proxy_authmethods); i++) {
+ if (!strcmp(http_proxy_authmethod, proxy_authmethods[i].name)) {
+ curl_easy_setopt(result, CURLOPT_PROXYAUTH,
+ proxy_authmethods[i].curlauth_param);
+ break;
+ }
+ }
+ if (i == ARRAY_SIZE(proxy_authmethods)) {
+ warning("unsupported proxy authentication method %s: using anyauth",
+ http_proxy_authmethod);
+ curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
+ }
+ }
+ else
+ curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
+#endif
+}
+
static int has_cert_password(void)
{
if (ssl_cert == NULL || ssl_cert_password_required != 1)
@@ -462,6 +546,31 @@ static CURL *get_curl_handle(void)
curl_easy_setopt(result, CURLOPT_USE_SSL, CURLUSESSL_TRY);
#endif
+ /*
+ * CURL also examines these variables as a fallback; but we need to query
+ * them here in order to decide whether to prompt for missing password (cf.
+ * init_curl_proxy_auth()).
+ *
+ * Unlike many other common environment variables, these are historically
+ * lowercase only. It appears that CURL did not know this and implemented
+ * only uppercase variants, which was later corrected to take both - with
+ * the exception of http_proxy, which is lowercase only also in CURL. As
+ * the lowercase versions are the historical quasi-standard, they take
+ * precedence here, as in CURL.
+ */
+ if (!curl_http_proxy) {
+ if (!strcmp(http_auth.protocol, "https")) {
+ var_override(&curl_http_proxy, getenv("HTTPS_PROXY"));
+ var_override(&curl_http_proxy, getenv("https_proxy"));
+ } else {
+ var_override(&curl_http_proxy, getenv("http_proxy"));
+ }
+ if (!curl_http_proxy) {
+ var_override(&curl_http_proxy, getenv("ALL_PROXY"));
+ var_override(&curl_http_proxy, getenv("all_proxy"));
+ }
+ }
+
if (curl_http_proxy) {
curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
#if LIBCURL_VERSION_NUM >= 0x071800
@@ -475,10 +584,18 @@ static CURL *get_curl_handle(void)
curl_easy_setopt(result,
CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);
#endif
+ if (strstr(curl_http_proxy, "://"))
+ credential_from_url(&proxy_auth, curl_http_proxy);
+ else {
+ struct strbuf url = STRBUF_INIT;
+ strbuf_addf(&url, "http://%s", curl_http_proxy);
+ credential_from_url(&proxy_auth, url.buf);
+ strbuf_release(&url);
+ }
+
+ curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
}
-#if LIBCURL_VERSION_NUM >= 0x070a07
- curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
-#endif
+ init_curl_proxy_auth(result);
set_curl_keepalive(result);
@@ -519,6 +636,9 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
if (remote && remote->http_proxy)
curl_http_proxy = xstrdup(remote->http_proxy);
+ if (remote)
+ var_override(&http_proxy_authmethod, remote->http_proxy_authmethod);
+
pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache");
no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");
@@ -617,6 +737,18 @@ void http_cleanup(void)
curl_http_proxy = NULL;
}
+ if (proxy_auth.password) {
+ memset(proxy_auth.password, 0, strlen(proxy_auth.password));
+ free(proxy_auth.password);
+ proxy_auth.password = NULL;
+ }
+
+ free((void *)curl_proxyuserpwd);
+ curl_proxyuserpwd = NULL;
+
+ free((void *)http_proxy_authmethod);
+ http_proxy_authmethod = NULL;
+
if (cert_auth.password != NULL) {
memset(cert_auth.password, 0, strlen(cert_auth.password));
free(cert_auth.password);
@@ -946,6 +1078,8 @@ static int handle_curl_result(struct slot_results *results)
if (results->curl_result == CURLE_OK) {
credential_approve(&http_auth);
+ if (proxy_auth.password)
+ credential_approve(&proxy_auth);
return HTTP_OK;
} else if (missing_target(results))
return HTTP_MISSING_TARGET;
@@ -960,6 +1094,8 @@ static int handle_curl_result(struct slot_results *results)
return HTTP_REAUTH;
}
} else {
+ if (results->http_connectcode == 407)
+ credential_reject(&proxy_auth);
#if LIBCURL_VERSION_NUM >= 0x070c00
if (!curl_errorstr[0])
strlcpy(curl_errorstr,
diff --git a/http.h b/http.h
index 4f97b60..f83cfa6 100644
--- a/http.h
+++ b/http.h
@@ -54,6 +54,7 @@ struct slot_results {
CURLcode curl_result;
long http_code;
long auth_avail;
+ long http_connectcode;
};
struct active_request_slot {
diff --git a/ident.c b/ident.c
index 00a62e0..3da5556 100644
--- a/ident.c
+++ b/ident.c
@@ -10,6 +10,8 @@
static struct strbuf git_default_name = STRBUF_INIT;
static struct strbuf git_default_email = STRBUF_INIT;
static struct strbuf git_default_date = STRBUF_INIT;
+static int default_email_is_bogus;
+static int default_name_is_bogus;
#define IDENT_NAME_GIVEN 01
#define IDENT_MAIL_GIVEN 02
@@ -23,6 +25,25 @@ static int author_ident_explicitly_given;
#define get_gecos(struct_passwd) ((struct_passwd)->pw_gecos)
#endif
+static struct passwd *xgetpwuid_self(int *is_bogus)
+{
+ struct passwd *pw;
+
+ errno = 0;
+ pw = getpwuid(getuid());
+ if (!pw) {
+ static struct passwd fallback;
+ fallback.pw_name = "unknown";
+#ifndef NO_GECOS_IN_PWENT
+ fallback.pw_gecos = "Unknown";
+#endif
+ pw = &fallback;
+ if (is_bogus)
+ *is_bogus = 1;
+ }
+ return pw;
+}
+
static void copy_gecos(const struct passwd *w, struct strbuf *name)
{
char *src;
@@ -55,7 +76,7 @@ static int add_mailname_host(struct strbuf *buf)
strerror(errno));
return -1;
}
- if (strbuf_getline(&mailnamebuf, mailname, '\n') == EOF) {
+ if (strbuf_getline(&mailnamebuf, mailname) == EOF) {
if (ferror(mailname))
warning("cannot read /etc/mailname: %s",
strerror(errno));
@@ -96,22 +117,26 @@ static int canonical_name(const char *host, struct strbuf *out)
return status;
}
-static void add_domainname(struct strbuf *out)
+static void add_domainname(struct strbuf *out, int *is_bogus)
{
char buf[1024];
if (gethostname(buf, sizeof(buf))) {
warning("cannot get host name: %s", strerror(errno));
strbuf_addstr(out, "(none)");
+ *is_bogus = 1;
return;
}
if (strchr(buf, '.'))
strbuf_addstr(out, buf);
- else if (canonical_name(buf, out) < 0)
+ else if (canonical_name(buf, out) < 0) {
strbuf_addf(out, "%s.(none)", buf);
+ *is_bogus = 1;
+ }
}
-static void copy_email(const struct passwd *pw, struct strbuf *email)
+static void copy_email(const struct passwd *pw, struct strbuf *email,
+ int *is_bogus)
{
/*
* Make up a fake email address
@@ -122,13 +147,13 @@ static void copy_email(const struct passwd *pw, struct strbuf *email)
if (!add_mailname_host(email))
return; /* read from "/etc/mailname" (Debian) */
- add_domainname(email);
+ add_domainname(email, is_bogus);
}
const char *ident_default_name(void)
{
if (!git_default_name.len) {
- copy_gecos(xgetpwuid_self(), &git_default_name);
+ copy_gecos(xgetpwuid_self(&default_name_is_bogus), &git_default_name);
strbuf_trim(&git_default_name);
}
return git_default_name.buf;
@@ -144,7 +169,8 @@ const char *ident_default_email(void)
committer_ident_explicitly_given |= IDENT_MAIL_GIVEN;
author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
} else
- copy_email(xgetpwuid_self(), &git_default_email);
+ copy_email(xgetpwuid_self(&default_email_is_bogus),
+ &git_default_email, &default_email_is_bogus);
strbuf_trim(&git_default_email);
}
return git_default_email.buf;
@@ -332,12 +358,17 @@ const char *fmt_ident(const char *name, const char *email,
fputs(env_hint, stderr);
die("empty ident name (for <%s>) not allowed", email);
}
- pw = xgetpwuid_self();
+ pw = xgetpwuid_self(NULL);
name = pw->pw_name;
}
- if (strict && email == git_default_email.buf &&
- strstr(email, "(none)")) {
+ if (want_name && strict &&
+ name == git_default_name.buf && default_name_is_bogus) {
+ fputs(env_hint, stderr);
+ die("unable to auto-detect name (got '%s')", name);
+ }
+
+ if (strict && email == git_default_email.buf && default_email_is_bogus) {
fputs(env_hint, stderr);
die("unable to auto-detect email address (got '%s')", email);
}
diff --git a/log-tree.c b/log-tree.c
index 35e7801..f70a30e 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -342,7 +342,8 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
{
const char *subject = NULL;
const char *extra_headers = opt->extra_headers;
- const char *name = oid_to_hex(&commit->object.oid);
+ const char *name = oid_to_hex(opt->zero_commit ?
+ &null_oid : &commit->object.oid);
*need_8bit_cte_p = 0; /* unknown */
if (opt->total > 0) {
diff --git a/mailinfo.c b/mailinfo.c
index f289941..9f19ca1 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -732,7 +732,7 @@ static int read_one_header_line(struct strbuf *line, FILE *in)
struct strbuf continuation = STRBUF_INIT;
/* Get the first part of the line. */
- if (strbuf_getline(line, in, '\n'))
+ if (strbuf_getline_lf(line, in))
return 0;
/*
@@ -756,7 +756,7 @@ static int read_one_header_line(struct strbuf *line, FILE *in)
peek = fgetc(in); ungetc(peek, in);
if (peek != ' ' && peek != '\t')
break;
- if (strbuf_getline(&continuation, in, '\n'))
+ if (strbuf_getline_lf(&continuation, in))
break;
continuation.buf[0] = ' ';
strbuf_rtrim(&continuation);
@@ -769,7 +769,7 @@ static int read_one_header_line(struct strbuf *line, FILE *in)
static int find_boundary(struct mailinfo *mi, struct strbuf *line)
{
- while (!strbuf_getline(line, mi->input, '\n')) {
+ while (!strbuf_getline_lf(line, mi->input)) {
if (*(mi->content_top) && is_multipart_boundary(mi, line))
return 1;
}
@@ -820,7 +820,7 @@ again:
strbuf_release(&newline);
/* replenish line */
- if (strbuf_getline(line, mi->input, '\n'))
+ if (strbuf_getline_lf(line, mi->input))
return 0;
strbuf_addch(line, '\n');
return 1;
diff --git a/notes-cache.c b/notes-cache.c
index c4e9bb7..5dfc5cb 100644
--- a/notes-cache.c
+++ b/notes-cache.c
@@ -32,14 +32,14 @@ void notes_cache_init(struct notes_cache *c, const char *name,
const char *validity)
{
struct strbuf ref = STRBUF_INIT;
- int flags = 0;
+ int flags = NOTES_INIT_WRITABLE;
memset(c, 0, sizeof(*c));
c->validity = xstrdup(validity);
strbuf_addf(&ref, "refs/notes/%s", name);
if (!notes_cache_match_validity(ref.buf, validity))
- flags = NOTES_INIT_EMPTY;
+ flags |= NOTES_INIT_EMPTY;
init_notes(&c->tree, ref.buf, combine_notes_overwrite, flags);
strbuf_release(&ref);
}
@@ -49,7 +49,8 @@ int notes_cache_write(struct notes_cache *c)
unsigned char tree_sha1[20];
unsigned char commit_sha1[20];
- if (!c || !c->tree.initialized || !c->tree.ref || !*c->tree.ref)
+ if (!c || !c->tree.initialized || !c->tree.update_ref ||
+ !*c->tree.update_ref)
return -1;
if (!c->tree.dirty)
return 0;
@@ -59,8 +60,8 @@ int notes_cache_write(struct notes_cache *c)
if (commit_tree(c->validity, strlen(c->validity), tree_sha1, NULL,
commit_sha1, NULL, NULL) < 0)
return -1;
- if (update_ref("update notes cache", c->tree.ref, commit_sha1, NULL,
- 0, UPDATE_REFS_QUIET_ON_ERR) < 0)
+ if (update_ref("update notes cache", c->tree.update_ref, commit_sha1,
+ NULL, 0, UPDATE_REFS_QUIET_ON_ERR) < 0)
return -1;
return 0;
diff --git a/notes-utils.c b/notes-utils.c
index 299e34b..24a3361 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -37,7 +37,7 @@ void commit_notes(struct notes_tree *t, const char *msg)
if (!t)
t = &default_notes_tree;
- if (!t->initialized || !t->ref || !*t->ref)
+ if (!t->initialized || !t->update_ref || !*t->update_ref)
die(_("Cannot commit uninitialized/unreferenced notes tree"));
if (!t->dirty)
return; /* don't have to commit an unchanged tree */
@@ -48,7 +48,7 @@ void commit_notes(struct notes_tree *t, const char *msg)
create_notes_commit(t, NULL, buf.buf, buf.len, commit_sha1);
strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
- update_ref(buf.buf, t->ref, commit_sha1, NULL, 0,
+ update_ref(buf.buf, t->update_ref, commit_sha1, NULL, 0,
UPDATE_REFS_DIE_ON_ERR);
strbuf_release(&buf);
@@ -148,7 +148,7 @@ struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd)
free(c);
return NULL;
}
- c->trees = load_notes_trees(c->refs);
+ c->trees = load_notes_trees(c->refs, NOTES_INIT_WRITABLE);
string_list_clear(c->refs, 0);
free(c->refs);
return c;
diff --git a/notes.c b/notes.c
index db77922..c1e5035 100644
--- a/notes.c
+++ b/notes.c
@@ -1011,13 +1011,16 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
t->first_non_note = NULL;
t->prev_non_note = NULL;
t->ref = xstrdup_or_null(notes_ref);
+ t->update_ref = (flags & NOTES_INIT_WRITABLE) ? t->ref : NULL;
t->combine_notes = combine_notes;
t->initialized = 1;
t->dirty = 0;
if (flags & NOTES_INIT_EMPTY || !notes_ref ||
- read_ref(notes_ref, object_sha1))
+ get_sha1_treeish(notes_ref, object_sha1))
return;
+ if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, object_sha1))
+ die("Cannot use notes ref %s", notes_ref);
if (get_tree_entry(object_sha1, "", sha1, &mode))
die("Failed to read notes tree referenced by %s (%s)",
notes_ref, sha1_to_hex(object_sha1));
@@ -1027,7 +1030,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
load_subtree(t, &root_tree, t->root, 0);
}
-struct notes_tree **load_notes_trees(struct string_list *refs)
+struct notes_tree **load_notes_trees(struct string_list *refs, int flags)
{
struct string_list_item *item;
int counter = 0;
@@ -1035,7 +1038,7 @@ struct notes_tree **load_notes_trees(struct string_list *refs)
trees = xmalloc((refs->nr+1) * sizeof(struct notes_tree *));
for_each_string_list_item(item, refs) {
struct notes_tree *t = xcalloc(1, sizeof(struct notes_tree));
- init_notes(t, item->string, combine_notes_ignore, 0);
+ init_notes(t, item->string, combine_notes_ignore, flags);
trees[counter++] = t;
}
trees[counter] = NULL;
@@ -1071,7 +1074,7 @@ void init_display_notes(struct display_notes_opt *opt)
item->string);
}
- display_notes_trees = load_notes_trees(&display_notes_refs);
+ display_notes_trees = load_notes_trees(&display_notes_refs, 0);
string_list_clear(&display_notes_refs, 0);
}
@@ -1303,3 +1306,13 @@ void expand_notes_ref(struct strbuf *sb)
else
strbuf_insert(sb, 0, "refs/notes/", 11);
}
+
+void expand_loose_notes_ref(struct strbuf *sb)
+{
+ unsigned char object[20];
+
+ if (get_sha1(sb->buf, object)) {
+ /* fallback to expand_notes_ref */
+ expand_notes_ref(sb);
+ }
+}
diff --git a/notes.h b/notes.h
index 2a3f923..5345642 100644
--- a/notes.h
+++ b/notes.h
@@ -44,6 +44,7 @@ extern struct notes_tree {
struct int_node *root;
struct non_note *first_non_note, *prev_non_note;
char *ref;
+ char *update_ref;
combine_notes_fn combine_notes;
int initialized;
int dirty;
@@ -72,6 +73,13 @@ const char *default_notes_ref(void);
#define NOTES_INIT_EMPTY 1
/*
+ * By default, the notes tree is only readable, and the notes ref can be
+ * any treeish. The notes tree can however be made writable with this flag,
+ * in which case only strict ref names can be used.
+ */
+#define NOTES_INIT_WRITABLE 2
+
+/*
* Initialize the given notes_tree with the notes tree structure at the given
* ref. If given ref is NULL, the value of the $GIT_NOTES_REF environment
* variable is used, and if that is missing, the default notes ref is used
@@ -276,7 +284,7 @@ void format_display_notes(const unsigned char *object_sha1,
* Load the notes tree from each ref listed in 'refs'. The output is
* an array of notes_tree*, terminated by a NULL.
*/
-struct notes_tree **load_notes_trees(struct string_list *refs);
+struct notes_tree **load_notes_trees(struct string_list *refs, int flags);
/*
* Add all refs that match 'glob' to the 'list'.
@@ -294,4 +302,11 @@ void string_list_add_refs_from_colon_sep(struct string_list *list,
/* Expand inplace a note ref like "foo" or "notes/foo" into "refs/notes/foo" */
void expand_notes_ref(struct strbuf *sb);
+/*
+ * Similar to expand_notes_ref, but will check whether the ref can be located
+ * via get_sha1 first, and only falls back to expand_notes_ref in the case
+ * where get_sha1 fails.
+ */
+void expand_loose_notes_ref(struct strbuf *sb);
+
#endif
diff --git a/pack-bitmap.c b/pack-bitmap.c
index cb9c622..dd8dc16 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -33,9 +33,6 @@ static struct bitmap_index {
/* Packfile to which this bitmap index belongs to */
struct packed_git *pack;
- /* reverse index for the packfile */
- struct pack_revindex *reverse_index;
-
/*
* Mark the first `reuse_objects` in the packfile as reused:
* they will be sent as-is without using them for repacking
@@ -308,7 +305,7 @@ static int load_pack_bitmap(void)
bitmap_git.bitmaps = kh_init_sha1();
bitmap_git.ext_index.positions = kh_init_sha1_pos();
- bitmap_git.reverse_index = revindex_for_pack(bitmap_git.pack);
+ load_pack_revindex(bitmap_git.pack);
if (!(bitmap_git.commits = read_bitmap_1(&bitmap_git)) ||
!(bitmap_git.trees = read_bitmap_1(&bitmap_git)) ||
@@ -380,7 +377,7 @@ static inline int bitmap_position_packfile(const unsigned char *sha1)
if (!offset)
return -1;
- return find_revindex_position(bitmap_git.reverse_index, offset);
+ return find_revindex_position(bitmap_git.pack, offset);
}
static int bitmap_position(const unsigned char *sha1)
@@ -630,7 +627,7 @@ static void show_objects_for_type(
if (pos + offset < bitmap_git.reuse_objects)
continue;
- entry = &bitmap_git.reverse_index->revindex[pos + offset];
+ entry = &bitmap_git.pack->revindex[pos + offset];
sha1 = nth_packed_object_sha1(bitmap_git.pack, entry->nr);
if (bitmap_git.hashes)
@@ -804,7 +801,7 @@ int reuse_partial_packfile_from_bitmap(struct packed_git **packfile,
return -1;
bitmap_git.reuse_objects = *entries = reuse_objects;
- *up_to = bitmap_git.reverse_index->revindex[reuse_objects].offset;
+ *up_to = bitmap_git.pack->revindex[reuse_objects].offset;
*packfile = bitmap_git.pack;
return 0;
@@ -1038,7 +1035,7 @@ int rebuild_existing_bitmaps(struct packing_data *mapping,
struct revindex_entry *entry;
struct object_entry *oe;
- entry = &bitmap_git.reverse_index->revindex[i];
+ entry = &bitmap_git.pack->revindex[i];
sha1 = nth_packed_object_sha1(bitmap_git.pack, entry->nr);
oe = packlist_find(mapping, sha1, NULL);
diff --git a/pack-revindex.c b/pack-revindex.c
index e542ea7..155a8a3 100644
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@ -8,52 +8,13 @@
* size is easily available by examining the pack entry header). It is
* also rather expensive to find the sha1 for an object given its offset.
*
- * We build a hashtable of existing packs (pack_revindex), and keep reverse
- * index here -- pack index file is sorted by object name mapping to offset;
- * this pack_revindex[].revindex array is a list of offset/index_nr pairs
+ * The pack index file is sorted by object name mapping to offset;
+ * this revindex array is a list of offset/index_nr pairs
* ordered by offset, so if you know the offset of an object, next offset
* is where its packed representation ends and the index_nr can be used to
* get the object sha1 from the main index.
*/
-static struct pack_revindex *pack_revindex;
-static int pack_revindex_hashsz;
-
-static int pack_revindex_ix(struct packed_git *p)
-{
- unsigned long ui = (unsigned long)(intptr_t)p;
- int i;
-
- ui = ui ^ (ui >> 16); /* defeat structure alignment */
- i = (int)(ui % pack_revindex_hashsz);
- while (pack_revindex[i].p) {
- if (pack_revindex[i].p == p)
- return i;
- if (++i == pack_revindex_hashsz)
- i = 0;
- }
- return -1 - i;
-}
-
-static void init_pack_revindex(void)
-{
- int num;
- struct packed_git *p;
-
- for (num = 0, p = packed_git; p; p = p->next)
- num++;
- if (!num)
- return;
- pack_revindex_hashsz = num * 11;
- pack_revindex = xcalloc(pack_revindex_hashsz, sizeof(*pack_revindex));
- for (p = packed_git; p; p = p->next) {
- num = pack_revindex_ix(p);
- num = - 1 - num;
- pack_revindex[num].p = p;
- }
- /* revindex elements are lazily initialized */
-}
-
/*
* This is a least-significant-digit radix sort.
*
@@ -154,14 +115,13 @@ static void sort_revindex(struct revindex_entry *entries, unsigned n, off_t max)
/*
* Ordered list of offsets of objects in the pack.
*/
-static void create_pack_revindex(struct pack_revindex *rix)
+static void create_pack_revindex(struct packed_git *p)
{
- struct packed_git *p = rix->p;
unsigned num_ent = p->num_objects;
unsigned i;
const char *index = p->index_data;
- rix->revindex = xmalloc(sizeof(*rix->revindex) * (num_ent + 1));
+ p->revindex = xmalloc(sizeof(*p->revindex) * (num_ent + 1));
index += 4 * 256;
if (p->index_version > 1) {
@@ -171,55 +131,42 @@ static void create_pack_revindex(struct pack_revindex *rix)
for (i = 0; i < num_ent; i++) {
uint32_t off = ntohl(*off_32++);
if (!(off & 0x80000000)) {
- rix->revindex[i].offset = off;
+ p->revindex[i].offset = off;
} else {
- rix->revindex[i].offset =
+ p->revindex[i].offset =
((uint64_t)ntohl(*off_64++)) << 32;
- rix->revindex[i].offset |=
+ p->revindex[i].offset |=
ntohl(*off_64++);
}
- rix->revindex[i].nr = i;
+ p->revindex[i].nr = i;
}
} else {
for (i = 0; i < num_ent; i++) {
uint32_t hl = *((uint32_t *)(index + 24 * i));
- rix->revindex[i].offset = ntohl(hl);
- rix->revindex[i].nr = i;
+ p->revindex[i].offset = ntohl(hl);
+ p->revindex[i].nr = i;
}
}
/* This knows the pack format -- the 20-byte trailer
* follows immediately after the last object data.
*/
- rix->revindex[num_ent].offset = p->pack_size - 20;
- rix->revindex[num_ent].nr = -1;
- sort_revindex(rix->revindex, num_ent, p->pack_size);
+ p->revindex[num_ent].offset = p->pack_size - 20;
+ p->revindex[num_ent].nr = -1;
+ sort_revindex(p->revindex, num_ent, p->pack_size);
}
-struct pack_revindex *revindex_for_pack(struct packed_git *p)
+void load_pack_revindex(struct packed_git *p)
{
- int num;
- struct pack_revindex *rix;
-
- if (!pack_revindex_hashsz)
- init_pack_revindex();
-
- num = pack_revindex_ix(p);
- if (num < 0)
- die("internal error: pack revindex fubar");
-
- rix = &pack_revindex[num];
- if (!rix->revindex)
- create_pack_revindex(rix);
-
- return rix;
+ if (!p->revindex)
+ create_pack_revindex(p);
}
-int find_revindex_position(struct pack_revindex *pridx, off_t ofs)
+int find_revindex_position(struct packed_git *p, off_t ofs)
{
int lo = 0;
- int hi = pridx->p->num_objects + 1;
- struct revindex_entry *revindex = pridx->revindex;
+ int hi = p->num_objects + 1;
+ struct revindex_entry *revindex = p->revindex;
do {
unsigned mi = lo + (hi - lo) / 2;
@@ -237,11 +184,13 @@ int find_revindex_position(struct pack_revindex *pridx, off_t ofs)
struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs)
{
- struct pack_revindex *pridx = revindex_for_pack(p);
- int pos = find_revindex_position(pridx, ofs);
+ int pos;
+
+ load_pack_revindex(p);
+ pos = find_revindex_position(p, ofs);
if (pos < 0)
return NULL;
- return pridx->revindex + pos;
+ return p->revindex + pos;
}
diff --git a/pack-revindex.h b/pack-revindex.h
index d737f98..e262f3e 100644
--- a/pack-revindex.h
+++ b/pack-revindex.h
@@ -1,18 +1,15 @@
#ifndef PACK_REVINDEX_H
#define PACK_REVINDEX_H
+struct packed_git;
+
struct revindex_entry {
off_t offset;
unsigned int nr;
};
-struct pack_revindex {
- struct packed_git *p;
- struct revindex_entry *revindex;
-};
-
-struct pack_revindex *revindex_for_pack(struct packed_git *p);
-int find_revindex_position(struct pack_revindex *pridx, off_t ofs);
+void load_pack_revindex(struct packed_git *p);
+int find_revindex_position(struct packed_git *p, off_t ofs);
struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs);
diff --git a/path.c b/path.c
index 3cd155e..8b7e168 100644
--- a/path.c
+++ b/path.c
@@ -782,13 +782,10 @@ const char *relative_path(const char *in, const char *prefix,
else if (!prefix_len)
return in;
- if (have_same_root(in, prefix)) {
+ if (have_same_root(in, prefix))
/* bypass dos_drive, for "c:" is identical to "C:" */
- if (has_dos_drive_prefix(in)) {
- i = 2;
- j = 2;
- }
- } else {
+ i = j = has_dos_drive_prefix(in);
+ else {
return in;
}
@@ -943,11 +940,10 @@ const char *remove_leading_path(const char *in, const char *prefix)
int normalize_path_copy_len(char *dst, const char *src, int *prefix_len)
{
char *dst0;
+ int i;
- if (has_dos_drive_prefix(src)) {
+ for (i = has_dos_drive_prefix(src); i > 0; i--)
*dst++ = *src++;
- *dst++ = *src++;
- }
dst0 = dst;
if (is_dir_sep(*src)) {
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
index 4a499fc..e764696 100644
--- a/perl/Git/SVN/Ra.pm
+++ b/perl/Git/SVN/Ra.pm
@@ -81,7 +81,6 @@ sub prepare_config_once {
SVN::_Core::svn_config_ensure($config_dir, undef);
my ($baton, $callbacks) = SVN::Core::auth_open_helper(_auth_providers);
my $config = SVN::Core::config_get_config($config_dir);
- my $dont_store_passwords = 1;
my $conf_t = $config->{'config'};
no warnings 'once';
@@ -93,9 +92,14 @@ sub prepare_config_once {
$SVN::_Core::SVN_CONFIG_SECTION_AUTH,
$SVN::_Core::SVN_CONFIG_OPTION_STORE_PASSWORDS,
1) == 0) {
+ my $val = '1';
+ if (::compare_svn_version('1.9.0') < 0) { # pre-SVN r1553823
+ my $dont_store_passwords = 1;
+ $val = bless \$dont_store_passwords, "_p_void";
+ }
SVN::_Core::svn_auth_set_parameter($baton,
$SVN::_Core::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS,
- bless (\$dont_store_passwords, "_p_void"));
+ $val);
}
if (SVN::_Core::svn_config_get_bool($conf_t,
$SVN::_Core::SVN_CONFIG_SECTION_AUTH,
diff --git a/po/TEAMS b/po/TEAMS
index 5e1f7e0..df12b58 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -32,6 +32,10 @@ Repository: https://github.com/quizzlo/git-po-it/
Leader: Marco Paolone <marcopaolone AT gmail.com>
Members: Stefano Lattarini <stefano.lattarini AT gmail.com>
+Language: ko (Korean)
+Repository: https://github.com/changwoo/git-l10n-ko/
+Leader: Changwoo Ryu <cwryu@debian.org>
+
Language: pt_PT (Portuguese - Portugal)
Repository: https://github.com/marcomsousa/git-l10n-pt_PT/
Leader: Marco Sousa <marcomsousa AT gmail.com>
diff --git a/po/bg.po b/po/bg.po
index 164a766..ac6f103 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -60,17 +60,18 @@
# untracked cache кеш за неÑледените файлове
# broken/corrupt повреден
# restore възÑтановÑвам
+# precious objects repo хранилище Ñ Ð²Ð°Ð¶Ð½Ð¸ обекти
+# linked checkout Ñвързано изтеглÑне
+# term управлÑваща дума (за git-bisect)
+# mergetag етикет при Ñливане
+# delta - разлика, делта, обект-разлика
# ----
-# FAILED to parse неуÑпешен анализ на... -> неразпозната ÑтойноÑÑ‚ на
-# blob обект BLOB
+# „$var“ - може да не Ñработва за shell има gettext и eval_gettext - проверка - намират Ñе леÑно по „$
# ========================
# „“…— â—≫Ñ→
#
-# stressed a
-# форма̀та
-# delta - разлика или делта
# consistency between stdout - standard output/ stdin - standard input/ stderr - standard error
-# mergetag етикет при Ñливане
+#
#
# ========================
# RECHECK
@@ -108,8 +109,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git master\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-07-14 07:19+0800\n"
-"PO-Revision-Date: 2015-07-14 19:05+0300\n"
+"POT-Creation-Date: 2015-12-22 22:50+0800\n"
+"PO-Revision-Date: 2015-12-28 11:32+0200\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@@ -132,95 +133,107 @@ msgstr ""
"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФÐЙЛ“\n"
"за да отбележите коригирането им. След това извършете подаването."
-#: archive.c:11
+#: advice.c:101 builtin/merge.c:1225
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "Ðе Ñте завършили Ñливане. (УказателÑÑ‚ „MERGE_HEAD“ ÑъщеÑтвува)."
+
+#: advice.c:103
+msgid "Please, commit your changes before merging."
+msgstr "Промените Ñ‚Ñ€Ñбва да Ñе подадат преди Ñливане."
+
+#: advice.c:104
+msgid "Exiting because of unfinished merge."
+msgstr "Изход от програмата заради незавършено Ñливане."
+
+#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [ОПЦИЯ…] УКÐЗÐТЕЛ_КЪМ_ДЪРВО [ПЪТ…]"
-#: archive.c:12
+#: archive.c:13
msgid "git archive --list"
msgstr "git archive --list"
-#: archive.c:13
+#: archive.c:14
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
"git archive --remote ХРÐÐИЛИЩЕ [--exec КОМÐÐДÐ] [ОПЦИЯ…] УКÐЗÐТЕЛ_КЪМ_ДЪРВО "
"[ПЪТ…]"
-#: archive.c:14
+#: archive.c:15
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote ХРÐÐИЛИЩЕ [--exec КОМÐÐДÐ] --list"
-#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "пътÑÑ‚ „%s“ не Ñъвпада Ñ Ð½Ð¸ÐºÐ¾Ð¹ файл"
-#: archive.c:427
+#: archive.c:429
msgid "fmt"
msgstr "ФОРМÐТ"
-#: archive.c:427
+#: archive.c:429
msgid "archive format"
msgstr "ФОРМÐТ на архива"
-#: archive.c:428 builtin/log.c:1204
+#: archive.c:430 builtin/log.c:1229
msgid "prefix"
msgstr "префикÑ"
-#: archive.c:429
+#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
msgstr "добавÑне на този Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ ÐºÑŠÐ¼ вÑеки път в архива"
-#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
-#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
-#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
-#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
-#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 builtin/blame.c:2536
+#: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989
+#: builtin/grep.c:707 builtin/hash-object.c:99 builtin/ls-files.c:446
+#: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558
+#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "файл"
-#: archive.c:431 builtin/archive.c:89
+#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "запазване на архива в този файл"
-#: archive.c:433
+#: archive.c:435
msgid "read .gitattributes in working directory"
msgstr "изчитане на „.gitattributes“ в работната директориÑ"
-#: archive.c:434
+#: archive.c:436
msgid "report archived files on stderr"
msgstr "извеждане на архивираните файлове на Ñтандартната грешка"
-#: archive.c:435
+#: archive.c:437
msgid "store only"
msgstr "Ñамо Ñъхранение без компреÑиране"
-#: archive.c:436
+#: archive.c:438
msgid "compress faster"
msgstr "бързо компреÑиране"
-#: archive.c:444
+#: archive.c:446
msgid "compress better"
msgstr "добро компреÑиране"
-#: archive.c:447
+#: archive.c:449
msgid "list supported archive formats"
msgstr "извеждане на ÑпиÑъка Ñ Ð¿Ð¾Ð´Ð´ÑŠÑ€Ð¶Ð°Ð½Ð¸Ñ‚Ðµ формати"
-#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr "хранилище"
-#: archive.c:450 builtin/archive.c:91
+#: archive.c:452 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "изтеглÑне на архива от отдалеченото ХРÐÐИЛИЩЕ"
-#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr "команда"
-#: archive.c:452 builtin/archive.c:93
+#: archive.c:454 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "път към отдалечената команда „git-upload-archive“"
@@ -232,85 +245,85 @@ msgstr ""
"Отрицателните шаблони Ñе игнорират в атрибутите на git.\n"
"Ðко ви Ñ‚Ñ€Ñбва начална удивителна, ползвайте „\\!“."
-#: branch.c:60
+#: branch.c:61
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr ""
"Клонът „%s“ не може да Ñлужи като източник за ÑобÑтвената Ñи ÑинхронизациÑ."
-#: branch.c:83
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
"Клонът „%s“ ще Ñледи клона „%s“ от отдалеченото хранилище „%s“ чрез "
"пребазиране."
-#: branch.c:84
+#: branch.c:85
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "Клонът „%s“ ще Ñледи клона „%s“ от отдалеченото хранилище „%s“."
-#: branch.c:88
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr ""
"Клонът „%s“ ще Ñледи клона „%s“ от локалното хранилище чрез пребазиране."
-#: branch.c:89
+#: branch.c:90
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "Клонът „%s“ ще Ñледи клона „%s“ от локалното хранилище."
-#: branch.c:94
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr "Клонът „%s“ ще Ñледи Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „%s“ чрез пребазиране."
-#: branch.c:95
+#: branch.c:96
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "Клонът „%s“ ще Ñледи Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „%s“."
-#: branch.c:99
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr "Клонът „%s“ ще Ñледи Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „%s“ чрез пребазиране."
-#: branch.c:100
+#: branch.c:101
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "Клонът „%s“ ще Ñледи Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „%s“."
-#: branch.c:133
+#: branch.c:134
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "ÐÑма Ñледене: двуÑмиÑлена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€ž%s“"
-#: branch.c:162
+#: branch.c:163
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "„%s“ не е позволено име за клон."
-#: branch.c:167
+#: branch.c:168
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Вече ÑъщеÑтвува клон Ñ Ð¸Ð¼Ðµ „%s“."
-#: branch.c:175
+#: branch.c:176
msgid "Cannot force update the current branch."
msgstr "ТекущиÑÑ‚ клон не може да бъде принудително обновен."
-#: branch.c:195
+#: branch.c:196
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Зададените наÑтройки за Ñледенето Ñа грешни — началото „%s“ не е клон."
-#: branch.c:197
+#: branch.c:198
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "заÑвениÑÑ‚ отдалечен клон „%s“ не ÑъщеÑтвува"
-#: branch.c:199
+#: branch.c:200
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -329,21 +342,26 @@ msgstr ""
"може да използвате „git push -u“, за да наÑтроите към кой клон да Ñе "
"изтлаÑква."
-#: branch.c:243
+#: branch.c:244
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Ðеправилно име на обект: „%s“"
-#: branch.c:263
+#: branch.c:264
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "ДвуÑмиÑлено име на обект: „%s“"
-#: branch.c:268
+#: branch.c:269
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Ðеправилно мÑÑто за начало на клон: „%s“"
+#: branch.c:322
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "„%s“ вече е изтеглен в „%s“"
+
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
@@ -363,9 +381,9 @@ msgstr "„%s“ не може да Ñе отвори"
msgid "Repository lacks these prerequisite commits:"
msgstr "Ð’ хранилището липÑват Ñледните необходими подаваниÑ:"
-#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
-#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
-#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "неуÑпешно наÑтройване на обхождането на верÑиите"
@@ -388,51 +406,49 @@ msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Пратката изиÑква ÑÐ»ÐµÐ´Ð½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»:"
msgstr[1] "Пратката изиÑква Ñледните %d указатели:"
-#: bundle.c:251
+#: bundle.c:253
msgid "Could not spawn pack-objects"
msgstr "Командата „git pack-objects“ не може да бъде Ñтартирана"
-# FIXME better message
-#: bundle.c:269
+#: bundle.c:264
msgid "pack-objects died"
msgstr "Командата „git pack-objects“ не завърши уÑпешно"
-# FIXME better message
-#: bundle.c:309
+#: bundle.c:304
msgid "rev-list died"
msgstr "Командата „git rev-list“ не завърши уÑпешно"
-#: bundle.c:358
+#: bundle.c:353
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
"указателÑÑ‚ „%s“ не е бил включен поради опциите зададени на „git rev-list“"
-#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
-#: bundle.c:443
+#: bundle.c:449
msgid "Refusing to create empty bundle."
msgstr "Създаването на празна пратка е невъзможно."
-#: bundle.c:453
+#: bundle.c:459
#, c-format
msgid "cannot create '%s'"
msgstr "Файлът „%s“ не може да бъде Ñъздаден"
-# FIXME better message
-#: bundle.c:474
+#: bundle.c:480
msgid "index-pack died"
msgstr "Командата „git index-pack“ не завърши уÑпешно"
-#: color.c:260
+#: color.c:275
#, c-format
msgid "invalid color value: %.*s"
msgstr "неправилна ÑтойноÑÑ‚ за цвÑÑ‚: %.*s"
-#: commit.c:40
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
#, c-format
msgid "could not parse %s"
msgstr "„%s“ не може да Ñе анализира"
@@ -591,24 +607,24 @@ msgstr "файлът Ñ Ð¿Ð¾Ð´Ñ€ÐµÐ´Ð±Ð°Ñ‚Ð° на ÑъответÑтвиÑта â
msgid "Performing inexact rename detection"
msgstr "ТърÑене на Ð¿Ñ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð¸Ñ Ð½Ð° обекти Ñъчетани Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸"
-#: diff.c:114
+#: diff.c:115
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" ÐеуÑпешно разпознаване на „%s“ като процент-праг за ÑтатиÑтиката по "
"директории\n"
-#: diff.c:119
+#: diff.c:120
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Ðепознат параметър „%s“ за ÑтатиÑтиката по директории'\n"
-#: diff.c:214
+#: diff.c:215
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Ðепозната ÑтойноÑÑ‚ „%s“ за наÑтройката „diff.submodule“"
-#: diff.c:266
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -617,17 +633,17 @@ msgstr ""
"Грешки в наÑтройката „diff.dirstat“:\n"
"%s"
-#: diff.c:2997
+#: diff.c:3000
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
"външната програма за разлики завърши неуÑпешно. Спиране на работата при „%s“"
-#: diff.c:3393
+#: diff.c:3396
msgid "--follow requires exactly one pathspec"
msgstr "ОпциÑта „--follow“ изиÑква точно един път"
-#: diff.c:3556
+#: diff.c:3559
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -636,37 +652,37 @@ msgstr ""
"Ðеразпознат параметър към опциÑта „--dirstat/-X“:\n"
"%s"
-#: diff.c:3570
+#: diff.c:3573
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Ðеразпознат параметър към опциÑта „--submodule“: „%s“"
-#: dir.c:1852
+#: dir.c:1915
msgid "failed to get kernel name and information"
msgstr "името и верÑиÑта на Ñдрото не бÑха получени"
-#: dir.c:1945
+#: dir.c:1998
msgid "Untracked cache is disabled on this system."
msgstr "Кеша за неÑледените файлове е изключен на тази ÑиÑтема"
-#: gpg-interface.c:129 gpg-interface.c:200
+#: gpg-interface.c:166 gpg-interface.c:237
msgid "could not run gpg."
msgstr "Програмата „gpg“ не може да бъде Ñтартирана."
-#: gpg-interface.c:141
+#: gpg-interface.c:178
msgid "gpg did not accept the data"
msgstr "Програмата „gpg“ не прие подадените данни."
-#: gpg-interface.c:152
+#: gpg-interface.c:189
msgid "gpg failed to sign the data"
msgstr "Програмата „gpg“ не подпиÑа данните."
-#: gpg-interface.c:185
+#: gpg-interface.c:222
#, c-format
msgid "could not create temporary file '%s': %s"
msgstr "Програмата „gpg“ не уÑÐ¿Ñ Ð´Ð° Ñъздаде Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“: %s"
-#: gpg-interface.c:188
+#: gpg-interface.c:225
#, c-format
msgid "failed writing detached signature to '%s': %s"
msgstr "Програмата „gpg“ не уÑÐ¿Ñ Ð´Ð° запише ÑамоÑтоÑÑ‚ÐµÐ»Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñ ÐºÑŠÐ¼ „%s“: %s"
@@ -708,7 +724,6 @@ msgstr ""
"Изглежда, че „%s“ е команда на git, но Ñ‚Ñ Ð½Ðµ може да\n"
"бъде изпълнена. ВероÑтно пакетът „git-%s“ е повреден."
-# FIXME bad message
#: help.c:368
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Странно, изглежда, че на ÑиÑтемата ви нÑма нито една команда на git."
@@ -753,20 +768,12 @@ msgstr[1] ""
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: lockfile.c:345
-msgid "BUG: reopen a lockfile that is still open"
-msgstr "ГРЕШКРВ GIT: преотварÑне на файл-ключалка"
-
-#: lockfile.c:347
-msgid "BUG: reopen a lockfile that has been committed"
-msgstr "ГРЕШКРВ GIT: преотварÑне на файл-ключалка, който е подаден"
-
#: merge.c:41
msgid "failed to read the cache"
msgstr "кешът не може да бъде прочетен"
-#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
-#: builtin/clone.c:647
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
msgid "unable to write new index file"
msgstr "неуÑпешно запиÑване на Ð½Ð¾Ð²Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑ"
@@ -784,67 +791,66 @@ msgstr "неуÑпешно изпълнение на „addinfo_cache“ за п
msgid "error building trees"
msgstr "грешка при изграждане на дърветата"
-#: merge-recursive.c:687
+#: merge-recursive.c:686
#, c-format
msgid "failed to create path '%s'%s"
msgstr "грешка при Ñъздаването на Ð¿ÑŠÑ‚Ñ â€ž%s“%s"
-#: merge-recursive.c:698
+#: merge-recursive.c:697
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Изтриване на „%s“, за да Ñе оÑвободи мÑÑто за поддиректориÑ\n"
-# FIXME better message
-#: merge-recursive.c:712 merge-recursive.c:733
+#: merge-recursive.c:711 merge-recursive.c:732
msgid ": perhaps a D/F conflict?"
msgstr ": възможно е да има конфликт директориÑ/файл."
-#: merge-recursive.c:723
+#: merge-recursive.c:722
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
"преуÑтановÑване на дейÑтвието, за да не Ñе изтрие неÑледениÑÑ‚ файл „%s“"
-#: merge-recursive.c:763
+#: merge-recursive.c:762
#, c-format
msgid "cannot read object %s '%s'"
msgstr "обектът „%s“ (%s) не може да бъде прочетен"
-#: merge-recursive.c:765
+#: merge-recursive.c:764
#, c-format
msgid "blob expected for %s '%s'"
msgstr "обектът „%s“ (%s) Ñе очакваше да е BLOB, а не е"
-#: merge-recursive.c:788 builtin/clone.c:306
+#: merge-recursive.c:787 builtin/clone.c:369
#, c-format
msgid "failed to open '%s'"
msgstr "директориÑта „%s“ не може да бъде отворена"
-#: merge-recursive.c:796
+#: merge-recursive.c:795
#, c-format
msgid "failed to symlink '%s'"
msgstr "неуÑпешно Ñъздаване на Ñимволната връзка „%s“"
-#: merge-recursive.c:799
+#: merge-recursive.c:798
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
"не е ÑÑно какво да Ñе прави Ñ Ð¾Ð±ÐµÐºÑ‚Ð° „%2$s“ (%3$s) Ñ Ð¿Ñ€Ð°Ð²Ð° за доÑтъп „%1$06o“"
-#: merge-recursive.c:937
+#: merge-recursive.c:936
msgid "Failed to execute internal merge"
msgstr "ÐеуÑпешно вътрешно Ñливане"
-#: merge-recursive.c:941
+#: merge-recursive.c:940
#, c-format
msgid "Unable to add %s to database"
msgstr "„%s“ не може да Ñе добави в базата Ñ Ð´Ð°Ð½Ð½Ð¸"
-#: merge-recursive.c:957
+#: merge-recursive.c:956
msgid "unsupported object type in the tree"
msgstr "в дървото има неподдържан вид обект"
-#: merge-recursive.c:1032 merge-recursive.c:1046
+#: merge-recursive.c:1031 merge-recursive.c:1045
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -853,7 +859,7 @@ msgstr ""
"КОÐФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. ВерÑÐ¸Ñ %s на „%s“ "
"е оÑтавена в дървото."
-#: merge-recursive.c:1038 merge-recursive.c:1051
+#: merge-recursive.c:1037 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -862,20 +868,20 @@ msgstr ""
"КОÐФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. ВерÑÐ¸Ñ %s на „%s“ "
"е оÑтавена в дървото: %s."
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "rename"
msgstr "преименуване"
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "renamed"
msgstr "преименуван"
-#: merge-recursive.c:1148
+#: merge-recursive.c:1147
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "„%s“ е Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð² „%s“, затова Ñе Ð´Ð¾Ð±Ð°Ð²Ñ ÐºÐ°Ñ‚Ð¾ „%s“"
-#: merge-recursive.c:1170
+#: merge-recursive.c:1169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -884,151 +890,150 @@ msgstr ""
"КОÐФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
-#: merge-recursive.c:1175
+#: merge-recursive.c:1174
msgid " (left unresolved)"
msgstr " (некоригиран конфликт)"
-#: merge-recursive.c:1229
+#: merge-recursive.c:1228
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"КОÐФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“"
-#: merge-recursive.c:1259
+#: merge-recursive.c:1258
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“"
-#: merge-recursive.c:1458
+#: merge-recursive.c:1457
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"КОÐФЛИКТ (преименуване/добавÑне): „%s“ е преименуван на „%s“ в клон „%s“, а "
"„%s“ е добавен в „%s“"
-#: merge-recursive.c:1468
+#: merge-recursive.c:1467
#, c-format
msgid "Adding merged %s"
msgstr "ДобавÑне на ÑÐ»ÐµÑ‚Ð¸Ñ â€ž%s“"
-#: merge-recursive.c:1473 merge-recursive.c:1671
+#: merge-recursive.c:1472 merge-recursive.c:1674
#, c-format
msgid "Adding as %s instead"
msgstr "ДобавÑне като „%s“"
-#: merge-recursive.c:1524
+#: merge-recursive.c:1523
#, c-format
msgid "cannot read object %s"
msgstr "обектът „%s“ не може да Ñе прочете"
-#: merge-recursive.c:1527
+#: merge-recursive.c:1526
#, c-format
msgid "object %s is not a blob"
msgstr "обектът „%s“ не е BLOB"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modify"
msgstr "промÑна"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modified"
msgstr "променен"
-#: merge-recursive.c:1585
+#: merge-recursive.c:1588
msgid "content"
msgstr "Ñъдържание"
-#: merge-recursive.c:1592
+#: merge-recursive.c:1595
msgid "add/add"
msgstr "добавÑне/добавÑне"
-#: merge-recursive.c:1626
+#: merge-recursive.c:1629
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "ПреÑкачане на „%s“ (ÑлетиÑÑ‚ резултат е идентичен ÑÑŠÑ ÑегашниÑ)"
-#: merge-recursive.c:1640
+#: merge-recursive.c:1643
#, c-format
msgid "Auto-merging %s"
msgstr "Ðвтоматично Ñливане на „%s“"
-#: merge-recursive.c:1644 git-submodule.sh:1150
+#: merge-recursive.c:1647 git-submodule.sh:1025
msgid "submodule"
msgstr "ПОДМОДУЛ"
-#: merge-recursive.c:1645
+#: merge-recursive.c:1648
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОÐФЛИКТ (%s): Конфликт при Ñливане на „%s“"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1734
#, c-format
msgid "Removing %s"
msgstr "Изтриване на „%s“"
-#: merge-recursive.c:1756
+#: merge-recursive.c:1759
msgid "file/directory"
msgstr "файл/директориÑ"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1765
msgid "directory/file"
msgstr "директориÑ/файл"
-#: merge-recursive.c:1767
+#: merge-recursive.c:1770
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"КОÐФЛИКТ (%s): СъщеÑтвува Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° име „%s“ в „%s“. ДобавÑне на „%s“ "
"като „%s“"
-#: merge-recursive.c:1777
+#: merge-recursive.c:1780
#, c-format
msgid "Adding %s"
msgstr "ДобавÑне на „%s“"
-#: merge-recursive.c:1794
+#: merge-recursive.c:1797
msgid "Fatal merge failure, shouldn't happen."
msgstr "Фатална грешка при Ñливане, а такава не Ñ‚Ñ€Ñбва да възниква!"
-#: merge-recursive.c:1813
+#: merge-recursive.c:1816
msgid "Already up-to-date!"
msgstr "Вече е обновено!"
-#: merge-recursive.c:1822
+#: merge-recursive.c:1825
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "неуÑпешно Ñливане на дърветата „%s“ и „%s“"
-# FIXME message
-#: merge-recursive.c:1852
+#: merge-recursive.c:1855
#, c-format
msgid "Unprocessed path??? %s"
msgstr ""
"ПътÑÑ‚ „%s“ не е обработен, това е грешка в Git, докладвайте Ñ Ð½Ð° "
"разработчиците, като пратите е-пиÑмо на адреÑ: „git@vger.kernel.org“."
-#: merge-recursive.c:1900
+#: merge-recursive.c:1903
msgid "Merging:"
msgstr "Сливане:"
-#: merge-recursive.c:1913
+#: merge-recursive.c:1916
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "открит е %u общ предшеÑтвеник:"
msgstr[1] "открити Ñа %u общи предшеÑтвеници:"
-#: merge-recursive.c:1950
+#: merge-recursive.c:1953
msgid "merge returned no commit"
msgstr "Ñливането не върна подаване"
-#: merge-recursive.c:2007
+#: merge-recursive.c:2010
#, c-format
msgid "Could not parse object '%s'"
msgstr "ÐеуÑпешен анализ на обекта „%s“"
-#: merge-recursive.c:2018 builtin/merge.c:645
+#: merge-recursive.c:2021 builtin/merge.c:645
msgid "Unable to write index."
msgstr "ИндекÑÑŠÑ‚ не може да бъде прочетен"
@@ -1037,12 +1042,12 @@ msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
"Ðеинициализирано или нереферирано дърво за бележки не може да бъде подадено"
-#: notes-utils.c:82
+#: notes-utils.c:100
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Ðеправилна ÑтойноÑÑ‚ за „notes.rewriteMode“: „%s“"
-#: notes-utils.c:92
+#: notes-utils.c:110
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
@@ -1050,7 +1055,7 @@ msgstr ""
#. TRANSLATORS: The first %s is the name of the
#. environment variable, the second %s is its value
-#: notes-utils.c:119
+#: notes-utils.c:137
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Зададена е лоша ÑтойноÑÑ‚ на променливата „%s“: „%s“"
@@ -1060,31 +1065,41 @@ msgstr "Зададена е лоша ÑтойноÑÑ‚ на променливаÑ
msgid "unable to parse object: %s"
msgstr "обектът „%s“ не може да бъде анализиран"
-#: parse-options.c:546
+#: parse-options.c:570
msgid "..."
msgstr "…"
-#: parse-options.c:564
+#: parse-options.c:588
#, c-format
msgid "usage: %s"
msgstr "употреба: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:568
+#: parse-options.c:592
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:571
+#: parse-options.c:595
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:605
+#: parse-options.c:629
msgid "-NUM"
msgstr "-ЧИСЛО"
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "неправилно име на обект „%s“"
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Ðе могат да Ñе дадат права за Ð·Ð°Ð¿Ð¸Ñ Ð² директориÑта „%s“ на групата"
+
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "глобалните наÑтройки за пътища „glob“ и „noglob“ Ñа неÑъвмеÑтими"
@@ -1149,15 +1164,15 @@ msgstr ""
"Ðищо не Ñе изключва от шаблоните за изключване.\n"
"Това чеÑто Ñе Ñлучва, ако Ñте забравили да добавите „:/“ или „.“."
-#: pretty.c:968
+#: pretty.c:969
msgid "unable to parse --pretty format"
msgstr "аргументът към опциÑта „--pretty“ не може да Ñе анализира"
-#: progress.c:236
+#: progress.c:235
msgid "done"
msgstr "дейÑтвието завърши"
-#: read-cache.c:1295
+#: read-cache.c:1281
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -1166,7 +1181,7 @@ msgstr ""
"Зададена е неправилна ÑтойноÑÑ‚ на наÑтройката „index.version“.\n"
"Ще Ñе ползва верÑÐ¸Ñ %i"
-#: read-cache.c:1305
+#: read-cache.c:1291
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1176,95 +1191,165 @@ msgstr ""
"„GIT_INDEX_VERSION“.\n"
"Ще Ñе ползва верÑÐ¸Ñ %i"
-#: remote.c:792
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: builtin/merge.c:983
+#, c-format
+msgid "Could not open '%s' for writing"
+msgstr "„%s“ не може да бъде отворен за запиÑ"
+
+#: refs/files-backend.c:2359
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "УказателÑÑ‚ „%s“ не може да бъде изтрит: %s"
+
+#: refs/files-backend.c:2362
+#, c-format
+msgid "could not delete references: %s"
+msgstr "Указателите не може да бъдат изтрити: %s"
+
+#: refs/files-backend.c:2371
+#, c-format
+msgid "could not remove reference %s"
+msgstr "УказателÑÑ‚ „%s“ не може да бъде изтрит"
+
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "грешка във форма̀та: лекÑемата %%(end) е използвана без Ñъответната Ñ"
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "очаква Ñе положителна ÑтойноÑÑ‚ за „contents:lines=%s“"
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "очакван формат: %%(color:ЦВЯТ)"
+
+#: ref-filter.c:835
+msgid "unable to parse format"
+msgstr "форматът не може да бъде анализиран"
+
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "очакван формат: %%(align:ШИРОЧИÐÐ,ПОЗИЦИЯ)"
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr "въведен е неправилен формат align:%s"
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "очаква Ñе положителна широчина Ñ Ð»ÐµÐºÑемата „%%(align)“"
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "обект ÑÑŠÑ Ñгрешен формат при „%s“"
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "грешка във форма̀та: липÑва лекÑемата %%(end)"
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr "неправилно име на обект „%s“"
+
+#: remote.c:756
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Ðевъзможно е да Ñе доÑтавÑÑ‚ едновременно и „%s“, и „%s“ към „%s“"
-#: remote.c:796
+#: remote.c:760
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "„%s“ обикновено Ñледи „%s“, а не „%s“"
-#: remote.c:800
+#: remote.c:764
#, c-format
msgid "%s tracks both %s and %s"
msgstr "„%s“ Ñледи както „%s“, така и „%s“"
-#: remote.c:808
+#: remote.c:772
msgid "Internal error"
msgstr "Вътрешна грешка"
-#: remote.c:1723 remote.c:1766
+#: remote.c:1687 remote.c:1730
msgid "HEAD does not point to a branch"
msgstr "УказателÑÑ‚ „HEAD“ не Ñочи към клон"
-#: remote.c:1732
+#: remote.c:1696
#, c-format
msgid "no such branch: '%s'"
msgstr "нÑма клон на име „%s“"
-#: remote.c:1735
+#: remote.c:1699
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "не е зададен клон-източник за клона „%s“"
-#: remote.c:1741
+#: remote.c:1705
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "клонът-източник „%s“ не е Ñъхранен като ÑледÑщ клон"
-#: remote.c:1756
+#: remote.c:1720
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"липÑва локален ÑледÑщ клон за меÑтоположението за изтлаÑкване „%s“ в "
"хранилището „%s“"
-#: remote.c:1771
+#: remote.c:1735
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "нÑма Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÐºÐ»Ð¾Ð½ÑŠÑ‚ „%s“ да Ñледи нÑкой друг"
-#: remote.c:1782
+#: remote.c:1746
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "указателÑÑ‚ за изтлаÑкване на „%s“ не включва „%s“"
-#: remote.c:1795
+#: remote.c:1759
msgid "push has no destination (push.default is 'nothing')"
msgstr "указателÑÑ‚ за изтлаÑкване не включва цел („push.default“ е „nothing“)"
-#: remote.c:1817
+#: remote.c:1781
msgid "cannot resolve 'simple' push to a single destination"
msgstr "проÑтото (simple) изтлаÑкване не ÑъответÑтва на една цел"
-#: remote.c:2124
+#: remote.c:2083
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Този клон Ñледи „%s“, но ÑледениÑÑ‚ клон е изтрит.\n"
-#: remote.c:2128
+#: remote.c:2087
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
-#: remote.c:2131
+#: remote.c:2090
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Клонът е актуализиран към „%s“.\n"
-#: remote.c:2135
+#: remote.c:2094
#, 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] "Клонът ви е Ñ %2$d подаване пред „%1$s“.\n"
msgstr[1] "Клонът ви е Ñ %2$d Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€ÐµÐ´ „%1$s“.\n"
-#: remote.c:2141
+#: remote.c:2100
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (публикувайте локалните Ñи промени чрез „git push“)\n"
-#: remote.c:2144
+#: remote.c:2103
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1274,11 +1359,11 @@ msgstr[0] ""
msgstr[1] ""
"Клонът ви е Ñ %2$d Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð·Ð°Ð´ „%1$s“ и може да бъде тривиално ÑлÑÑ‚.\n"
-#: remote.c:2152
+#: remote.c:2111
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (обновете Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ Ñи клон чрез „git pull“)\n"
-#: remote.c:2155
+#: remote.c:2114
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1293,49 +1378,54 @@ msgstr[1] ""
"ТекущиÑÑ‚ клон Ñе е отделил от „%s“,\n"
"двата имат Ñъответно по %d и %d неÑъвпадащи подаваниÑ.\n"
-#: remote.c:2165
+#: remote.c:2124
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (Ñлейте Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ в Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ Ñ‡Ñ€ÐµÐ· „git pull“)\n"
-#: revision.c:2366
+#: revision.c:2193
+msgid "your current branch appears to be broken"
+msgstr "ТекущиÑÑ‚ клон е повреден"
+
+#: revision.c:2196
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "ТекущиÑÑ‚ клон „%s“ е без Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ "
+
+#: revision.c:2390
msgid "--first-parent is incompatible with --bisect"
msgstr "опциите „--first-parent“ и „--bisect“ Ñа неÑъвмеÑтими"
-#: run-command.c:83
+#: run-command.c:90
msgid "open /dev/null failed"
msgstr "неуÑпешно отварÑне на „/dev/null“"
-#: run-command.c:85
+#: run-command.c:92
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "неуÑпешно изпълнение на dup2(%d,%d)"
-#: send-pack.c:272
+#: send-pack.c:295
msgid "failed to sign the push certificate"
msgstr "Ñертификатът за изтлаÑкване не може да бъде подпиÑан"
-#: send-pack.c:378
+#: send-pack.c:404
msgid "the receiving end does not support --signed push"
msgstr "отÑрещната Ñтрана не поддържа изтлаÑкване Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--signed“"
-#: send-pack.c:389
+#: send-pack.c:406
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"отÑрещната Ñтрана не поддържа изтлаÑкване Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--signed“, затова не Ñе "
+"използва Ñертификат"
+
+#: send-pack.c:418
msgid "the receiving end does not support --atomic push"
msgstr "получаващата Ñтрана не поддържа изтлаÑкване Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--atomic“"
-#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
-#: builtin/merge.c:983
-#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "„%s“ не може да бъде отворен за запиÑ"
-
-#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
-#: builtin/merge.c:988
-#, c-format
-msgid "Could not write to '%s'"
-msgstr "„%s“ не може да бъде запиÑан"
-
# FIXME git add <path…> for consistence
-#: sequencer.c:195
+#: sequencer.c:183
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -1343,7 +1433,7 @@ msgstr ""
"Ñлед коригирането на конфликтите, отбележете Ñъответните\n"
"пътища Ñ â€žgit add ПЪТ…“ или „git rm ПЪТ…“."
-#: sequencer.c:198
+#: sequencer.c:186
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -1354,237 +1444,236 @@ msgstr ""
"подайте резултата Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git commit'“."
# FIXME - must be the same as Could not write to '%s' above
-#: sequencer.c:211 sequencer.c:861 sequencer.c:944
+#: sequencer.c:199 sequencer.c:842 sequencer.c:922
#, c-format
msgid "Could not write to %s"
msgstr "„%s“ не може да бъде запиÑан"
-# FIXME wrap up as ffinishing the work on, in fact, full stop at end for consistency with below
-#: sequencer.c:214
+#: sequencer.c:202
#, c-format
msgid "Error wrapping up %s"
msgstr "Обработката на „%s“ не завърши уÑпешно."
-#: sequencer.c:229
+#: sequencer.c:217
msgid "Your local changes would be overwritten by cherry-pick."
msgstr "Локалните ви промени ще бъдат презапиÑани при отбирането на подаваниÑ."
-#: sequencer.c:231
+#: sequencer.c:219
msgid "Your local changes would be overwritten by revert."
msgstr "Локалните ви промени ще бъдат презапиÑани при отмÑната на подаваниÑ."
-#: sequencer.c:234
+#: sequencer.c:222
msgid "Commit your changes or stash them to proceed."
msgstr "Подайте или Ñкатайте промените, за да продължите"
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:321
+#: sequencer.c:309
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: новиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запазен"
-#: sequencer.c:339
+#: sequencer.c:327
msgid "Could not resolve HEAD commit\n"
msgstr "Подаването Ñочено от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ не може да бъде открито\n"
-#: sequencer.c:359
+#: sequencer.c:347
msgid "Unable to update cache tree\n"
msgstr "Дървото на кеша не може да бъде обновено\n"
-#: sequencer.c:411
+#: sequencer.c:399
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Подаването „%s“ не може да бъде анализирано\n"
-#: sequencer.c:416
+#: sequencer.c:404
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "РодителÑкото подаване „%s“ не може да бъде анализирано\n"
-#: sequencer.c:482
+#: sequencer.c:469
msgid "Your index file is unmerged."
msgstr "ИндекÑÑŠÑ‚ не е ÑлÑÑ‚."
-#: sequencer.c:501
+#: sequencer.c:488
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Подаването „%s“ е Ñливане, но не е дадена опциÑта „-m“"
-#: sequencer.c:509
+#: sequencer.c:496
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Подаването „%s“ нÑма родител %d"
-#: sequencer.c:513
+#: sequencer.c:500
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "Указано е базово подаване, но подаването „%s“ не е Ñливане."
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:526
+#: sequencer.c:513
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: неразпозната ÑтойноÑÑ‚ за родителÑкото подаване „%s“"
-#: sequencer.c:530
+#: sequencer.c:517
#, c-format
msgid "Cannot get commit message for %s"
msgstr "ÐеуÑпешно извличане на Ñъобщението за подаване на „%s“"
-#: sequencer.c:616
+#: sequencer.c:603
#, c-format
msgid "could not revert %s... %s"
msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-#: sequencer.c:617
+#: sequencer.c:604
#, c-format
msgid "could not apply %s... %s"
msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-#: sequencer.c:653
+#: sequencer.c:639
msgid "empty commit set passed"
msgstr "зададено е празно множеÑтво от подаваниÑ"
-#: sequencer.c:661
+#: sequencer.c:647
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: неуÑпешно изчитане на индекÑа"
-#: sequencer.c:665
+#: sequencer.c:651
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: неуÑпешно обновÑване на индекÑа"
-#: sequencer.c:725
+#: sequencer.c:711
#, c-format
msgid "Cannot %s during a %s"
msgstr "По време на „%1$s“ не може да Ñе извърши „%2$s“"
-#: sequencer.c:747
+#: sequencer.c:733
#, c-format
msgid "Could not parse line %d."
msgstr "%d-ÑÑ‚ ред не може да Ñе анализира."
-#: sequencer.c:752
+#: sequencer.c:738
msgid "No commits parsed."
msgstr "Ðикое от подаваниÑта не може да Ñе разпознае."
# FIXME Could not open %s. - full stop for consistence with next message
-#: sequencer.c:765
+#: sequencer.c:750
#, c-format
msgid "Could not open %s"
msgstr "„%s“ не може да Ñе прочете."
-#: sequencer.c:769
+#: sequencer.c:754
#, c-format
msgid "Could not read %s."
msgstr "„%s“ не може да Ñе отвори."
-#: sequencer.c:776
+#: sequencer.c:761
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Файлът Ñ Ð¾Ð¿Ð¸Ñание на предÑтоÑщите дейÑÑ‚Ð²Ð¸Ñ â€” „%s“ не може да Ñе ползва"
-#: sequencer.c:806
+#: sequencer.c:791
#, c-format
msgid "Invalid key: %s"
msgstr "Ðеправилен ключ: „%s“"
-#: sequencer.c:809
+#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Ðеправилна ÑтойноÑÑ‚ за „%s“: „%s“"
-#: sequencer.c:821
+#: sequencer.c:804
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Ðеправилно Ñъдържание на файла Ñ Ð¾Ð¿Ñ†Ð¸Ð¸: „%s“"
-#: sequencer.c:842
+#: sequencer.c:823
msgid "a cherry-pick or revert is already in progress"
msgstr ""
"в момента вече Ñе извършва отбиране на Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ пребазиране на клона"
-#: sequencer.c:843
+#: sequencer.c:824
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“"
-#: sequencer.c:847
+#: sequencer.c:828
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "ДиректориÑта за ÑеквенÑора „%s“ не може да бъде Ñъздадена"
-#: sequencer.c:863 sequencer.c:948
+#: sequencer.c:844 sequencer.c:926
#, c-format
msgid "Error wrapping up %s."
msgstr "Обработката на „%s“ не завърши уÑпешно."
-#: sequencer.c:882 sequencer.c:1018
+#: sequencer.c:863 sequencer.c:996
msgid "no cherry-pick or revert in progress"
msgstr ""
"в момента не Ñе извършва отбиране на Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ пребазиране на клона"
-#: sequencer.c:884
+#: sequencer.c:865
msgid "cannot resolve HEAD"
msgstr "Подаването Ñочено от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ не може да бъде открито"
-#: sequencer.c:886
+#: sequencer.c:867
msgid "cannot abort from a branch yet to be born"
msgstr ""
"дейÑтвието не може да бъде преуÑтановено, когато Ñте на клон, който тепърва "
"предÑтои да бъде Ñъздаден"
-#: sequencer.c:908 builtin/apply.c:4291
+#: sequencer.c:887 builtin/apply.c:4287
#, c-format
msgid "cannot open %s: %s"
msgstr "файлът „%s“ не може да бъде отворен: %s"
-#: sequencer.c:911
+#: sequencer.c:890
#, c-format
msgid "cannot read %s: %s"
msgstr "файлът „%s“ не може да бъде прочетен: %s"
-#: sequencer.c:912
+#: sequencer.c:891
msgid "unexpected end of file"
msgstr "неочакван край на файл"
-#: sequencer.c:918
+#: sequencer.c:897
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"запазениÑÑ‚ преди започването на отбирането файл за ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ — „%s“ е "
"повреден"
-#: sequencer.c:941
+#: sequencer.c:919
#, c-format
msgid "Could not format %s."
msgstr "Файлът „%s“ не може да Ñе форматира по подходÑÑ‰Ð¸Ñ Ð½Ð°Ñ‡Ð¸Ð½."
-#: sequencer.c:1086
+#: sequencer.c:1064
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не може да Ñе отбере „%s“"
-#: sequencer.c:1089
+#: sequencer.c:1067
#, c-format
msgid "%s: bad revision"
msgstr "%s: неправилна верÑиÑ"
-#: sequencer.c:1123
+#: sequencer.c:1101
msgid "Can't revert as initial commit"
msgstr "Първоначалното подаване не може да бъде отменено"
-#: sequencer.c:1124
+#: sequencer.c:1102
msgid "Can't cherry-pick into empty head"
msgstr "При празен връх не могат да Ñе отбират подаваниÑ"
-#: setup.c:243
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: sha1_name.c:453
+#: sha1_name.c:463
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1608,32 +1697,32 @@ msgstr ""
"Ñпрете това Ñъобщение като изпълните командата:\n"
"„git config advice.objectNameWarning false“"
-#: submodule.c:64 submodule.c:98
+#: submodule.c:61 submodule.c:95
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"ÐеÑлетите файлове „.gitmodules“ не могат да бъдат променÑни. Първо "
"коригирайте конфликтите"
-#: submodule.c:68 submodule.c:102
+#: submodule.c:65 submodule.c:99
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Във файла „.gitmodules“ липÑва раздел за Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€žpath=%s“"
-#: submodule.c:76
+#: submodule.c:73
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "ЗапиÑÑŠÑ‚ „%s“ във файла „.gitmodules“ не може да бъде променен"
-#: submodule.c:109
+#: submodule.c:106
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "ЗапиÑÑŠÑ‚ „%s“ във файла „.gitmodules“ не може да бъде изтрит"
-#: submodule.c:120
+#: submodule.c:117
msgid "staging updated .gitmodules failed"
msgstr "неуÑпешно добавÑне на Ð¿Ñ€Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» „.gitmodules“ в индекÑа"
-#: submodule.c:1115
+#: submodule.c:1040
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "ÐаÑтройката „core.worktree“ не може да Ñе зададе в „%s“"
@@ -1644,7 +1733,7 @@ msgstr "ÐаÑтройката „core.worktree“ не може да Ñе заÐ
msgid "unknown value '%s' for key '%s'"
msgstr "неправилна ÑтойноÑÑ‚ „%s“ за наÑтройката „%s“"
-#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
#, c-format
msgid "more than one %s"
msgstr "ÑтойноÑтта „%s“ Ñе Ð¿Ð¾Ð²Ñ‚Ð°Ñ€Ñ Ð² наÑтройките"
@@ -1663,6 +1752,11 @@ msgstr "входниÑÑ‚ файл „%s“ не може да бъде прочÐ
msgid "could not read from stdin"
msgstr "от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´ не може да Ñе чете"
+#: transport-helper.c:1025
+#, c-format
+msgid "Could not read ref %s"
+msgstr "УказателÑÑ‚ „%s“ не може да Ñе прочете."
+
#: unpack-trees.c:203
msgid "Checking out files"
msgstr "ИзтеглÑне на файлове"
@@ -1696,203 +1790,210 @@ msgstr "неправилен номер на порт"
msgid "invalid '..' path segment"
msgstr "неправилна чаÑÑ‚ от Ð¿ÑŠÑ‚Ñ â€ž..“"
-#: wrapper.c:523
+#: wrapper.c:219 wrapper.c:362
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "„%s“ не може да бъде отворен и за четене, и за запиÑ"
+
+#: wrapper.c:221 wrapper.c:364
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "„%s“ не може да бъде отворен за запиÑ"
+
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "файлът не може да бъде прочетен: „%s“"
+
+#: wrapper.c:579
#, c-format
msgid "unable to access '%s': %s"
msgstr "нÑма доÑтъп до „%s“: %s"
-#: wrapper.c:544
+#: wrapper.c:600
#, c-format
msgid "unable to access '%s'"
msgstr "нÑма доÑтъп до „%s“"
-#: wrapper.c:555
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr "текущиÑÑ‚ потребител не може да бъде открит във файла „/etc/passwd“: %s"
-
-#: wrapper.c:556
-msgid "no such user"
-msgstr "такъв потребител не ÑъщеÑтвува"
-
-#: wrapper.c:564
+#: wrapper.c:608
msgid "unable to get current working directory"
msgstr "текущата работна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ðµ недоÑтъпна"
-#: wrapper.c:575
+#: wrapper.c:635
#, c-format
msgid "could not open %s for writing"
msgstr "„%s“ не може да бъде отворен за запиÑ"
# FIXME - must be the same as Could not write to '%s' above
-#: wrapper.c:587
+#: wrapper.c:646 builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "„%s“ не може да бъде запиÑан"
-#: wrapper.c:593
+#: wrapper.c:652
#, c-format
msgid "could not close %s"
msgstr "„%s“ не може да Ñе затвори"
-#: wt-status.c:150
+#: wt-status.c:149
msgid "Unmerged paths:"
msgstr "ÐеÑлети пътища:"
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:176 wt-status.c:203
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (използвайте „git reset %s ФÐЙЛ…“, за да извадите ФÐЙЛа от индекÑа)"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:178 wt-status.c:205
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (използвайте „git rm --cached %s ФÐЙЛ…“, за да извадите ФÐЙЛа от индекÑа)"
-#: wt-status.c:183
+#: wt-status.c:182
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
" (използвайте „git add ФÐЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:184 wt-status.c:188
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (използвайте „git add/rm ФÐЙЛ…“, Ñпоред решението, което избирате за "
"конфликта)"
-#: wt-status.c:187
+#: wt-status.c:186
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (използвайте „git rm ФÐЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:198 wt-status.c:881
+#: wt-status.c:197 wt-status.c:880
msgid "Changes to be committed:"
msgstr "Промени, които ще бъдат подадени:"
-#: wt-status.c:216 wt-status.c:890
+#: wt-status.c:215 wt-status.c:889
msgid "Changes not staged for commit:"
msgstr "Промени, които не Ñа в индекÑа за подаване:"
-#: wt-status.c:220
+#: wt-status.c:219
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (използвайте „git add ФÐЙЛ…“, за да обновите Ñъдържанието за подаване)"
-#: wt-status.c:222
+#: wt-status.c:221
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (използвайте „git add/rm ФÐЙЛ…“, за да обновите Ñъдържанието за подаване)"
-#: wt-status.c:223
+#: wt-status.c:222
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (използвайте „git checkout -- ФÐЙЛ…“, за да отхвърлите промените в "
"работното дърво)"
-#: wt-status.c:225
+#: wt-status.c:224
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (подайте или отхвърлете неÑледеното или промененото Ñъдържание в "
"подмодулите)"
-#: wt-status.c:237
+#: wt-status.c:236
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (използвайте „git %s ФÐЙЛ…“, за да определите какво включвате в подаването)"
-#: wt-status.c:252
+#: wt-status.c:251
msgid "both deleted:"
msgstr "изтрити в двата ÑлучаÑ:"
-#: wt-status.c:254
+#: wt-status.c:253
msgid "added by us:"
msgstr "добавени от ваÑ:"
-#: wt-status.c:256
+#: wt-status.c:255
msgid "deleted by them:"
msgstr "изтрити от Ñ‚ÑÑ…:"
-#: wt-status.c:258
+#: wt-status.c:257
msgid "added by them:"
msgstr "добавени от Ñ‚ÑÑ…:"
-#: wt-status.c:260
+#: wt-status.c:259
msgid "deleted by us:"
msgstr "изтрити от ваÑ:"
-#: wt-status.c:262
+#: wt-status.c:261
msgid "both added:"
msgstr "добавени и в двата ÑлучаÑ:"
-#: wt-status.c:264
+#: wt-status.c:263
msgid "both modified:"
msgstr "променени и в двата ÑлучаÑ:"
-#: wt-status.c:266
+#: wt-status.c:265
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr "грешка: ÑÑŠÑтоÑнието на промÑната „%x“ не може да бъде обработено"
-#: wt-status.c:274
+#: wt-status.c:273
msgid "new file:"
msgstr "нов файл:"
-#: wt-status.c:276
+#: wt-status.c:275
msgid "copied:"
msgstr "копиран:"
-#: wt-status.c:278
+#: wt-status.c:277
msgid "deleted:"
msgstr "изтрит:"
-#: wt-status.c:280
+#: wt-status.c:279
msgid "modified:"
msgstr "променен:"
-#: wt-status.c:282
+#: wt-status.c:281
msgid "renamed:"
msgstr "преименуван:"
-#: wt-status.c:284
+#: wt-status.c:283
msgid "typechange:"
msgstr "ÑмÑна на вида:"
-#: wt-status.c:286
+#: wt-status.c:285
msgid "unknown:"
msgstr "непозната промÑна:"
-#: wt-status.c:288
+#: wt-status.c:287
msgid "unmerged:"
msgstr "неÑлÑÑ‚:"
-#: wt-status.c:370
+#: wt-status.c:369
msgid "new commits, "
msgstr "нови подаваниÑ, "
-#: wt-status.c:372
+#: wt-status.c:371
msgid "modified content, "
msgstr "променено Ñъдържание, "
-#: wt-status.c:374
+#: wt-status.c:373
msgid "untracked content, "
msgstr "неÑледено Ñъдържание, "
-#: wt-status.c:391
+#: wt-status.c:390
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "грешка: ÑÑŠÑтоÑнието на промÑната „%c“ не може да бъде обработено"
-#: wt-status.c:755
+#: wt-status.c:754
msgid "Submodules changed but not updated:"
msgstr "Подмодулите Ñа променени, но не Ñа обновени:"
-#: wt-status.c:757
+#: wt-status.c:756
msgid "Submodule changes to be committed:"
msgstr "Промени в подмодулите за подаване:"
-#: wt-status.c:838
+#: wt-status.c:837
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -1900,193 +2001,229 @@ msgstr ""
"Ðе променÑйте Ð³Ð¾Ñ€Ð½Ð¸Ñ Ñ€ÐµÐ´.\n"
"Ð’Ñичко отдолу ще бъде изтрито."
-#: wt-status.c:949
+#: wt-status.c:948
msgid "You have unmerged paths."
msgstr "ÐÑкои пътища не Ñа Ñлети."
-#: wt-status.c:952
+#: wt-status.c:951
msgid " (fix conflicts and run \"git commit\")"
msgstr " (коригирайте конфликтите и изпълнете „git commit“)"
-#: wt-status.c:955
+#: wt-status.c:954
msgid "All conflicts fixed but you are still merging."
msgstr "Ð’Ñички конфликти Ñа решени, но продължавате Ñливането."
-#: wt-status.c:958
+#: wt-status.c:957
msgid " (use \"git commit\" to conclude merge)"
msgstr " (използвайте „git commit“, за да завършите Ñливането)"
-#: wt-status.c:968
+#: wt-status.c:967
msgid "You are in the middle of an am session."
msgstr "В момента прилагате поредица от кръпки чрез „git am“."
-#: wt-status.c:971
+#: wt-status.c:970
msgid "The current patch is empty."
msgstr "Текущата кръпка е празна."
-#: wt-status.c:975
+#: wt-status.c:974
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)"
-#: wt-status.c:977
+#: wt-status.c:976
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (използвайте „git am --skip“, за да пропуÑнете тази кръпка)"
-#: wt-status.c:979
+#: wt-status.c:978
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (използвайте „git am --abort“, за да възÑтановите Ð¿ÑŠÑ€Ð²Ð¾Ð½Ð°Ñ‡Ð°Ð»Ð½Ð¸Ñ ÐºÐ»Ð¾Ð½)"
-#: wt-status.c:1039 wt-status.c:1056
+#: wt-status.c:1105
+msgid "No commands done."
+msgstr "Ðе Ñа изпълнени команди."
+
+#: wt-status.c:1108
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "ПоÑледна изпълнена команда (изпълнена е общо %d команда):"
+msgstr[1] "ПоÑледна изпълнена команда (изпълнени Ñа общо %d команди):"
+
+#: wt-status.c:1119
+#, c-format
+msgid " (see more in file %s)"
+msgstr " повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸Ð¼Ð° във файла „%s“)"
+
+#: wt-status.c:1124
+msgid "No commands remaining."
+msgstr "Ðе оÑтават повече команди."
+
+#: wt-status.c:1127
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "Следваща команда за изпълнение (оÑтава още %d команда):"
+msgstr[1] "Следваща команда за изпълнение (оÑтават още %d команди):"
+
+#: wt-status.c:1135
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr ""
+" (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
+
+#: wt-status.c:1148
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "В момента пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1044 wt-status.c:1061
+#: wt-status.c:1153
msgid "You are currently rebasing."
msgstr "В момента пребазирате."
-#: wt-status.c:1047
+#: wt-status.c:1167
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)"
-#: wt-status.c:1049
+#: wt-status.c:1169
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (използвайте „git rebase --skip“, за да пропуÑнете тази кръпка)"
-#: wt-status.c:1051
+#: wt-status.c:1171
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (използвайте „git rebase --abort“, за да възÑтановите Ð¿ÑŠÑ€Ð²Ð¾Ð½Ð°Ñ‡Ð°Ð»Ð½Ð¸Ñ ÐºÐ»Ð¾Ð½)"
-#: wt-status.c:1064
+#: wt-status.c:1177
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (вÑички конфликти Ñа коригирани: изпълнете „git rebase --continue“)"
-#: wt-status.c:1068
+#: wt-status.c:1181
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "Ð’ момента разделÑте подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1073
+#: wt-status.c:1186
msgid "You are currently splitting a commit during a rebase."
msgstr "Ð’ момента разделÑте подаване докато пребазирате."
-#: wt-status.c:1076
+#: wt-status.c:1189
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (След като работното ви дърво Ñтане чиÑто, използвайте „git rebase --"
"continue“)"
-#: wt-status.c:1080
+#: wt-status.c:1193
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1085
+#: wt-status.c:1198
msgid "You are currently editing a commit during a rebase."
msgstr "В момента редактирате подаване докато пребазирате."
-#: wt-status.c:1088
+#: wt-status.c:1201
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (използвайте „git commit --amend“, за да редактирате текущото подаване)"
-#: wt-status.c:1090
+#: wt-status.c:1203
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (използвайте „git rebase --continue“, Ñлед като завършите промените Ñи)"
-#: wt-status.c:1100
+#: wt-status.c:1213
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "В момента отбирате подаването „%s“."
-#: wt-status.c:1105
+#: wt-status.c:1218
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1108
+#: wt-status.c:1221
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (вÑички конфликти Ñа коригирани, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1110
+#: wt-status.c:1223
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (използвайте „git cherry-pick --abort“, за да отмените вÑички дейÑÑ‚Ð²Ð¸Ñ Ñ "
"отбиране)"
-#: wt-status.c:1119
+#: wt-status.c:1232
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Ð’ момента отменÑте подаване „%s“."
-#: wt-status.c:1124
+#: wt-status.c:1237
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)"
-#: wt-status.c:1127
+#: wt-status.c:1240
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (вÑички конфликти Ñа коригирани, изпълнете „git revert --continue“)"
-#: wt-status.c:1129
+#: wt-status.c:1242
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (използвайте „git revert --abort“, за да преуÑтановите отмÑната на "
"подаване)"
-#: wt-status.c:1140
+#: wt-status.c:1253
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Ð’ момента Ñ‚ÑŠÑ€Ñите двоично, като Ñте Ñтартирали от клон „%s“."
-#: wt-status.c:1144
+#: wt-status.c:1257
msgid "You are currently bisecting."
msgstr "Ð’ момента Ñ‚ÑŠÑ€Ñите двоично."
-#: wt-status.c:1147
+#: wt-status.c:1260
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (използвайте „git bisect reset“, за да Ñе върнете към първоначалното "
"ÑÑŠÑтоÑние и клон)"
-#: wt-status.c:1324
+#: wt-status.c:1438
msgid "On branch "
msgstr "Ðа клон "
-#: wt-status.c:1331
+#: wt-status.c:1444
+msgid "interactive rebase in progress; onto "
+msgstr "извършвате интерактивно пребазиране върху "
+
+#: wt-status.c:1446
msgid "rebase in progress; onto "
msgstr "извършвате пребазиране върху "
-#: wt-status.c:1336
+#: wt-status.c:1451
msgid "HEAD detached at "
msgstr "УказателÑÑ‚ „HEAD“ не е Ñвързан и е при "
-#: wt-status.c:1338
+#: wt-status.c:1453
msgid "HEAD detached from "
msgstr "УказателÑÑ‚ „HEAD“ не е Ñвързан и е отделѐн от "
-#: wt-status.c:1341
+#: wt-status.c:1456
msgid "Not currently on any branch."
msgstr "Извън вÑички клони."
-#: wt-status.c:1358
+#: wt-status.c:1474
msgid "Initial commit"
msgstr "Първоначално подаване"
-#: wt-status.c:1372
+#: wt-status.c:1488
msgid "Untracked files"
msgstr "ÐеÑледени файлове"
-#: wt-status.c:1374
+#: wt-status.c:1490
msgid "Ignored files"
msgstr "Игнорирани файлове"
-#: wt-status.c:1378
+#: wt-status.c:1494
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2098,32 +2235,32 @@ msgstr ""
"изпълнението, но не Ñ‚Ñ€Ñбва да забравÑте ръчно да добавÑте новите файлове.\n"
"За повече подробноÑти погледнете „git status help“."
-#: wt-status.c:1384
+#: wt-status.c:1500
#, c-format
msgid "Untracked files not listed%s"
msgstr "ÐеÑледените файлове не Ñа изведени%s"
-#: wt-status.c:1386
+#: wt-status.c:1502
msgid " (use -u option to show untracked files)"
msgstr " (използвайте опциÑта „-u“, за да изведете неÑледените файлове)"
-#: wt-status.c:1392
+#: wt-status.c:1508
msgid "No changes"
msgstr "ÐÑма промени"
-#: wt-status.c:1397
+#: wt-status.c:1513
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"към индекÑа за подаване не Ñа добавени промени (използвайте „git add“ и/или "
"„git commit -a“)\n"
-#: wt-status.c:1400
+#: wt-status.c:1516
#, c-format
msgid "no changes added to commit\n"
msgstr "към индекÑа за подаване не Ñа добавени промени\n"
-#: wt-status.c:1403
+#: wt-status.c:1519
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2132,52 +2269,52 @@ msgstr ""
"към индекÑа за подаване не Ñа добавени промени, но има нови файлове "
"(използвайте „git add“, за да започне Ñ‚Ñхното Ñледене)\n"
-#: wt-status.c:1406
+#: wt-status.c:1522
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "към индекÑа за подаване не Ñа добавени промени, но има нови файлове\n"
-#: wt-status.c:1409
+#: wt-status.c:1525
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"липÑват каквито и да е промени (Ñъздайте или копирайте файлове и използвайте "
"„git add“, за да започне Ñ‚Ñхното Ñледене)\n"
-#: wt-status.c:1412 wt-status.c:1417
+#: wt-status.c:1528 wt-status.c:1533
#, c-format
msgid "nothing to commit\n"
msgstr "липÑват каквито и да е промени\n"
-#: wt-status.c:1415
+#: wt-status.c:1531
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"липÑват каквито и да е промени (използвайте опциÑта „-u“, за да Ñе изведат и "
"неÑледените файлове)\n"
-#: wt-status.c:1419
+#: wt-status.c:1535
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "липÑват каквито и да е промени, работното дърво е чиÑто\n"
-#: wt-status.c:1528
-msgid "HEAD (no branch)"
-msgstr "HEAD (извън клон)"
-
-#: wt-status.c:1534
+#: wt-status.c:1642
msgid "Initial commit on "
msgstr "Първоначално подаване на клон"
-#: wt-status.c:1561
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
+msgstr "HEAD (извън клон)"
+
+#: wt-status.c:1675
msgid "gone"
msgstr "изтрит"
-#: wt-status.c:1563 wt-status.c:1571
+#: wt-status.c:1677 wt-status.c:1685
msgid "behind "
msgstr "назад Ñ "
-#: compat/precompose_utf8.c:55 builtin/clone.c:345
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
#, c-format
msgid "failed to unlink '%s'"
msgstr "неуÑпешно изтриване на „%s“"
@@ -2191,7 +2328,7 @@ msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
msgid "unexpected diff status %c"
msgstr "неочакван изходен код при генериране на разлика: %c"
-#: builtin/add.c:70 builtin/commit.c:277
+#: builtin/add.c:70 builtin/commit.c:278
msgid "updating files failed"
msgstr "неуÑпешно обновÑване на файловете"
@@ -2240,15 +2377,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Следните пътища ще бъдат игнорирани Ñпоред нÑкой от файловете „.gitignore“:\n"
-#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
-#: builtin/rm.c:268
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "пробно изпълнeние"
-#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
-#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "повече подробноÑти"
@@ -2256,7 +2393,7 @@ msgstr "повече подробноÑти"
msgid "interactive picking"
msgstr "интерактивно отбиране на промени"
-#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "интерактивен избор на парчета код"
@@ -2318,93 +2455,515 @@ msgstr "опциите „-A“ и „-u“ Ñа неÑъвмеÑтими"
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "ОпциÑта „--ignore-missing“ е ÑъвмеÑтима Ñамо Ñ â€ž--dry-run“"
-#: builtin/add.c:358
+#: builtin/add.c:352
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Ðищо не е зададено и нищо не е добавено.\n"
-#: builtin/add.c:359
+#: builtin/add.c:353
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "ВероÑтно иÑкахте да използвате „git add .“?\n"
-#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918
-#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
msgid "index file corrupt"
msgstr "файлът Ñ Ð¸Ð½Ð´ÐµÐºÑа е повреден"
-#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "ÐовиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запиÑан"
+#: builtin/am.c:42
+#, c-format
+msgid "could not stat %s"
+msgstr "Ðе може да Ñе получи Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%s“"
+
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
+#, c-format
+msgid "could not read '%s'"
+msgstr "файлът „%s“ не може да бъде прочетен"
+
+#: builtin/am.c:445
+msgid "could not parse author script"
+msgstr "Ñкриптът за автор не може да Ñе анализира"
+
+#: builtin/am.c:522
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
+
+#: builtin/am.c:563 builtin/notes.c:300
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "ДадениÑÑ‚ входен ред е Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ формат: „%s“."
+
+#: builtin/am.c:600 builtin/notes.c:315
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Бележката не може да Ñе копира от „%s“ към „%s“"
+
+#: builtin/am.c:626
+msgid "fseek failed"
+msgstr "неуÑпешно изпълнение на „fseek“"
+
+#: builtin/am.c:787 builtin/am.c:875
+#, c-format
+msgid "could not open '%s' for reading: %s"
+msgstr "„%s“ не може да бъде отворен за четене: %s"
+
+#: builtin/am.c:794
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "„%s“ не може да бъде отворен за запиÑ: %s"
+
+#: builtin/am.c:803
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "кръпката „%s“ не може да Ñе анализира"
+
+#: builtin/am.c:868
+msgid "Only one StGIT patch series can be applied at once"
+msgstr ""
+"Само една ÑÐµÑ€Ð¸Ñ ÐºÑ€ÑŠÐ¿ÐºÐ¸ от „StGIT“ може да бъде прилагана в даден момент"
+
+#: builtin/am.c:916
+msgid "invalid timestamp"
+msgstr "неправилна ÑтойноÑÑ‚ за време"
+
+#: builtin/am.c:919 builtin/am.c:927
+msgid "invalid Date line"
+msgstr "неправилен ред за дата „Date“"
+
+#: builtin/am.c:924
+msgid "invalid timezone offset"
+msgstr "неправилно отмеÑтване на чаÑÐ¾Ð²Ð¸Ñ Ð¿Ð¾ÑÑ"
+
+#: builtin/am.c:1011
+msgid "Patch format detection failed."
+msgstr "Форматът на кръпката не може да бъде определен."
+
+#: builtin/am.c:1016 builtin/clone.c:373
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "директориÑта „%s“ не може да бъде Ñъздадена"
+
+#: builtin/am.c:1020
+msgid "Failed to split patches."
+msgstr "Кръпките не могат да бъдат разделени."
+
+#: builtin/am.c:1152 builtin/commit.c:363
+msgid "unable to write index file"
+msgstr "индекÑÑŠÑ‚ не може да бъде запиÑан"
+
+#: builtin/am.c:1203
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "След коригирането на този проблем изпълнете „%s --continue“."
+
+#: builtin/am.c:1204
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "Ðко предпочитате да преÑкочите тази кръпка, изпълнете „%s --skip“."
+
+#: builtin/am.c:1205
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr "За да Ñе върнете към първоначалното ÑÑŠÑтоÑние, изпълнете „%s --abort“."
+
+#: builtin/am.c:1343
+msgid "Patch is empty. Was it split wrong?"
+msgstr "Празна кръпка. Дали не е разделена погрешно?"
+
+#: builtin/am.c:1417 builtin/log.c:1347
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "грешна идентичноÑÑ‚: %s"
+
+#: builtin/am.c:1444
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "подаването не може да бъде анализирано: %s"
+
+#: builtin/am.c:1646
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+"Ð’ хранилището липÑват необходимите обекти BLOB, за да Ñе премине към тройно "
+"Ñливане."
+
+#: builtin/am.c:1648
+msgid "Using index info to reconstruct a base tree..."
+msgstr "Базовото дърво Ñе реконÑтруира от информациÑта в индекÑа…"
+
+#: builtin/am.c:1667
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Кръпката не може да Ñе приложи към обектите BLOB в индекÑа.\n"
+"Да не би да Ñте Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð°Ð»Ð¸ на ръка?"
+
+#: builtin/am.c:1673
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Преминаване към прилагане на кръпка към базата и тройно Ñливане…"
+
+#: builtin/am.c:1688
+msgid "Failed to merge in the changes."
+msgstr "ÐеуÑпешно Ñливане на промените."
+
+#: builtin/am.c:1712 builtin/merge.c:632
+msgid "git write-tree failed to write a tree"
+msgstr "Командата „git write-tree“ не уÑÐ¿Ñ Ð´Ð° запише обект-дърво"
+
+#: builtin/am.c:1719
+msgid "applying to an empty history"
+msgstr "прилагане върху празна иÑториÑ"
+
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
+#: builtin/merge.c:854
+msgid "failed to write commit object"
+msgstr "обектът за подаването не може да бъде запиÑан"
+
+#: builtin/am.c:1764 builtin/am.c:1768
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "не може да Ñе продължи — „%s“ не ÑъщеÑтвува."
+
+#: builtin/am.c:1784
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr ""
+"За интерактивно изпълнение е необходимо ÑтандартниÑÑ‚\n"
+"изход да е Ñвързан Ñ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð», а в момента не е."
+
+#: builtin/am.c:1789
+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.
+#.
+#: builtin/am.c:1799
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr ""
+"Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
+"на вÑичко:"
+
+#: builtin/am.c:1849
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr ""
+"ИндекÑÑŠÑ‚ не е чиÑÑ‚: кръпките не могат да бъдат приложени (замърÑени Ñа: %s)"
+
+#: builtin/am.c:1884 builtin/am.c:1955
+#, c-format
+msgid "Applying: %.*s"
+msgstr "Прилагане: %.*s"
+
+#: builtin/am.c:1900
+msgid "No changes -- Patch already applied."
+msgstr "Без промени — кръпката вече е приложена."
+
+#: builtin/am.c:1908
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "ÐеуÑпешно прилагане на кръпка при %s %.*s“"
+
+#: builtin/am.c:1914
+#, c-format
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "Дубликат на проблемната кръпка Ñе намира в: %s"
+
+#: builtin/am.c:1958
+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 ""
+"Без промени — възможно е да не Ñте изпълнили „git add“.\n"
+"Ðко нÑма друга промÑна за включване в индекÑа, най-вероÑтно нÑÐºÐ¾Ñ Ð´Ñ€ÑƒÐ³Ð°\n"
+"кръпка е довела до Ñъщите промени и в такъв Ñлучай проÑто пропуÑнете тази."
+
+#: builtin/am.c:1965
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr ""
+"ИндекÑÑŠÑ‚ вÑе още Ñъдържа неÑлети промени.\n"
+"Възможно е да не Ñте изпълнили „git add“."
+
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
+#: builtin/reset.c:316
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "„%s“ не е разпознат като обект."
+
+#: builtin/am.c:2125
+msgid "failed to clean index"
+msgstr "индекÑÑŠÑ‚ не може да бъде изчиÑтен"
+
+#: builtin/am.c:2159
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Изглежда указателÑÑ‚ „HEAD“ е променен и не Ñочи към ÑÑŠÑ‰Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚ както по "
+"времето\n"
+"на поÑледното неуÑпешно изпълнение на „git am“. УказателÑÑ‚ Ñе задава да Ñочи "
+"към\n"
+"„ORIG_HEAD“"
+
+#: builtin/am.c:2220
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "Ðеправилна ÑтойноÑÑ‚ за „--patch-format“: „%s“"
+
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+msgstr "git am [ОПЦИЯ…] [ФÐЙЛ_С_ПОЩÐ|ДИРЕКТОРИЯ_С_ПОЩÐ]…"
+
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
+
+#: builtin/am.c:2260
+msgid "run interactively"
+msgstr "интерактивна работа"
+
+#: builtin/am.c:2262
+msgid "historical option -- no-op"
+msgstr "изоÑтавена опциÑ, ÑъщеÑтвува по иÑторичеÑки причини, нищо не прави"
+
+#: builtin/am.c:2264
+msgid "allow fall back on 3way merging if needed"
+msgstr "да Ñе преминава към тройно Ñливане при нужда."
+
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/repack.c:171
+msgid "be quiet"
+msgstr "без извеждане на информациÑ"
+
+#: builtin/am.c:2267
+msgid "add a Signed-off-by line to the commit message"
+msgstr "добавÑне на ред за Ð¿Ð¾Ð´Ð¿Ð¸Ñ â€žSigned-off-by“ в Ñъобщението за подаване"
+
+#: builtin/am.c:2270
+msgid "recode into utf8 (default)"
+msgstr "прекодиране в UTF-8 (Ñтандартно)"
+
+#: builtin/am.c:2272
+msgid "pass -k flag to git-mailinfo"
+msgstr "подаване на опциÑта „-k“ на командата „git-mailinfo“"
+
+#: builtin/am.c:2274
+msgid "pass -b flag to git-mailinfo"
+msgstr "подаване на опциÑта „-b“ на командата „git-mailinfo“"
+
+#: builtin/am.c:2276
+msgid "pass -m flag to git-mailinfo"
+msgstr "подаване на опциÑта „-m“ на командата „git-mailinfo“"
+
+#: builtin/am.c:2278
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr ""
+"подаване на опциÑта „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
+
+#: builtin/am.c:2281
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+"без подаване на опциÑта „--keep-cr“ на командата „git-mailsplit“ незавиÑимо "
+"от „am.keepcr“"
+
+#: builtin/am.c:2284
+msgid "strip everything before a scissors line"
+msgstr "пропуÑкане на вÑичко преди реда за отрÑзване"
+
+#: builtin/am.c:2285 builtin/apply.c:4554
+msgid "action"
+msgstr "дейÑтвие"
+
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
+msgid "pass it through git-apply"
+msgstr "прекарване през „git-apply“"
+
+#: builtin/am.c:2294 builtin/apply.c:4578
+msgid "root"
+msgstr "ÐÐЧÐЛÐÐ_ДИРЕКТОРИЯ"
+
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
+msgid "path"
+msgstr "път"
+
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
+msgid "n"
+msgstr "БРОЙ"
+
+#: builtin/am.c:2306 builtin/apply.c:4522
+msgid "num"
+msgstr "БРОЙ"
+
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
+msgstr "ФОРМÐТ"
+
+#: builtin/am.c:2310
+msgid "format the patch(es) are in"
+msgstr "формат на кръпките"
+
+#: builtin/am.c:2316
+msgid "override error message when patch failure occurs"
+msgstr "избрано от Ð²Ð°Ñ Ñъобщение за грешка при прилагане на кръпки"
+
+#: builtin/am.c:2318
+msgid "continue applying patches after resolving a conflict"
+msgstr "продължаване на прилагането на кръпки Ñлед коригирането на конфликт"
+
+#: builtin/am.c:2321
+msgid "synonyms for --continue"
+msgstr "Ñиноними на „--continue“"
+
+#: builtin/am.c:2324
+msgid "skip the current patch"
+msgstr "преÑкачане на текущата кръпка"
+
+#: builtin/am.c:2327
+msgid "restore the original branch and abort the patching operation."
+msgstr ""
+"възÑтановÑване на първоначалното ÑÑŠÑтоÑние на клона и преуÑтановÑване на "
+"прилагането на кръпката."
+
+#: builtin/am.c:2331
+msgid "lie about committer date"
+msgstr "дата за подаване различна от първоначалнота"
+
+#: builtin/am.c:2333
+msgid "use current timestamp for author date"
+msgstr "използване на текущото време като това за автор"
+
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
+msgstr "ИДЕÐТИФИКÐТОР_ÐÐ_КЛЮЧ"
+
+#: builtin/am.c:2336
+msgid "GPG-sign commits"
+msgstr "подпиÑване на подаваниÑта Ñ GPG"
+
+#: builtin/am.c:2339
+msgid "(internal use for git-rebase)"
+msgstr "(ползва Ñе вътрешно за „git-rebase“)"
+
+#: builtin/am.c:2354
+msgid ""
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
+msgstr ""
+"Опциите „-b“/„--binary“ отдавна не правÑÑ‚ нищо и\n"
+"ще бъдат премахнати в бъдеще. Ðе ги ползвайте."
+
+#: builtin/am.c:2361
+msgid "failed to read the index"
+msgstr "неуÑпешно изчитане на индекÑа"
+
+#: builtin/am.c:2376
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr ""
+"предишната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° пребазиране „%s“ вÑе още ÑъщеÑтвува, а е зададен "
+"файл „mbox“."
+
+#: builtin/am.c:2400
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"Открита е излишна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€ž%s“.\n"
+"Можете да Ñ Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git am --abort“."
+
+#: builtin/am.c:2406
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Ð’ момента не тече Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾ коригиране и нÑма как да Ñе продължи."
+
#: builtin/apply.c:59
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [ОПЦИЯ…] [КРЪПКÐ…]"
-#: builtin/apply.c:112
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "непозната Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° знаците за интервали „%s“"
-#: builtin/apply.c:127
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "непозната Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° игнориране на знаците за интервали „%s“"
-#: builtin/apply.c:822
+#: builtin/apply.c:818
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "РегулÑрниÑÑ‚ израз за времето „%s“ не може за бъде компилиран"
-#: builtin/apply.c:831
+#: builtin/apply.c:827
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "РегулÑрниÑÑ‚ израз върна %d при подадена поÑледователноÑÑ‚ „%s“ на входа"
-#: builtin/apply.c:912
+#: builtin/apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "ЛипÑва име на файл на ред %d от кръпката"
-#: builtin/apply.c:944
+#: builtin/apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %2$d Ñе очакваше „/dev/"
"null“, а бе получен „%1$s“"
-#: builtin/apply.c:948
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
"неправилно име на нов файл"
-#: builtin/apply.c:949
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
"неправилно име на Ñтар файл"
-#: builtin/apply.c:956
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d Ñе очакваше „/dev/"
"null“"
-#: builtin/apply.c:1419
+#: builtin/apply.c:1415
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "при повторното преброÑване бе получен неочакван ред: „%.*s“"
-#: builtin/apply.c:1476
+#: builtin/apply.c:1472
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "чаÑÑ‚ от кръпка без заглавна чаÑÑ‚ на ред %d: %.*s"
-#: builtin/apply.c:1493
+#: builtin/apply.c:1489
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2419,66 +2978,65 @@ msgstr[1] ""
"След Ñъкращаването на първите %d чаÑти от компонентите на пътÑ, в заглавната "
"чаÑÑ‚ на „git diff“ липÑва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° име на файл (ред: %d)"
-#: builtin/apply.c:1659
+#: builtin/apply.c:1655
msgid "new file depends on old contents"
msgstr "новиÑÑ‚ файл завиÑи от Ñтарото Ñъдържание на файла"
-#: builtin/apply.c:1661
+#: builtin/apply.c:1657
msgid "deleted file still has contents"
msgstr "изтритиÑÑ‚ файл не е празен"
-#: builtin/apply.c:1687
+#: builtin/apply.c:1683
#, c-format
msgid "corrupt patch at line %d"
msgstr "грешка в кръпката на ред %d"
-#: builtin/apply.c:1723
+#: builtin/apply.c:1719
#, c-format
msgid "new file %s depends on old contents"
msgstr "новиÑÑ‚ файл „%s“ завиÑи от Ñтарото Ñъдържание на файла"
-#: builtin/apply.c:1725
+#: builtin/apply.c:1721
#, c-format
msgid "deleted file %s still has contents"
msgstr "изтритиÑÑ‚ файл „%s“ не е празен"
-# FIXME - double **??
-#: builtin/apply.c:1728
+#: builtin/apply.c:1724
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "â—◠предупреждение: файлът „%s“ вече е празен, но не е изтрит"
+msgstr "◠предупреждение: файлът „%s“ вече е празен, но не е изтрит"
-#: builtin/apply.c:1874
+#: builtin/apply.c:1870
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "грешка в двоичната кръпка на ред %d: %.*s"
-#: builtin/apply.c:1903
+#: builtin/apply.c:1899
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неразпозната двоичната кръпка на ред %d"
-#: builtin/apply.c:2054
+#: builtin/apply.c:2050
#, c-format
msgid "patch with only garbage at line %d"
msgstr "кръпката е Ñ Ð¸Ð·Ñ†Ñло повредени данни на ред %d"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2140
#, c-format
msgid "unable to read symlink %s"
msgstr "Ñимволната връзка „%s“ не може да бъде прочетена"
-#: builtin/apply.c:2148
+#: builtin/apply.c:2144
#, c-format
msgid "unable to open or read %s"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: builtin/apply.c:2781
+#: builtin/apply.c:2777
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправилно начало на ред: „%c“"
-#: builtin/apply.c:2900
+#: builtin/apply.c:2896
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -2487,13 +3045,13 @@ msgstr[0] ""
msgstr[1] ""
"%d-то парче код бе уÑпешно приложено на ред %d (отмеÑтване от %d реда)."
-#: builtin/apply.c:2912
+#: builtin/apply.c:2908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
"КонтекÑÑ‚ÑŠÑ‚ е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
-#: builtin/apply.c:2918
+#: builtin/apply.c:2914
#, c-format
msgid ""
"while searching for:\n"
@@ -2502,345 +3060,328 @@ msgstr ""
"при Ñ‚ÑŠÑ€Ñене за:\n"
"%.*s"
-#: builtin/apply.c:2938
+#: builtin/apply.c:2934
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "липÑват данните за двоичната кръпка за „%s“"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3035
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
-#: builtin/apply.c:3045
+#: builtin/apply.c:3041
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"двоичната кръпка за „%s“ води до неправилни резултати (очакваше Ñе SHA1: "
"„%s“, а бе получено: „%s“)"
-#: builtin/apply.c:3066
+#: builtin/apply.c:3062
#, c-format
msgid "patch failed: %s:%ld"
msgstr "неуÑпешно прилагане на кръпка: „%s:%ld“"
-#: builtin/apply.c:3190
+#: builtin/apply.c:3186
#, c-format
msgid "cannot checkout %s"
msgstr "„%s“ не може да Ñе изтегли"
-#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
#, c-format
msgid "read of %s failed"
msgstr "неуÑпешно прочитане на „%s“"
-#: builtin/apply.c:3243
+#: builtin/apply.c:3239
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "изчитане на „%s“ Ñлед проÑледÑване на Ñимволна връзка"
-#: builtin/apply.c:3271 builtin/apply.c:3493
+#: builtin/apply.c:3267 builtin/apply.c:3489
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "обектът Ñ Ð¿ÑŠÑ‚ „%s“ е преименуван или изтрит"
-#: builtin/apply.c:3352 builtin/apply.c:3507
+#: builtin/apply.c:3348 builtin/apply.c:3503
#, c-format
msgid "%s: does not exist in index"
msgstr "„%s“ не ÑъщеÑтвува в индекÑа"
-#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
#, c-format
msgid "%s: %s"
msgstr "„%s“: %s"
-#: builtin/apply.c:3361 builtin/apply.c:3515
+#: builtin/apply.c:3357 builtin/apply.c:3511
#, c-format
msgid "%s: does not match index"
msgstr "„%s“ не ÑъответÑтва на индекÑа"
-#: builtin/apply.c:3463
+#: builtin/apply.c:3459
msgid "removal patch leaves file contents"
msgstr "изтриващата кръпка оÑÑ‚Ð°Ð²Ñ Ñ„Ð°Ð¹Ð»Ð° непразен"
-#: builtin/apply.c:3532
+#: builtin/apply.c:3528
#, c-format
msgid "%s: wrong type"
msgstr "„%s“: неправилен вид"
-#: builtin/apply.c:3534
+#: builtin/apply.c:3530
#, c-format
msgid "%s has type %o, expected %o"
msgstr "„%s“ е от вид „%o“, а Ñе очакваше „%o“"
-#: builtin/apply.c:3693 builtin/apply.c:3695
+#: builtin/apply.c:3689 builtin/apply.c:3691
#, c-format
msgid "invalid path '%s'"
msgstr "неправилен път: „%s“"
-#: builtin/apply.c:3750
+#: builtin/apply.c:3746
#, c-format
msgid "%s: already exists in index"
msgstr "„%s“: вече ÑъщеÑтвува в индекÑа"
-#: builtin/apply.c:3753
+#: builtin/apply.c:3749
#, c-format
msgid "%s: already exists in working directory"
msgstr "„%s“: вече ÑъщеÑтвува в работното дърво"
-#: builtin/apply.c:3773
+#: builtin/apply.c:3769
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новите права за доÑтъп (%o) на „%s“ не Ñъвпадат ÑÑŠÑ Ñтарите (%o)"
-#: builtin/apply.c:3778
+#: builtin/apply.c:3774
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"новите права за доÑтъп (%o) на „%s“ не Ñъвпадат ÑÑŠÑ Ñтарите (%o) на „%s“"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3794
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "заÑегнатиÑÑ‚ файл „%s“ е Ñлед Ñимволна връзка"
-#: builtin/apply.c:3802
+#: builtin/apply.c:3798
#, c-format
msgid "%s: patch does not apply"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: builtin/apply.c:3816
+#: builtin/apply.c:3812
#, c-format
msgid "Checking patch %s..."
msgstr "ПроверÑване на кръпката „%s“…"
-#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "неуÑпешно Ñъздаване на Ð·Ð°Ð¿Ð¸Ñ Ð² кеша чрез „make_cache_entry“ за „%s“"
-#: builtin/apply.c:4052
+#: builtin/apply.c:4048
#, c-format
msgid "unable to remove %s from index"
msgstr "„%s“ не може да Ñе извади от индекÑа"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4077
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "повредена кръпка за модула „%s“"
-#: builtin/apply.c:4085
+#: builtin/apply.c:4081
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
"не може да Ñе получи Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за новоÑÑŠÐ·Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“"
-#: builtin/apply.c:4090
+#: builtin/apply.c:4086
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"не може да Ñе за Ñъздаде мÑÑтото за Ñъхранение на новоÑÑŠÐ·Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“"
-#: builtin/apply.c:4093 builtin/apply.c:4201
+#: builtin/apply.c:4089 builtin/apply.c:4197
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не може да Ñе добави Ð·Ð°Ð¿Ð¸Ñ Ð² кеша за „%s“"
-#: builtin/apply.c:4126
+#: builtin/apply.c:4122
#, c-format
msgid "closing file '%s'"
msgstr "затварÑне на файла „%s“"
-#: builtin/apply.c:4175
+#: builtin/apply.c:4171
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "файлът „%s“ не може да Ñе запише Ñ Ñ€ÐµÐ¶Ð¸Ð¼ на доÑтъп „%o“"
-#: builtin/apply.c:4262
+#: builtin/apply.c:4258
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Кръпката „%s“ бе приложена чиÑто."
-#: builtin/apply.c:4270
+#: builtin/apply.c:4266
msgid "internal error"
msgstr "вътрешна грешка"
-#: builtin/apply.c:4273
+#: builtin/apply.c:4269
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Прилагане на кръпката „%%s“ Ñ %d отхвърлено парче…"
msgstr[1] "Прилагане на кръпката „%%s“ Ñ %d отхвърлени парчета…"
-#: builtin/apply.c:4283
+#: builtin/apply.c:4279
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "Ñъкращаване на името на файла Ñ Ð¾Ñ‚Ñ…Ð²ÑŠÑ€Ð»ÐµÐ½Ð¸Ñ‚Ðµ парчета на „ %.*s.rej“"
-#: builtin/apply.c:4304
+#: builtin/apply.c:4300
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "%d-то парче бе уÑпешно приложено."
-#: builtin/apply.c:4307
+#: builtin/apply.c:4303
#, c-format
msgid "Rejected hunk #%d."
msgstr "%d-то парче бе отхвърлено."
-#: builtin/apply.c:4397
+#: builtin/apply.c:4393
msgid "unrecognized input"
msgstr "непознат вход"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4404
msgid "unable to read index file"
msgstr "индекÑÑŠÑ‚ не може да бъде запиÑан"
-#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
-#: builtin/fetch.c:92
-msgid "path"
-msgstr "път"
-
-#: builtin/apply.c:4526
+#: builtin/apply.c:4517
msgid "don't apply changes matching the given path"
msgstr "без прилагане на промените напаÑващи на Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ð¿ÑŠÑ‚"
-#: builtin/apply.c:4529
+#: builtin/apply.c:4520
msgid "apply changes matching the given path"
msgstr "прилагане на промените напаÑващи на Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ð¿ÑŠÑ‚"
-#: builtin/apply.c:4531
-msgid "num"
-msgstr "БРОЙ"
-
-#: builtin/apply.c:4532
+#: builtin/apply.c:4523
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
-#: builtin/apply.c:4535
+#: builtin/apply.c:4526
msgid "ignore additions made by the patch"
msgstr "игнориране на редовете добавени от тази кръпка"
-#: builtin/apply.c:4537
+#: builtin/apply.c:4528
msgid "instead of applying the patch, output diffstat for the input"
msgstr "извеждане на ÑтатиÑтика на промените без прилагане на кръпката"
-#: builtin/apply.c:4541
+#: builtin/apply.c:4532
msgid "show number of added and deleted lines in decimal notation"
msgstr "извеждане на Ð±Ñ€Ð¾Ñ Ð½Ð° добавените и изтритите редове"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4534
msgid "instead of applying the patch, output a summary for the input"
msgstr "извеждане на ÑтатиÑтика на входните данни без прилагане на кръпката"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4536
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "проверка дали кръпката може да Ñе приложи, без дейÑтвително прилагане"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4538
msgid "make sure the patch is applicable to the current index"
msgstr "проверка дали кръпката може да бъде приложена към Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑ"
-#: builtin/apply.c:4549
+#: builtin/apply.c:4540
msgid "apply a patch without touching the working tree"
msgstr "прилагане на кръпката без промÑна на работното дърво"
-#: builtin/apply.c:4551
+#: builtin/apply.c:4542
msgid "accept a patch that touches outside the working area"
msgstr "прилагане на кръпка, коÑто Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ð¸ файлове извън работното дърво"
-#: builtin/apply.c:4553
+#: builtin/apply.c:4544
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"кръпката да бъде приложена. ОпциÑта Ñе комбинира Ñ â€ž--check“/„--stat“/„--"
"summary“"
-#: builtin/apply.c:4555
+#: builtin/apply.c:4546
msgid "attempt three-way merge if a patch does not apply"
msgstr "пробване Ñ Ñ‚Ñ€Ð¾Ð¹Ð½Ð¾ Ñливане, ако кръпката не може да Ñе приложи директно"
-#: builtin/apply.c:4557
+#: builtin/apply.c:4548
msgid "build a temporary index based on embedded index information"
msgstr ""
"Ñъздаване на временен Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° база на включената Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° индекÑа"
-#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr "разделÑне на пътищата Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4553
msgid "ensure at least <n> lines of context match"
msgstr "да Ñе оÑигури контекÑÑ‚ от поне такъв БРОЙ Ñъвпадащи редове"
-#: builtin/apply.c:4563
-msgid "action"
-msgstr "дейÑтвие"
-
-#: builtin/apply.c:4564
+#: builtin/apply.c:4555
msgid "detect new or modified lines that have whitespace errors"
msgstr "заÑичане на нови или променени редове Ñ Ð³Ñ€ÐµÑˆÐºÐ¸ в знаците за интервали"
-#: builtin/apply.c:4567 builtin/apply.c:4570
+#: builtin/apply.c:4558 builtin/apply.c:4561
msgid "ignore changes in whitespace when finding context"
msgstr ""
"игнориране на промените в знаците за интервали при откриване на контекÑта"
-#: builtin/apply.c:4573
+#: builtin/apply.c:4564
msgid "apply the patch in reverse"
msgstr "прилагане на кръпката в обратна поÑока"
-#: builtin/apply.c:4575
+#: builtin/apply.c:4566
msgid "don't expect at least one line of context"
msgstr "без изиÑкване на дори и един ред контекÑÑ‚"
-#: builtin/apply.c:4577
+#: builtin/apply.c:4568
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оÑтавÑне на отхвърлените парчета във файлове Ñ Ñ€Ð°Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¸Ðµ „.rej“"
-#: builtin/apply.c:4579
+#: builtin/apply.c:4570
msgid "allow overlapping hunks"
msgstr "позволÑване на заÑтъпващи Ñе парчета"
-#: builtin/apply.c:4582
+#: builtin/apply.c:4573
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "пренебрегване на неправилно липÑващ знак за нов ред в ÐºÑ€Ð°Ñ Ð½Ð° файл"
-#: builtin/apply.c:4585
+#: builtin/apply.c:4576
msgid "do not trust the line counts in the hunk headers"
msgstr "без доверÑване на номерата на редовете в заглавните чаÑти на парчетата"
-#: builtin/apply.c:4587
-msgid "root"
-msgstr "ÐÐЧÐЛÐÐ_ДИРЕКТОРИЯ"
-
-#: builtin/apply.c:4588
+#: builtin/apply.c:4579
msgid "prepend <root> to all filenames"
msgstr "добавÑне на тази ÐÐЧÐЛÐÐ_ДИРЕКТОРИЯ към имената на вÑички файлове"
-#: builtin/apply.c:4610
+#: builtin/apply.c:4601
msgid "--3way outside a repository"
msgstr "като „--3way“, но извън хранилище"
-#: builtin/apply.c:4618
+#: builtin/apply.c:4609
msgid "--index outside a repository"
msgstr "като „--index“, но извън хранилище"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4612
msgid "--cached outside a repository"
msgstr "като „--cached“, но извън хранилище"
-#: builtin/apply.c:4640
+#: builtin/apply.c:4631
#, c-format
msgid "can't open patch '%s'"
msgstr "кръпката „%s“ не може да бъде отворена"
-#: builtin/apply.c:4654
+#: builtin/apply.c:4645
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
msgstr[1] "пренебрегнати Ñа %d грешки в знаците за интервали"
-#: builtin/apply.c:4660 builtin/apply.c:4670
+#: builtin/apply.c:4651 builtin/apply.c:4661
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -2895,120 +3436,120 @@ msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
"обновÑване на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žBISECT_HEAD“ вмеÑто да Ñе използва текущото подаване"
-#: builtin/blame.c:31
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗÐ_ВЕРСИЯТÐ…] [ВЕРСИЯ] [--] ФÐЙЛ"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "ОПЦИИте_ЗÐ_ВЕРСИЯТРÑа документирани в ръководÑтвото git-rev-list(1)"
-#: builtin/blame.c:2500
+#: builtin/blame.c:2519
msgid "Show blame entries as we find them, incrementally"
msgstr "Извеждане на анотациите Ñ Ð½Ð°Ð¼Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ им, поÑледователно"
# FIXME SHA-1 -> SHA1
-#: builtin/blame.c:2501
+#: builtin/blame.c:2520
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Извеждане на празни Ñуми по SHA1 за граничните Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ (Ñтандартно опциÑта "
"е изключена)"
-#: builtin/blame.c:2502
+#: builtin/blame.c:2521
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"Ðачалните Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð´Ð° не Ñе Ñчитат за гранични (Ñтандартно опциÑта е "
"изключена)"
-#: builtin/blame.c:2503
+#: builtin/blame.c:2522
msgid "Show work cost statistics"
msgstr "Извеждане на ÑтатиÑтика за извършените дейÑтвиÑ"
-#: builtin/blame.c:2504
+#: builtin/blame.c:2523
msgid "Show output score for blame entries"
msgstr "Извеждане на допълнителна Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° определÑнето на анотациите"
-#: builtin/blame.c:2505
+#: builtin/blame.c:2524
msgid "Show original filename (Default: auto)"
msgstr ""
"Извеждане на първоначалното име на файл (Ñтандартно това е автоматично)"
-#: builtin/blame.c:2506
+#: builtin/blame.c:2525
msgid "Show original linenumber (Default: off)"
msgstr ""
"Извеждане на първоначалниÑÑ‚ номер на ред (Ñтандартно опциÑта е изключена)"
-#: builtin/blame.c:2507
+#: builtin/blame.c:2526
msgid "Show in a format designed for machine consumption"
msgstr "Извеждане във формат за по-нататъшна обработка"
-#: builtin/blame.c:2508
+#: builtin/blame.c:2527
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Извеждане във формат за команди от потребителÑко ниво Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½Ð° вÑеки "
"ред"
-#: builtin/blame.c:2509
+#: builtin/blame.c:2528
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Използване на ÑÑŠÑ‰Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ като „git-annotate“ (Ñтандартно опциÑта е "
"изключена)"
-#: builtin/blame.c:2510
+#: builtin/blame.c:2529
msgid "Show raw timestamp (Default: off)"
msgstr "Извеждане на неформатирани времена (Ñтандартно опциÑта е изключена)"
-#: builtin/blame.c:2511
+#: builtin/blame.c:2530
msgid "Show long commit SHA1 (Default: off)"
msgstr "Извеждане на пълните Ñуми по SHA1 (Ñтандартно опциÑта е изключена)"
-#: builtin/blame.c:2512
+#: builtin/blame.c:2531
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Без име на автор и време на промÑна (Ñтандартно опциÑта е изключена)"
-#: builtin/blame.c:2513
+#: builtin/blame.c:2532
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Извеждане на е-пощата на автора, а не името му (Ñтандартно опциÑта е "
"изключена)"
-#: builtin/blame.c:2514
+#: builtin/blame.c:2533
msgid "Ignore whitespace differences"
msgstr "Без разлики в знаците за интервали"
-#: builtin/blame.c:2515
+#: builtin/blame.c:2534
msgid "Spend extra cycles to find better match"
msgstr "Допълнителни изчиÑÐ»ÐµÐ½Ð¸Ñ Ð·Ð° по-добри резултати"
-#: builtin/blame.c:2516
+#: builtin/blame.c:2535
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Изчитане на верÑиите от ФÐЙЛ, а не чрез изпълнение на „git-rev-list“"
-#: builtin/blame.c:2517
+#: builtin/blame.c:2536
msgid "Use <file>'s contents as the final image"
msgstr "Използване на Ñъдържанието на ФÐЙЛа като крайно положение"
-#: builtin/blame.c:2518 builtin/blame.c:2519
+#: builtin/blame.c:2537 builtin/blame.c:2538
msgid "score"
msgstr "напаÑване на редовете"
-#: builtin/blame.c:2518
+#: builtin/blame.c:2537
msgid "Find line copies within and across files"
msgstr ""
"ТърÑене на копирани редове както в рамките на един файл, така и от един файл "
"към друг"
-#: builtin/blame.c:2519
+#: builtin/blame.c:2538
msgid "Find line movements within and across files"
msgstr ""
"ТърÑене на премеÑтени редове както в рамките на един файл, така и от един "
"файл към друг"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "Process only line range n,m, counting from 1"
msgstr ""
"Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñамо за редовете в интервала от n до m включително. Броенето "
@@ -3020,27 +3561,31 @@ msgstr ""
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2601
+#: builtin/blame.c:2620
msgid "4 years, 11 months ago"
msgstr "преди 4 години и 11 меÑеца"
-#: builtin/branch.c:24
+#: builtin/branch.c:25
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [ОПЦИЯ…] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [ОПЦИЯ…] [-l] [-f] ИМЕ_ÐÐ_КЛОР[ÐÐЧÐЛО]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [ОПЦИЯ…] [-r] (-d | -D) ИМЕ_ÐÐ_КЛОÐ…"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [ОПЦИЯ…] (-m | -M) [СТÐР_КЛОÐ] ÐОВ_КЛОÐ"
-#: builtin/branch.c:150
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [ОПЦИЯ…] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:142
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3049,7 +3594,7 @@ msgstr ""
"изтриване на клона „%s“, който е ÑлÑÑ‚ към „%s“,\n"
" но още не е ÑлÑÑ‚ към върха „HEAD“."
-#: builtin/branch.c:154
+#: builtin/branch.c:146
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3058,12 +3603,12 @@ msgstr ""
"отказване на изтриване на клона „%s“, който не е ÑлÑÑ‚ към\n"
" „%s“, но е ÑлÑÑ‚ към върха „HEAD“."
-#: builtin/branch.c:168
+#: builtin/branch.c:160
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Обектът-подаване за „%s“ не може да бъде открит"
-#: builtin/branch.c:172
+#: builtin/branch.c:164
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3072,310 +3617,301 @@ msgstr ""
"Клонът „%s“ не е ÑлÑÑ‚ напълно. Ðко Ñте Ñигурни, че иÑкате\n"
"да го изтриете, изпълнете „git branch -D %s“."
-#: builtin/branch.c:185
+#: builtin/branch.c:177
msgid "Update of config-file failed"
msgstr "ÐеуÑпешно обновÑване на ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»"
-#: builtin/branch.c:213
+#: builtin/branch.c:205
msgid "cannot use -a with -d"
msgstr "ОпциÑта „-a“ е неÑъвмеÑтима Ñ Ð¾Ð¿Ñ†Ð¸Ñта „-d“"
-#: builtin/branch.c:219
+#: builtin/branch.c:211
msgid "Couldn't look up commit object for HEAD"
msgstr "Обектът-подаване, Ñочен от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“, не може да бъде открит"
-#: builtin/branch.c:227
+#: builtin/branch.c:219
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "Ðе можете да изтриете клона „%s“, защото в момента е текущ."
+msgstr "Ðе можете да изтриете Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“"
-#: builtin/branch.c:243
+#: builtin/branch.c:235
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "ÑледÑщиÑÑ‚ клон „%s“ не може да бъде открит."
-#: builtin/branch.c:244
+#: builtin/branch.c:236
#, c-format
msgid "branch '%s' not found."
msgstr "клонът „%s“ не може да бъде открит."
-#: builtin/branch.c:258
+#: builtin/branch.c:251
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Грешка при изтриването на ÑледÑÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“"
-#: builtin/branch.c:259
+#: builtin/branch.c:252
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Грешка при изтриването на клона „%s“"
-#: builtin/branch.c:266
+#: builtin/branch.c:259
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Изтрит ÑледÑщ клон „%s“ (той Ñочеше към „%s“).\n"
-#: builtin/branch.c:267
+#: builtin/branch.c:260
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Изтрит клон „%s“ (той Ñочеше към „%s“).\n"
-#: builtin/branch.c:368
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr "клонът „%s“ не Ñочи към подаване"
-
-#: builtin/branch.c:451
+#: builtin/branch.c:303
#, c-format
msgid "[%s: gone]"
msgstr "[%s: изтрит]"
-#: builtin/branch.c:456
+#: builtin/branch.c:308
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:461
+#: builtin/branch.c:313
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: назад Ñ %d]"
-#: builtin/branch.c:463
+#: builtin/branch.c:315
#, c-format
msgid "[behind %d]"
msgstr "[назад Ñ %d]"
-#: builtin/branch.c:467
+#: builtin/branch.c:319
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: напред Ñ %d]"
-#: builtin/branch.c:469
+#: builtin/branch.c:321
#, c-format
msgid "[ahead %d]"
msgstr "[напред Ñ %d]"
-#: builtin/branch.c:472
+#: builtin/branch.c:324
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: напред Ñ %d, назад Ñ %d]"
-#: builtin/branch.c:475
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[напред Ñ %d, назад Ñ %d]"
-# FIXME ** how many??
-#: builtin/branch.c:488
+#: builtin/branch.c:340
msgid " **** invalid ref ****"
-msgstr " â—â—â—◠неправилен указател â—â—â—â—"
+msgstr " â—â—◠неправилен указател â—â—â—"
-#: builtin/branch.c:579
+#: builtin/branch.c:366
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(извън клон, пребазиране на „%s“)"
-#: builtin/branch.c:582
+#: builtin/branch.c:369
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(извън клон, двоично Ñ‚ÑŠÑ€Ñене от „%s“)"
-#: builtin/branch.c:588
+#: builtin/branch.c:375
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(УказателÑÑ‚ „HEAD“ не е Ñвързан и е при „%s“)"
-#: builtin/branch.c:591
+#: builtin/branch.c:378
#, c-format
msgid "(HEAD detached from %s)"
msgstr "УказателÑÑ‚ „HEAD“ не е Ñвързан и е отделѐн от „%s“"
-#: builtin/branch.c:595
+#: builtin/branch.c:382
msgid "(no branch)"
msgstr "(извън клон)"
-#: builtin/branch.c:642
-#, c-format
-msgid "object '%s' does not point to a commit"
-msgstr "обектът „%s“ не Ñочи към подаване"
-
-#: builtin/branch.c:690
-msgid "some refs could not be read"
-msgstr "нÑкои указатели не могат да бъдат прочетени"
-
-#: builtin/branch.c:703
+#: builtin/branch.c:524
msgid "cannot rename the current branch while not on any."
msgstr ""
"не можете да преименувате Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½, защото Ñте извън който и да е клон"
-#: builtin/branch.c:713
+#: builtin/branch.c:534
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ðеправилно име на клон: „%s“"
-#: builtin/branch.c:728
+#: builtin/branch.c:549
msgid "Branch rename failed"
msgstr "ÐеуÑпешно преименуване на клон"
-#: builtin/branch.c:732
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Ðа клона Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»Ð½Ð¾ име „%s“ е дадено Ñлужебно име"
-#: builtin/branch.c:736
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Клонът е преименуван на „%s“, но указателÑÑ‚ „HEAD“ не е обновен"
-#: builtin/branch.c:743
+#: builtin/branch.c:564
msgid "Branch is renamed, but update of config-file failed"
msgstr "Клонът е преименуван, но конфигурационниÑÑ‚ файл не е обновен"
-#: builtin/branch.c:758
-#, c-format
-msgid "malformed object name %s"
-msgstr "неправилно име на обект „%s“"
-
-#: builtin/branch.c:780
+#: builtin/branch.c:587
#, c-format
msgid "could not write branch description template: %s"
msgstr "шаблонът за опиÑание на клон не бе запиÑан: „%s“"
-#: builtin/branch.c:810
+#: builtin/branch.c:616
msgid "Generic options"
msgstr "Общи наÑтройки"
-#: builtin/branch.c:812
+#: builtin/branch.c:618
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
"извеждане на хеша и темата. ПовтарÑнето на опциÑта Ð¿Ñ€Ð¸Ð±Ð°Ð²Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ‚Ðµ клони"
-#: builtin/branch.c:813
+#: builtin/branch.c:619
msgid "suppress informational messages"
msgstr "без информационни ÑъобщениÑ"
-#: builtin/branch.c:814
+#: builtin/branch.c:620
msgid "set up tracking mode (see git-pull(1))"
msgstr "задаване на режима на Ñледене (виж git-pull(1))"
-#: builtin/branch.c:816
+#: builtin/branch.c:622
msgid "change upstream info"
msgstr "ÑмÑна на ÑÐ»ÐµÐ´ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/branch.c:820
+#: builtin/branch.c:626
msgid "use colored output"
msgstr "цветен изход"
-#: builtin/branch.c:821
+#: builtin/branch.c:627
msgid "act on remote-tracking branches"
msgstr "дейÑтвие върху ÑледÑщите клони"
-#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
-#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
-#: builtin/tag.c:622
-msgid "commit"
-msgstr "подаване"
-
-#: builtin/branch.c:825 builtin/branch.c:831
+#: builtin/branch.c:629 builtin/branch.c:630
msgid "print only branches that contain the commit"
msgstr "извеждане Ñамо на клоните, които Ñъдържат това подаване"
-#: builtin/branch.c:837
+#: builtin/branch.c:633
msgid "Specific git-branch actions:"
msgstr "Специални дейÑÑ‚Ð²Ð¸Ñ Ð½Ð° „git-branch“:"
-#: builtin/branch.c:838
+#: builtin/branch.c:634
msgid "list both remote-tracking and local branches"
msgstr "извеждане както на ÑледÑщите, така и на локалните клони"
-#: builtin/branch.c:840
+#: builtin/branch.c:636
msgid "delete fully merged branch"
msgstr "изтриване на клони, които Ñа напълно Ñлети"
-#: builtin/branch.c:841
+#: builtin/branch.c:637
msgid "delete branch (even if not merged)"
msgstr "изтриване и на клони, които не Ñа напълно Ñлети"
-#: builtin/branch.c:842
+#: builtin/branch.c:638
msgid "move/rename a branch and its reflog"
msgstr ""
"премеÑтване/преименуване на клон и принадлежащиÑÑ‚ му журнал на указателите"
-#: builtin/branch.c:843
+#: builtin/branch.c:639
msgid "move/rename a branch, even if target exists"
msgstr "премеÑтване/преименуване на клон, дори ако има вече клон Ñ Ñ‚Ð°ÐºÐ¾Ð²Ð° име"
-#: builtin/branch.c:844
+#: builtin/branch.c:640
msgid "list branch names"
msgstr "извеждане на имената на клоните"
-#: builtin/branch.c:845
+#: builtin/branch.c:641
msgid "create the branch's reflog"
msgstr "Ñъздаване на журнала на указателите на клона"
-#: builtin/branch.c:847
+#: builtin/branch.c:643
msgid "edit the description for the branch"
msgstr "редактиране на опиÑанието на клона"
-#: builtin/branch.c:848
+#: builtin/branch.c:644
msgid "force creation, move/rename, deletion"
msgstr "принудително Ñъздаване, премеÑтване, преименуване, изтриване"
-#: builtin/branch.c:851
-msgid "print only not merged branches"
-msgstr "извеждане Ñамо на неÑлетите клони"
-
-#: builtin/branch.c:857
-msgid "print only merged branches"
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
msgstr "извеждане Ñамо на Ñлетите клони"
-#: builtin/branch.c:861
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
+msgstr "извеждане Ñамо на неÑлетите клони"
+
+#: builtin/branch.c:647
msgid "list branches in columns"
msgstr "извеждане по колони"
-#: builtin/branch.c:874
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr "ключ"
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr "име на полето, по което да е подредбата"
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr "обект"
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr "извеждане Ñамо на клоните на обекта"
+
+#: builtin/branch.c:670
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Ðе може да Ñе открие към какво Ñочи указателÑÑ‚ „HEAD“"
-#: builtin/branch.c:878 builtin/clone.c:622
+#: builtin/branch.c:674 builtin/clone.c:697
msgid "HEAD not found below refs/heads!"
msgstr "Ð’ директориÑта „refs/heads“ липÑва файл „HEAD“"
-#: builtin/branch.c:900
+#: builtin/branch.c:694
msgid "--column and --verbose are incompatible"
msgstr "Опциите „--column“ и „--verbose“ Ñа неÑъвмеÑтими"
-#: builtin/branch.c:911 builtin/branch.c:950
+#: builtin/branch.c:705 builtin/branch.c:747
msgid "branch name required"
msgstr "Ðеобходимо е име на клон"
-#: builtin/branch.c:926
+#: builtin/branch.c:723
msgid "Cannot give description to detached HEAD"
msgstr "Ðе може да зададете опиÑание на „HEAD“ извън клон"
-#: builtin/branch.c:931
+#: builtin/branch.c:728
msgid "cannot edit description of more than one branch"
msgstr "Ðе може да редактирате опиÑанието на повече от един клон едновременно"
-#: builtin/branch.c:938
+#: builtin/branch.c:735
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Ð’ клона „%s“ вÑе още нÑма подаваниÑ."
-#: builtin/branch.c:941
+#: builtin/branch.c:738
#, c-format
msgid "No branch named '%s'."
msgstr "ЛипÑва клон на име „%s“."
-#: builtin/branch.c:956
+#: builtin/branch.c:753
msgid "too many branches for a rename operation"
msgstr "Прекалено много клони за преименуване"
-#: builtin/branch.c:961
+#: builtin/branch.c:758
msgid "too many branches to set new upstream"
-msgstr "Прекалено много клони за задаване на Ñледене"
+msgstr "Зададени Ñа прекалено много клони за Ñледене"
-#: builtin/branch.c:965
+#: builtin/branch.c:762
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3383,39 +3919,39 @@ msgstr ""
"Следеното от „HEAD“ не може да Ñе зададе да е „%s“, защото то не Ñочи към "
"никой клон."
-#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
#, c-format
msgid "no such branch '%s'"
msgstr "ÐÑма клон на име „%s“."
-#: builtin/branch.c:972
+#: builtin/branch.c:769
#, c-format
msgid "branch '%s' does not exist"
msgstr "Ðе ÑъщеÑтвува клон на име „%s“."
-#: builtin/branch.c:984
+#: builtin/branch.c:781
msgid "too many branches to unset upstream"
msgstr "Прекалено много клони за махане на Ñледене"
-#: builtin/branch.c:988
+#: builtin/branch.c:785
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Следеното от „HEAD“ не може да махне, защото то не Ñочи към никой клон."
-#: builtin/branch.c:994
+#: builtin/branch.c:791
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "ÐÑма Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÐºÐ»Ð¾Ð½ÑŠÑ‚ „%s“ да Ñледи нÑкой друг"
-#: builtin/branch.c:1008
+#: builtin/branch.c:805
msgid "it does not make sense to create 'HEAD' manually"
msgstr "ÐÑма никакъв ÑмиÑъл ръчно да Ñъздавате „HEAD“."
-#: builtin/branch.c:1014
+#: builtin/branch.c:811
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "Опциите „-a“ и „-r“ на „git branch“ Ñа неÑъвмеÑтими Ñ Ð¸Ð¼Ðµ на клон"
-#: builtin/branch.c:1017
+#: builtin/branch.c:814
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3424,7 +3960,7 @@ msgstr ""
"ОпциÑта „--set-upstream“ вече е оÑтарÑла и предÑтои да бъде махната. "
"Използвайте „--track“ или „--set-upstream-to“\n"
-#: builtin/branch.c:1034
+#: builtin/branch.c:831
#, c-format
msgid ""
"\n"
@@ -3435,12 +3971,12 @@ msgstr ""
"За да накарате „%s“ да Ñледи „%s“, изпълнете Ñледната команда:\n"
"\n"
-#: builtin/branch.c:1035
+#: builtin/branch.c:832
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1036
+#: builtin/branch.c:833
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3458,7 +3994,7 @@ msgstr "За Ñъздаването на пратка е необходимо Ñ…
msgid "Need a repository to unbundle."
msgstr "За приемането на пратка е необходимо хранилище."
-#: builtin/cat-file.c:369
+#: builtin/cat-file.c:428
msgid ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<type>|--textconv) <object>"
@@ -3466,67 +4002,72 @@ msgstr ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | ВИД | --textconv) ОБЕКТ"
-#: builtin/cat-file.c:370
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
-"objects>"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < СПИСЪК_С_ОБЕКТИ"
+#: builtin/cat-file.c:429
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-#: builtin/cat-file.c:407
+#: builtin/cat-file.c:466
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
"ВИДът може да е: „blob“ (обект BLOB), „tree“ (дърво), „commit“ (подаване), "
"„tag“ (етикет)"
-#: builtin/cat-file.c:408
+#: builtin/cat-file.c:467
msgid "show object type"
msgstr "извеждане на вида на обект"
-#: builtin/cat-file.c:409
+#: builtin/cat-file.c:468
msgid "show object size"
msgstr "извеждане на размера на обект"
-#: builtin/cat-file.c:411
+#: builtin/cat-file.c:470
msgid "exit with zero when there's no error"
msgstr "изход Ñ 0, когато нÑма грешка"
-#: builtin/cat-file.c:412
+#: builtin/cat-file.c:471
msgid "pretty-print object's content"
msgstr "форматирано извеждане на Ñъдържанието на обекта"
-#: builtin/cat-file.c:414
+#: builtin/cat-file.c:473
msgid "for blob objects, run textconv on object's content"
msgstr ""
"да Ñе Ñтартира програмата зададена в наÑтройката „textconv“ за преобразуване "
-"на Ñъдържанието на обекта"
+"на Ñъдържанието на обекта BLOB"
-#: builtin/cat-file.c:416
+#: builtin/cat-file.c:475
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "позволÑване на опциите „-s“ и „-t“ да работÑÑ‚ Ñ Ð¿Ð¾Ð²Ñ€ÐµÐ´ÐµÐ½Ð¸ обекти"
-#: builtin/cat-file.c:418
+#: builtin/cat-file.c:476
+msgid "buffer --batch output"
+msgstr "буфериране на изхода от „--batch“"
+
+#: builtin/cat-file.c:478
msgid "show info and content of objects fed from the standard input"
msgstr ""
"извеждане на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸ Ñъдържание на обектите подадени на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
-#: builtin/cat-file.c:421
+#: builtin/cat-file.c:481
msgid "show info about objects fed from the standard input"
msgstr "извеждане на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° обектите подадени на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
-#: builtin/cat-file.c:424
+#: builtin/cat-file.c:484
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"Ñледване на Ñимволните връзки Ñочещи в дървото (ползва Ñе Ñ â€ž--batch“ или „--"
"batch-check“)"
+#: builtin/cat-file.c:486
+msgid "show all objects with --batch or --batch-check"
+msgstr "извеждане на вÑички обекти Ñ â€ž--batch“ или „--batch-check“"
+
#: builtin/check-attr.c:11
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | ÐТРИБУТ…] [--] ПЪТ…"
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
-msgstr "git check-attr --stdin [-z] [-a | --all | ÐТРИБУТ…] < СПИСЪК_С_ПЪТИЩÐ"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | ÐТРИБУТ…]"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@ -3544,7 +4085,7 @@ msgstr "изчитане на имената на файловете от Ñта
msgid "terminate input and output records by a NUL character"
msgstr "разделÑне на входните и изходните запиÑи Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "без показване на напредъка"
@@ -3560,7 +4101,6 @@ msgstr "преÑкачане на индекÑа при проверката"
msgid "cannot specify pathnames with --stdin"
msgstr "опциÑта „--stdin“ е неÑъвмеÑтима Ñ Ð¸Ð¼ÐµÐ½Ð° на пътища"
-# FIXME options
#: builtin/check-ignore.c:157
msgid "-z only makes sense with --stdin"
msgstr "опциÑта „-z“ изиÑква „--stdin“"
@@ -3573,12 +4113,10 @@ msgstr "не е зададен път"
msgid "--quiet is only valid with a single pathname"
msgstr "опциÑта „--quiet“ изиÑква да е подаден точно един път"
-# FIXME options
#: builtin/check-ignore.c:165
msgid "cannot have both --quiet and --verbose"
msgstr "опциите „--quiet“ и „--verbose“ Ñа неÑъвмеÑтими"
-# FIXME options
#: builtin/check-ignore.c:168
msgid "--non-matching is only valid with --verbose"
msgstr "опциÑта „--non-matching“ изиÑква „--verbose“"
@@ -3633,6 +4171,8 @@ msgid "write the content to temporary files"
msgstr "запиÑване на Ñъдържанието във временни файлове"
#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
msgid "string"
msgstr "ÐИЗ"
@@ -3644,11 +4184,11 @@ msgstr "при Ñъздаването на нови файлове да Ñе дÐ
msgid "copy out the files from named stage"
msgstr "копиране на файловете от това ÑÑŠÑтоÑние на Ñливане"
-#: builtin/checkout.c:24
+#: builtin/checkout.c:25
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [ОПЦИЯ…] КЛОÐ"
-#: builtin/checkout.c:25
+#: builtin/checkout.c:26
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [ОПЦИЯ…] [КЛОÐ] -- ФÐЙЛ…"
@@ -3662,13 +4202,11 @@ msgstr "вашата верÑÐ¸Ñ Ð»Ð¸Ð¿Ñва в Ð¿ÑŠÑ‚Ñ â€ž%s“"
msgid "path '%s' does not have their version"
msgstr "чуждата верÑÐ¸Ñ Ð»Ð¸Ð¿Ñва в Ð¿ÑŠÑ‚Ñ â€ž%s“"
-# FIXME SAME AS [1]
#: builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "нÑÐºÐ¾Ñ Ð¾Ñ‚ необходимите верÑии липÑва в Ð¿ÑŠÑ‚Ñ â€ž%s“"
-# FIXME SAME AS [1]
#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
@@ -3714,46 +4252,46 @@ msgstr "пътÑÑ‚ „%s“ не е ÑлÑÑ‚"
msgid "you need to resolve your current index first"
msgstr "първо Ñ‚Ñ€Ñбва да коригирате индекÑа Ñи"
-#: builtin/checkout.c:627
+#: builtin/checkout.c:623
#, c-format
-msgid "Can not do reflog for '%s'\n"
-msgstr "Журналът на указателите за „%s“ не може да бъде Ñъздаден\n"
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "Журналът на указателите за „%s“ не може да Ñе проÑледи: %s\n"
-#: builtin/checkout.c:663
+#: builtin/checkout.c:661
msgid "HEAD is now at"
msgstr "УказателÑÑ‚ „HEAD“ в момента Ñочи към"
-#: builtin/checkout.c:670
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "ЗанулÑване на клона „%s“\n"
-#: builtin/checkout.c:673
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Вече Ñте на „%s“\n"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Преминаване към клона „%s“ и занулÑване на промените\n"
-#: builtin/checkout.c:679 builtin/checkout.c:1134
+#: builtin/checkout.c:677 builtin/checkout.c:1066
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Преминахте към Ð½Ð¾Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“\n"
-#: builtin/checkout.c:681
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Преминахте към клона „%s“\n"
-#: builtin/checkout.c:733
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr "… и още %d.\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -3775,7 +4313,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:758
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -3802,153 +4340,154 @@ msgstr[1] ""
" git branch ИМЕ_ÐÐ_ÐОВИЯ_КЛОР%s\n"
"\n"
-#: builtin/checkout.c:794
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "вътрешна грешка при обхождането на верÑиите"
-#: builtin/checkout.c:798
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "Преди това „HEAD“ Ñочеше към"
-#: builtin/checkout.c:825 builtin/checkout.c:1129
+#: builtin/checkout.c:823 builtin/checkout.c:1061
msgid "You are on a branch yet to be born"
msgstr "Ð’ момента Ñте на клон, който предÑтои да бъде Ñъздаден"
-#: builtin/checkout.c:931
-#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "„%s“ вече е изтеглен в „%s“"
-
-#: builtin/checkout.c:1036
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "очакваше Ñе един указател, а Ñте подали %d."
-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1007 builtin/worktree.c:213
#, c-format
msgid "invalid reference: %s"
msgstr "неправилен указател: %s"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1036
#, c-format
msgid "reference is not a tree: %s"
msgstr "указателÑÑ‚ не Ñочи към обект-дърво: %s"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1075
msgid "paths cannot be used with switching branches"
msgstr "задаването на път е неÑъвмеÑтимо Ñ Ð¿Ñ€ÐµÐ¼Ð¸Ð½Ð°Ð²Ð°Ð½ÐµÑ‚Ð¾ от един клон към друг"
-#: builtin/checkout.c:1146 builtin/checkout.c:1150
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "опциÑта „%s“ е неÑъвмеÑтима Ñ Ð¿Ñ€ÐµÐ¼Ð¸Ð½Ð°Ð²Ð°Ð½ÐµÑ‚Ð¾ от един клон към друг"
-#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "опциÑта „%s“ е неÑъвмеÑтима Ñ â€ž%s“"
-#: builtin/checkout.c:1170
+#: builtin/checkout.c:1102
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
"За да преминете към клон, подайте указател, който Ñочи към подаване. „%s“ не "
"е такъв"
-#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
-#: builtin/worktree.c:284
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
msgid "branch"
msgstr "клон"
-#: builtin/checkout.c:1204
+#: builtin/checkout.c:1136
msgid "create and checkout a new branch"
msgstr "Ñъздаване и преминаване към нов клон"
-#: builtin/checkout.c:1206
+#: builtin/checkout.c:1138
msgid "create/reset and checkout a branch"
msgstr "Ñъздаване/занулÑване на клон и преминаване към него"
-#: builtin/checkout.c:1207
+#: builtin/checkout.c:1139
msgid "create reflog for new branch"
msgstr "Ñъздаване на журнал на указателите за нов клон"
-#: builtin/checkout.c:1208
+#: builtin/checkout.c:1140
msgid "detach the HEAD at named commit"
msgstr "отделÑне на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ към указаното подаване"
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1141
msgid "set upstream info for new branch"
msgstr "задаване на кой клон бива Ñледен при Ñъздаването на Ð½Ð¾Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1143
msgid "new-branch"
msgstr "ÐОВ_КЛОÐ"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1143
msgid "new unparented branch"
msgstr "нов клон без родител"
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1144
msgid "checkout our version for unmerged files"
msgstr "изтеглÑне на вашата верÑÐ¸Ñ Ð½Ð° неÑлетите файлове"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1146
msgid "checkout their version for unmerged files"
msgstr "изтеглÑне на чуждата верÑÐ¸Ñ Ð½Ð° неÑлетите файлове"
-#: builtin/checkout.c:1216
+#: builtin/checkout.c:1148
msgid "force checkout (throw away local modifications)"
msgstr "принудително изтеглÑне (вашите промени ще бъдат занулени)"
-#: builtin/checkout.c:1217
+#: builtin/checkout.c:1149
msgid "perform a 3-way merge with the new branch"
msgstr "извършване на тройно Ñливане Ñ Ð½Ð¾Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/checkout.c:1218 builtin/merge.c:227
+#: builtin/checkout.c:1150 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr "обновÑване на игнорираните файлове (Ñтандартно)"
-#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
+#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
msgid "style"
msgstr "Ñтил"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1152
msgid "conflict style (merge or diff3)"
msgstr "дейÑтвие при конфликт (Ñливане или тройна разлика)"
-#: builtin/checkout.c:1223
+#: builtin/checkout.c:1155
msgid "do not limit pathspecs to sparse entries only"
msgstr "без ограничаване на изброените пътища Ñамо до чаÑтично изтеглените"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1157
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
"опит за отгатване на име на клон Ñлед неуÑпешен опит Ñ â€žgit checkout "
"ÐЕСЪЩЕСТВУВÐЩ_КЛОГ"
-#: builtin/checkout.c:1227
+#: builtin/checkout.c:1159
msgid "do not check if another worktree is holding the given ref"
msgstr "без проверка дали друго работно дърво държи указателÑ"
-#: builtin/checkout.c:1252
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr "извеждане на напредъка"
+
+#: builtin/checkout.c:1191
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--orphan“ Ñа неÑъвмеÑтими една Ñ Ð´Ñ€ÑƒÐ³Ð°"
-#: builtin/checkout.c:1269
+#: builtin/checkout.c:1208
msgid "--track needs a branch name"
msgstr "опциÑта „--track“ изиÑква име на клон"
-#: builtin/checkout.c:1274
+#: builtin/checkout.c:1213
msgid "Missing branch name; try -b"
msgstr "ЛипÑва име на клон, използвайте опциÑта „-b“"
-#: builtin/checkout.c:1310
+#: builtin/checkout.c:1249
msgid "invalid path specification"
msgstr "указан е неправилен път"
-#: builtin/checkout.c:1317
+#: builtin/checkout.c:1256
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -3957,12 +4496,12 @@ msgstr ""
"Ðе можете едновременно да обновÑвате пътища и да преминете към клона „%s“.\n"
"Дали не иÑкате да изтеглите „%s“, който не Ñочи към подаване?"
-#: builtin/checkout.c:1322
+#: builtin/checkout.c:1261
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: опциÑта „--detach“ не приема аргумент-път „%s“"
-#: builtin/checkout.c:1326
+#: builtin/checkout.c:1265
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -3970,37 +4509,37 @@ msgstr ""
"git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n"
"Ñа неÑъвмеÑтими Ñ Ð¸Ð·Ñ‚ÐµÐ³Ð»Ñне от индекÑа."
-#: builtin/clean.c:26
+#: builtin/clean.c:25
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e ШÐБЛОÐ] [-x | -X] [--] ПЪТ…"
-#: builtin/clean.c:30
+#: builtin/clean.c:29
#, c-format
msgid "Removing %s\n"
msgstr "Изтриване на „%s“\n"
-#: builtin/clean.c:31
+#: builtin/clean.c:30
#, c-format
msgid "Would remove %s\n"
msgstr "Файлът „%s“ ще бъде изтрит\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:31
#, c-format
msgid "Skipping repository %s\n"
msgstr "ПреÑкачане на хранилището „%s“\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:32
#, c-format
msgid "Would skip repository %s\n"
msgstr "Хранилището „%s“ ще бъде преÑкочено\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:33
#, c-format
msgid "failed to remove %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: builtin/clean.c:295
+#: builtin/clean.c:315
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -4012,7 +4551,7 @@ msgstr ""
"ПРЕФИКС — избор на единÑтвен обект по този уникален префикÑ\n"
" — (празно) нищо да не Ñе избира"
-#: builtin/clean.c:299
+#: builtin/clean.c:319
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -4032,39 +4571,38 @@ msgstr ""
"* — избиране на вÑички обекти\n"
" — (празно) завършване на избирането"
-# FIXME WTF does this mean
-#: builtin/clean.c:515
+#: builtin/clean.c:535
#, c-format
msgid "Huh (%s)?"
msgstr "Ðеправилен избор (%s). Изберете отново."
# FIXME - should we use >> or sth else
-#: builtin/clean.c:657
+#: builtin/clean.c:677
#, c-format
msgid "Input ignore patterns>> "
msgstr "Шаблони за игнорирани елементи≫ "
-#: builtin/clean.c:694
+#: builtin/clean.c:714
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕÐИЕ: Ðикой обект не напаÑва на „%s“"
-#: builtin/clean.c:715
+#: builtin/clean.c:735
msgid "Select items to delete"
msgstr "Избиране на обекти за изтриване"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:756
+#: builtin/clean.c:776
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Да Ñе изтрие ли „%s“? „y“ — да, „N“ — ÐЕ"
# FIXME improve message
-#: builtin/clean.c:781
+#: builtin/clean.c:801
msgid "Bye."
msgstr "Изход."
-#: builtin/clean.c:789
+#: builtin/clean.c:809
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -4082,64 +4620,63 @@ msgstr ""
"help — този край\n"
"? — подÑказка за шаблоните"
-# FIXME how many ***
-#: builtin/clean.c:816
+#: builtin/clean.c:836
msgid "*** Commands ***"
msgstr "â—â—◠Команди â—â—â—"
# FIXME improve message
-#: builtin/clean.c:817
+#: builtin/clean.c:837
msgid "What now"
msgstr "Избор на Ñледващо дейÑтвие"
-#: builtin/clean.c:825
+#: builtin/clean.c:845
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "СледниÑÑ‚ обект ще бъде изтрит:"
msgstr[1] "Следните обекти ще бъдат изтрити:"
-#: builtin/clean.c:842
+#: builtin/clean.c:862
msgid "No more files to clean, exiting."
msgstr "Файловете за изчиÑтване Ñвършиха. Изход от програмата."
-#: builtin/clean.c:873
+#: builtin/clean.c:893
msgid "do not print names of files removed"
msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
-#: builtin/clean.c:875
+#: builtin/clean.c:895
msgid "force"
msgstr "принудително изтриване"
-#: builtin/clean.c:876
+#: builtin/clean.c:896
msgid "interactive cleaning"
msgstr "интерактивно изтриване"
-#: builtin/clean.c:878
+#: builtin/clean.c:898
msgid "remove whole directories"
msgstr "изтриване на цели директории"
-#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
msgid "pattern"
msgstr "шаблон"
-#: builtin/clean.c:880
+#: builtin/clean.c:900
msgid "add <pattern> to ignore rules"
msgstr "добавÑне на ШÐБЛОРот файлове, които да не Ñе триÑÑ‚"
-#: builtin/clean.c:881
+#: builtin/clean.c:901
msgid "remove ignored files, too"
msgstr "изтриване и на игнорираните файлове"
-#: builtin/clean.c:883
+#: builtin/clean.c:903
msgid "remove only ignored files"
msgstr "изтриване Ñамо на игнорирани файлове"
-#: builtin/clean.c:901
+#: builtin/clean.c:921
msgid "-x and -X cannot be used together"
msgstr "опциите „-x“ и „-X“ Ñа неÑъвмеÑтими"
-#: builtin/clean.c:905
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -4147,7 +4684,7 @@ msgstr ""
"ÐаÑтройката „clean.requireForce“ е зададена като иÑтина, което изиÑква нÑÐºÐ¾Ñ "
"от опциите „-i“, „-n“ или „-f“. ÐÑма да Ñе извърши изчиÑтване"
-#: builtin/clean.c:908
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -4160,16 +4697,11 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [ОПЦИЯ…] [--] ХРÐÐИЛИЩЕ [ДИРЕКТОРИЯ]"
-#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
-#: builtin/push.c:523
-msgid "force progress reporting"
-msgstr "извеждане на напредъка"
-
#: builtin/clone.c:59
msgid "don't create a checkout"
msgstr "без Ñъздаване на работно дърво"
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
msgid "create a bare repository"
msgstr "Ñъздаване на голо хранилище"
@@ -4194,15 +4726,15 @@ msgstr "наÑтройване за Ñподелено хранилище"
msgid "initialize submodules in the clone"
msgstr "инициализиране на подмодулите при това клониране"
-#: builtin/clone.c:75 builtin/init-db.c:500
+#: builtin/clone.c:75 builtin/init-db.c:466
msgid "template-directory"
msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¸"
-#: builtin/clone.c:76 builtin/init-db.c:501
+#: builtin/clone.c:76 builtin/init-db.c:467
msgid "directory from which templates will be used"
msgstr "директориÑ, коÑто Ñъдържа шаблоните, които да Ñе ползват"
-#: builtin/clone.c:78
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
msgid "reference repository"
msgstr "еталонно хранилище"
@@ -4226,7 +4758,7 @@ msgstr "изтеглÑне на този КЛОÐ, а не ÑочениÑÑ‚ от
msgid "path to git-upload-pack on the remote"
msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
-#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186
msgid "depth"
msgstr "ДЪЛБОЧИÐÐ"
@@ -4240,11 +4772,11 @@ msgstr ""
"клониране Ñамо на един клон — или ÑÐ¾Ñ‡ÐµÐ½Ð¸Ñ Ð¾Ñ‚ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ â€žHEAD“, или изрично "
"Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ â€ž--branch“"
-#: builtin/clone.c:91 builtin/init-db.c:509
+#: builtin/clone.c:91 builtin/init-db.c:475
msgid "gitdir"
msgstr "СЛУЖЕБÐÐ_ДИРЕКТОРИЯ"
-#: builtin/clone.c:92 builtin/init-db.c:510
+#: builtin/clone.c:92 builtin/init-db.c:476
msgid "separate git dir from working tree"
msgstr "отделна СЛУЖЕБÐÐ_ДИРЕКТОРИЯ за git извън работното дърво"
@@ -4256,57 +4788,57 @@ msgstr "КЛЮЧ=СТОЙÐОСТ"
msgid "set config inside the new repository"
msgstr "задаване на наÑтройките на новото хранилище"
-#: builtin/clone.c:240
+#: builtin/clone.c:300
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "вÑе още не Ñе поддържа еталонно хранилище „%s“ като Ñвързано."
+
+#: builtin/clone.c:302
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "еталонното хранилище „%s“ не е локално"
-#: builtin/clone.c:244
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "еталонното хранилище „%s“ е плитко"
-#: builtin/clone.c:247
+#: builtin/clone.c:310
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "еталонното хранилище „%s“ е Ñ Ð¿Ñ€Ð¸Ñаждане"
-#: builtin/clone.c:310
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "директориÑта „%s“ не може да бъде Ñъздадена"
-
-#: builtin/clone.c:312 builtin/diff.c:84
+#: builtin/clone.c:375 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "не може да бъде получена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%s“"
-#: builtin/clone.c:314
+#: builtin/clone.c:377
#, c-format
msgid "%s exists and is not a directory"
msgstr "„%s“ ÑъщеÑтвува и не е директориÑ"
-#: builtin/clone.c:328
+#: builtin/clone.c:391
#, c-format
msgid "failed to stat %s\n"
msgstr "не може да бъде получена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%s“\n"
-#: builtin/clone.c:350
+#: builtin/clone.c:413
#, c-format
msgid "failed to create link '%s'"
msgstr "връзката „%s“ не може да бъде Ñъздадена"
-#: builtin/clone.c:354
+#: builtin/clone.c:417
#, c-format
msgid "failed to copy file to '%s'"
msgstr "файлът не може да бъде копиран като „%s“"
-#: builtin/clone.c:377 builtin/clone.c:551
+#: builtin/clone.c:442 builtin/clone.c:626
#, c-format
msgid "done.\n"
msgstr "дейÑтвието завърши.\n"
-#: builtin/clone.c:389
+#: builtin/clone.c:454
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4317,7 +4849,7 @@ msgstr ""
"клон в момента Ñа изтеглени Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git status“. Можете да\n"
"завършите изтеглÑнето на клона Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git checkout -f HEAD“.\n"
-#: builtin/clone.c:466
+#: builtin/clone.c:531
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
@@ -4325,120 +4857,116 @@ msgstr ""
"и който Ñледва да бъде изтеглен, не ÑъщеÑтвува."
# FIXME translator note that the space at end is necesssary
-#: builtin/clone.c:546
+#: builtin/clone.c:621
#, c-format
msgid "Checking connectivity... "
msgstr "Проверка на връзката… "
-#: builtin/clone.c:549
+#: builtin/clone.c:624
msgid "remote did not send all necessary objects"
msgstr "отдалеченото хранилище не изпрати вÑички необходими обекти."
-#: builtin/clone.c:613
+#: builtin/clone.c:688
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"указателÑÑ‚ „HEAD“ от отдалеченото хранилище Ñочи към нещо,\n"
"което не ÑъщеÑтвува. Ðе може да Ñе изтегли определен клон.\n"
-#: builtin/clone.c:644
+#: builtin/clone.c:719
msgid "unable to checkout working tree"
msgstr "работното дърво не може да бъде подготвено"
-#: builtin/clone.c:731
+#: builtin/clone.c:808
msgid "cannot repack to clean up"
msgstr "не може да Ñе извърши пакетиране за изчиÑтване на файловете"
-#: builtin/clone.c:733
+#: builtin/clone.c:810
msgid "cannot unlink temporary alternates file"
msgstr "временниÑÑ‚ файл за алтернативни обекти не може да бъде изтрит"
-#: builtin/clone.c:763
+#: builtin/clone.c:842
msgid "Too many arguments."
msgstr "Прекалено много аргументи."
-#: builtin/clone.c:767
+#: builtin/clone.c:846
msgid "You must specify a repository to clone."
msgstr "ТрÑбва да укажете кое хранилище иÑкате да клонирате."
-#: builtin/clone.c:778
+#: builtin/clone.c:857
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "опциите „--bare“ и „--origin %s“ Ñа неÑъвмеÑтими."
-#: builtin/clone.c:781
+#: builtin/clone.c:860
msgid "--bare and --separate-git-dir are incompatible."
msgstr "опциите „--bare“ и „--separate-git-dir“ Ñа неÑъвмеÑтими."
-#: builtin/clone.c:794
+#: builtin/clone.c:873
#, c-format
msgid "repository '%s' does not exist"
msgstr "не ÑъщеÑтвува хранилище „%s“"
-#: builtin/clone.c:800 builtin/fetch.c:1160
+#: builtin/clone.c:879 builtin/fetch.c:1166
#, c-format
msgid "depth %s is not a positive number"
msgstr "дълбочината Ñ‚Ñ€Ñбва да е положително цÑло чиÑло, а не „%s“"
-#: builtin/clone.c:810
+#: builtin/clone.c:889
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевиÑÑ‚ път „%s“ ÑъщеÑтвува и не е празна директориÑ."
-#: builtin/clone.c:820
+#: builtin/clone.c:899
#, c-format
msgid "working tree '%s' already exists."
msgstr "в „%s“ вече ÑъщеÑтвува работно дърво."
-#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
-#: builtin/worktree.c:220
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "родителÑките директории на „%s“ не могат да бъдат Ñъздадени"
-#: builtin/clone.c:838
+#: builtin/clone.c:917
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "работното дърво в „%s“ не може да бъде Ñъздадено."
-#: builtin/clone.c:856
+#: builtin/clone.c:935
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клониране и Ñъздаване на голо хранилище в „%s“…\n"
-#: builtin/clone.c:858
+#: builtin/clone.c:937
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клониране и Ñъздаване на хранилище в „%s“…\n"
-#: builtin/clone.c:883
-msgid "--dissociate given, but there is no --reference"
-msgstr "ОпциÑта „--dissociate“ е неÑъвмеÑтима Ñ â€ž--reference“"
-
-#: builtin/clone.c:900
+#: builtin/clone.c:975
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опциÑта „--depth“ Ñе игнорира. Ползвайте Ñхемата "
"„file://“."
-#: builtin/clone.c:903
+#: builtin/clone.c:978
msgid "source repository is shallow, ignoring --local"
msgstr "клонираното хранилище е плитко, затова опциÑта „--local“ Ñе игнорира"
-#: builtin/clone.c:908
+#: builtin/clone.c:983
msgid "--local is ignored"
msgstr "опциÑта „--local“ Ñе игнорира"
-#: builtin/clone.c:912
+#: builtin/clone.c:987
#, c-format
msgid "Don't know how to clone %s"
msgstr "Ðе Ñе поддържа клониране на връзки от вида „%s“ "
-#: builtin/clone.c:961 builtin/clone.c:969
+#: builtin/clone.c:1036 builtin/clone.c:1044
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "ОтдалечениÑÑ‚ клон „%s“ липÑва в клонираното хранилище „%s“"
-#: builtin/clone.c:972
+#: builtin/clone.c:1047
msgid "You appear to have cloned an empty repository."
msgstr "Изглежда клонирахте празно хранилище."
@@ -4474,15 +5002,15 @@ msgstr "Поле в знаци между колоните"
msgid "--command must be the first argument"
msgstr "опциÑта „--command“ Ñ‚Ñ€Ñбва да е първиÑÑ‚ аргумент"
-#: builtin/commit.c:37
+#: builtin/commit.c:38
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4510,7 +5038,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:60
+#: builtin/commit.c:61
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4535,7 +5063,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
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"
@@ -4547,7 +5075,7 @@ msgstr ""
"Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--allow-empty“, или да го изтриете от иÑториÑта Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð°:\n"
"„git reset HEAD^“.\n"
-#: builtin/commit.c:77
+#: builtin/commit.c:78
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4562,11 +5090,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:84
+#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
msgstr "Ð’ противен Ñлучай използвайте командата „git reset“\n"
-#: builtin/commit.c:87
+#: builtin/commit.c:88
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4582,31 +5110,27 @@ msgstr ""
"Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n"
"оÑтаналите подаваниÑ.\n"
-#: builtin/commit.c:304
+#: builtin/commit.c:305
msgid "failed to unpack HEAD tree object"
msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
-#: builtin/commit.c:344
+#: builtin/commit.c:346
msgid "unable to create temporary index"
msgstr "временниÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде Ñъздаден"
-#: builtin/commit.c:350
+#: builtin/commit.c:352
msgid "interactive add failed"
msgstr "неуÑпешно интерактивно добавÑне"
-#: builtin/commit.c:361
-msgid "unable to write index file"
-msgstr "индекÑÑŠÑ‚ не може да бъде запиÑан"
-
-#: builtin/commit.c:363
+#: builtin/commit.c:365
msgid "unable to update temporary index"
msgstr "временниÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде обновен"
-#: builtin/commit.c:365
+#: builtin/commit.c:367
msgid "Failed to update main cache tree"
msgstr "Дървото на оÑÐ½Ð¾Ð²Ð½Ð¸Ñ ÐºÐµÑˆ не може да бъде обновено"
-#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr "новиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запиÑан"
@@ -4680,11 +5204,6 @@ msgstr "Ñъобщението за Ñливане MERGE_MSG не може да
msgid "could not read SQUASH_MSG"
msgstr "Ñъобщението за Ñмачкване SQUASH_MSG не може да бъде прочетено"
-#: builtin/commit.c:738 builtin/merge.c:1079
-#, c-format
-msgid "could not read '%s'"
-msgstr "файлът „%s“ не може да бъде прочетен"
-
#: builtin/commit.c:785
msgid "could not write commit template"
msgstr "шаблонът за подаване не може да бъде запазен"
@@ -4765,7 +5284,7 @@ msgstr "ИндекÑÑŠÑ‚ не може да бъде прочетен"
msgid "Error building trees"
msgstr "Грешка при изграждане на дърветата"
-#: builtin/commit.c:953 builtin/tag.c:495
+#: builtin/commit.c:953 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Подайте Ñъобщението Ñ Ð½ÑÐºÐ¾Ñ Ð¾Ñ‚ опциите „-m“ или „-F“.\n"
@@ -4846,7 +5365,7 @@ msgstr ""
"Ñте\n"
"ползвали опциÑта „--only“ Ñ ÐŸÐªÐ¢Ð¸Ñ‰Ð°â€¦"
-#: builtin/commit.c:1209 builtin/tag.c:728
+#: builtin/commit.c:1209 builtin/tag.c:475
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "ÐеÑъщеÑтвуващ режим на изчиÑтване „%s“"
@@ -4855,32 +5374,33 @@ msgstr "ÐеÑъщеÑтвуващ режим на изчиÑтване „%s“
msgid "Paths with -a does not make sense."
msgstr "ОпциÑта „-a“ е неÑъвмеÑтима ÑÑŠÑ Ð·Ð°Ð´Ð°Ð²Ð°Ð½ÐµÑ‚Ð¾ на пътища."
-#: builtin/commit.c:1324 builtin/commit.c:1603
+#: builtin/commit.c:1324 builtin/commit.c:1605
msgid "show status concisely"
msgstr "кратка Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° ÑÑŠÑтоÑнието"
-#: builtin/commit.c:1326 builtin/commit.c:1605
+#: builtin/commit.c:1326 builtin/commit.c:1607
msgid "show branch information"
msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° клоните"
-#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
+#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "формат на изхода за четене от програма"
-#: builtin/commit.c:1331 builtin/commit.c:1609
+#: builtin/commit.c:1331 builtin/commit.c:1611
msgid "show status in long format (default)"
msgstr "подробна Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° ÑÑŠÑтоÑнието (Ñтандартно)"
-#: builtin/commit.c:1334 builtin/commit.c:1612
+#: builtin/commit.c:1334 builtin/commit.c:1614
msgid "terminate entries with NUL"
msgstr "разделÑне на елементите Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“"
-#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
-#: builtin/fast-export.c:983 builtin/tag.c:603
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "режим"
-#: builtin/commit.c:1337 builtin/commit.c:1615
+#: builtin/commit.c:1337 builtin/commit.c:1617
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"извеждане на неÑледените файлове. Възможните режими Ñа „all“ (подробна\n"
@@ -4891,7 +5411,7 @@ msgstr ""
msgid "show ignored files"
msgstr "извеждане на игнорираните файлове"
-#: builtin/commit.c:1341 parse-options.h:152
+#: builtin/commit.c:1341 parse-options.h:155
msgid "when"
msgstr "кога"
@@ -4924,193 +5444,185 @@ msgstr "неÑвързан връх „HEAD“"
msgid " (root-commit)"
msgstr " (начално подаване)"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1575
msgid "suppress summary after successful commit"
msgstr "без Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñлед уÑпешно подаване"
-#: builtin/commit.c:1574
+#: builtin/commit.c:1576
msgid "show diff in commit message template"
msgstr "добавÑне на разликата към шаблона за Ñъобщението при подаване"
-#: builtin/commit.c:1576
+#: builtin/commit.c:1578
msgid "Commit message options"
msgstr "Опции за Ñъобщението при подаване"
-#: builtin/commit.c:1577 builtin/tag.c:601
+#: builtin/commit.c:1579 builtin/tag.c:351
msgid "read message from file"
msgstr "взимане на Ñъобщението от файл"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1580
msgid "author"
msgstr "автор"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1580
msgid "override author for commit"
msgstr "задаване на автор за подаването"
-#: builtin/commit.c:1579 builtin/gc.c:280
+#: builtin/commit.c:1581 builtin/gc.c:326
msgid "date"
msgstr "дата"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1581
msgid "override date for commit"
msgstr "задаване на дата за подаването"
-#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
-#: builtin/notes.c:554 builtin/tag.c:599
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
msgid "message"
msgstr "Ñъобщение"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1582
msgid "commit message"
msgstr "Ñъобщение при подаване"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr "подаване"
+
+#: builtin/commit.c:1583
msgid "reuse and edit message from specified commit"
msgstr "преизползване и редактиране на Ñъобщението от указаното подаване"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1584
msgid "reuse message from specified commit"
msgstr "преизползване на Ñъобщението от указаното подаване"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1585
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"използване на автоматичното Ñъобщение при Ñмачкване за вкарване на "
"указаното\n"
"подаване в предното без Ñледа"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1586
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"използване на автоматичното Ñъобщение при Ñмачкване за Ñмачкване на "
"указаното\n"
"подаване в предното"
-#: builtin/commit.c:1585
+#: builtin/commit.c:1587
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"ÑмÑна на автора да Ñъвпада Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ñ‰Ð¸Ñ (използва Ñе Ñ â€ž-C“/„-c“/„--amend“)"
-#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "добавÑне на поле за Ð¿Ð¾Ð´Ð¿Ð¸Ñ â€” „Signed-off-by:“"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1589
msgid "use specified template file"
msgstr "използване на ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½ÐµÐ½ файл"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1590
msgid "force edit of commit"
msgstr "редактиране на подаване"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1591
msgid "default"
msgstr "Ñтандартно"
-#: builtin/commit.c:1589 builtin/tag.c:604
+#: builtin/commit.c:1591 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "кои празни знаци и #коментари да Ñе махат от ÑъобщениÑта"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1592
msgid "include status in commit message template"
msgstr "вмъкване на ÑÑŠÑтоÑнието в шаблона за Ñъобщението при подаване"
-#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92
-#: builtin/tag.c:605
-msgid "key-id"
-msgstr "ИДЕÐТИФИКÐТОР_ÐÐ_КЛЮЧ"
-
-#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "подпиÑване на подаването Ñ GPG"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1597
msgid "Commit contents options"
msgstr "Опции за избор на файлове при подаване"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1598
msgid "commit all changed files"
msgstr "подаване на вÑички променени файлове"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1599
msgid "add specified files to index for commit"
msgstr "добавÑне на указаните файлове към индекÑа за подаване"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1600
msgid "interactively add files"
msgstr "интерактивно добавÑне на файлове"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1601
msgid "interactively add changes"
msgstr "интерактивно добавÑне на промени"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1602
msgid "commit only specified files"
msgstr "подаване Ñамо на указаните файлове"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1603
msgid "bypass pre-commit hook"
msgstr "без изпълнение на куката преди подаване (pre-commit)"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1604
msgid "show what would be committed"
msgstr "отпечатване на това, което би било подадено"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1615
msgid "amend previous commit"
msgstr "поправÑне на предишното подаване"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1616
msgid "bypass post-rewrite hook"
msgstr "без изпълнение на куката Ñлед презапиÑване (post-rewrite)"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1621
msgid "ok to record an empty change"
msgstr "позволÑване на празни подаваниÑ"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1623
msgid "ok to record a change with an empty message"
msgstr "позволÑване на Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ñ Ð¿Ñ€Ð°Ð·Ð½Ð¸ ÑъобщениÑ"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "could not parse HEAD commit"
msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-#: builtin/commit.c:1689 builtin/merge.c:1076
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "файлът не може да бъде прочетен: „%s“"
-
-#: builtin/commit.c:1696
+#: builtin/commit.c:1698
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Повреден файл за върха за Ñливането „MERGE_HEAD“ (%s)"
-#: builtin/commit.c:1703
+#: builtin/commit.c:1705
msgid "could not read MERGE_MODE"
msgstr "режимът на Ñливане „MERGE_MODE“ не може да бъде прочетен"
-#: builtin/commit.c:1722
+#: builtin/commit.c:1724
#, c-format
msgid "could not read commit message: %s"
msgstr "Ñъобщението за подаване не може да бъде прочетено: %s"
-#: builtin/commit.c:1733
+#: builtin/commit.c:1735
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Ðеизвършване на подаване поради нередактирано Ñъобщение.\n"
-#: builtin/commit.c:1738
+#: builtin/commit.c:1740
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Ðеизвършване на подаване поради празно Ñъобщение.\n"
-#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854
-msgid "failed to write commit object"
-msgstr "обектът за подаването не може да бъде запиÑан"
-
-#: builtin/commit.c:1786
+#: builtin/commit.c:1788
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5124,137 +5636,141 @@ msgstr ""
msgid "git config [<options>]"
msgstr "git config [ОПЦИЯ…]"
-#: builtin/config.c:53
+#: builtin/config.c:54
msgid "Config file location"
msgstr "МеÑтоположение на ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»"
-#: builtin/config.c:54
+#: builtin/config.c:55
msgid "use global config file"
msgstr "използване на Ð³Ð»Ð¾Ð±Ð°Ð»Ð½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½ÐµÐ½ файл"
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "use system config file"
msgstr "използване на ÑиÑÑ‚ÐµÐ¼Ð½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½ÐµÐ½ файл"
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use repository config file"
msgstr "използване на ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» на хранилището"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use given config file"
msgstr "използване на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½ÐµÐ½ файл"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "blob-id"
msgstr "идентификатор на BLOB"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "read config from given blob object"
msgstr ""
"изчитане на конфигурациÑта от BLOB Ñ Ñ‚Ð¾Ð·Ð¸ идентификатор на Ñъдържанието"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "Action"
msgstr "ДейÑтвие"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "get value: name [value-regex]"
msgstr "извеждане на ÑтойноÑÑ‚: ИМЕ [РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_СТОЙÐОСТТÐ]"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "get all values: key [value-regex]"
msgstr "извеждане на вÑички ÑтойноÑти: ключ [РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_СТОЙÐОСТТÐ]"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
"извеждане на ÑтойноÑтите за РЕГУЛЯРÐиÑ_ИЗРÐЗ: РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_ИМЕТО "
"[РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_СТОЙÐОСТТÐ]"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "get value specific for the URL: section[.var] URL"
msgstr "извеждане на ÑтойноÑтта за ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð°Ð´Ñ€ÐµÑ: РÐЗДЕЛ[.ПРОМЕÐЛИВÐ] ÐДРЕС"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"замÑна на вÑички Ñъвпадащи променливи: ИМЕ СТОЙÐОСТ "
"[РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_СТОЙÐОСТТÐ]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "add a new variable: name value"
msgstr "добавÑне на нова променлива: ИМЕ СТОЙÐОСТ"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "remove a variable: name [value-regex]"
msgstr "изтриване на променлива: ИМЕ [РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_СТОЙÐОСТТÐ]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "remove all matches: name [value-regex]"
msgstr "изтриване на вÑички Ñъвпадащи: ИМЕ [РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_СТОЙÐОСТТÐ]"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "rename section: old-name new-name"
msgstr "преименуване на раздел: СТÐРО_ИМЕ ÐОВО_ИМЕ"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove a section: name"
msgstr "изтриване на раздел: ИМЕ"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "list all"
msgstr "изброÑване на вÑички"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "open an editor"
msgstr "отварÑне на редактор"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "find the color configured: slot [default]"
msgstr "извеждане на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ†Ð²ÑÑ‚: номер [Ñтандартно]"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "извеждане на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ†Ð²ÑÑ‚: номер [ÑтандартниÑÑ‚ изход е терминал]"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "Type"
msgstr "Вид"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "value is \"true\" or \"false\""
msgstr "СТОЙÐОСТТРе „true“ (иÑтина) или „false“ (лъжа)"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "value is decimal number"
msgstr "СТОЙÐОСТТРе цÑло, деÑетично чиÑло"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is --bool or --int"
msgstr "СТОЙÐОСТТРе „--bool“ (булева) или „--int“ (деÑетично цÑло чиÑло)"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is a path (file or directory name)"
msgstr "СТОЙÐОСТТРе път (до файл или директориÑ)"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "Other"
msgstr "Други"
# FIXME NUL byte to null char, terminate -> razdelitel - da stane ednakvo
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "terminate values with NUL byte"
msgstr "разделÑне на ÑтойноÑтите Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“"
-#: builtin/config.c:81
+#: builtin/config.c:82
+msgid "show variable names only"
+msgstr "извеждане на имената на променливите"
+
+#: builtin/config.c:83
msgid "respect include directives on lookup"
msgstr "при Ñ‚ÑŠÑ€Ñене да Ñе уважат и директивите за включване"
-#: builtin/config.c:316
+#: builtin/config.c:303
msgid "unable to parse default color value"
msgstr "неразпозната ÑтойноÑÑ‚ на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ñ†Ð²ÑÑ‚"
-#: builtin/config.c:457
+#: builtin/config.c:441
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5269,16 +5785,16 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:587
+#: builtin/config.c:575
#, c-format
msgid "cannot create configuration file %s"
msgstr "конфигурационниÑÑ‚ файл „%s“ не може да бъде Ñъздаден"
-#: builtin/count-objects.c:55
+#: builtin/count-objects.c:77
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:65
+#: builtin/count-objects.c:87
msgid "print sizes in human readable format"
msgstr "извеждане на размерите на обектите във формат леÑно четим от хора"
@@ -5306,7 +5822,7 @@ msgstr "в Ð°Ð½Ð¾Ñ‚Ð¸Ñ€Ð°Ð½Ð¸Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚ „%s“ липÑва вградеÐ
msgid "tag '%s' is really '%s' here"
msgstr "етикетът „%s“ тук е вÑъщноÑÑ‚ „%s“"
-#: builtin/describe.c:250 builtin/log.c:452
+#: builtin/describe.c:250 builtin/log.c:459
#, c-format
msgid "Not a valid object name %s"
msgstr "Ðеправилно име на обект „%s“"
@@ -5402,7 +5918,7 @@ msgstr "да Ñе Ñ‚ÑŠÑ€Ñи Ñамо в този БРОЙ поÑледни ет
msgid "only consider tags matching <pattern>"
msgstr "да Ñе Ñ‚ÑŠÑ€Ñи Ñамо измежду етикетите напаÑващи този ШÐБЛОÐ"
-#: builtin/describe.c:410 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:314
msgid "show abbreviated commit object as fallback"
msgstr "извеждане на Ñъкратено име на обект като резервен вариант"
@@ -5448,239 +5964,239 @@ msgstr "зададен е неправилен обект „%s“."
#: builtin/diff.c:410
#, c-format
msgid "more than two blobs given: '%s'"
-msgstr "зададени Ñа повече от 2 обекта: „%s“"
+msgstr "зададени Ñа повече от 2 обекта BLOB: „%s“"
#: builtin/diff.c:417
#, c-format
msgid "unhandled object '%s' given."
msgstr "зададен е неподдържан обект „%s“."
-#: builtin/fast-export.c:24
+#: builtin/fast-export.c:25
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [ОПЦИИ_ЗÐ_СПИСЪКÐ_С_ВЕРСИИ]"
-#: builtin/fast-export.c:979
+#: builtin/fast-export.c:980
msgid "show progress after <n> objects"
msgstr "Съобщение за напредъка на вÑеки такъв БРОЙ обекта"
-#: builtin/fast-export.c:981
+#: builtin/fast-export.c:982
msgid "select handling of signed tags"
msgstr "Как да Ñе обработват подпиÑаните етикети"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:985
msgid "select handling of tags that tag filtered objects"
msgstr "Как да Ñе обработват етикетите на филтрираните обекти"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:988
msgid "Dump marks to this file"
msgstr "Запазване на маркерите в този файл"
-#: builtin/fast-export.c:989
+#: builtin/fast-export.c:990
msgid "Import marks from this file"
msgstr "ВнаÑÑне на маркерите от този файл"
-#: builtin/fast-export.c:991
+#: builtin/fast-export.c:992
msgid "Fake a tagger when tags lack one"
msgstr "Да Ñе използва изкуÑтвено име на човек при липÑа на задаващ етикета"
-#: builtin/fast-export.c:993
+#: builtin/fast-export.c:994
msgid "Output full tree for each commit"
msgstr "Извеждане на цÑлото дърво за вÑÑко подаване"
-#: builtin/fast-export.c:995
+#: builtin/fast-export.c:996
msgid "Use the done feature to terminate the stream"
msgstr "Използване на маркер за завършване на потока"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:997
msgid "Skip output of blob data"
msgstr "Без извеждане на Ñъдържанието на обектите BLOB"
-#: builtin/fast-export.c:997
+#: builtin/fast-export.c:998
msgid "refspec"
msgstr "указател на верÑиÑ"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:999
msgid "Apply refspec to exported refs"
msgstr "Прилагане на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° верÑÐ¸Ñ ÐºÑŠÐ¼ изнеÑените указатели"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1000
msgid "anonymize output"
msgstr "анонимизиране на извежданата информациÑ"
-#: builtin/fetch.c:19
+#: builtin/fetch.c:20
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [ОПЦИЯ…] [ХРÐÐИЛИЩЕ [УКÐЗÐТЕЛ…]]"
-#: builtin/fetch.c:20
+#: builtin/fetch.c:21
msgid "git fetch [<options>] <group>"
msgstr "git fetch [ОПЦИЯ…] ГРУПÐ"
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРÐÐИЛИЩЕ | ГРУПÐ)…]"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [ОПЦИЯ…]"
-#: builtin/fetch.c:89
+#: builtin/fetch.c:90 builtin/pull.c:162
msgid "fetch from all remotes"
msgstr "доÑтавÑне от вÑички отдалечени хранилища"
-#: builtin/fetch.c:91
+#: builtin/fetch.c:92 builtin/pull.c:165
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "добавÑне към „.git/FETCH_HEAD“ вмеÑто замÑна"
-#: builtin/fetch.c:93
+#: builtin/fetch.c:94 builtin/pull.c:168
msgid "path to upload pack on remote end"
msgstr "отдалечен път, където да Ñе качи пакетът"
-#: builtin/fetch.c:94
+#: builtin/fetch.c:95 builtin/pull.c:170
msgid "force overwrite of local branch"
msgstr "принудително презапиÑване на Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/fetch.c:96
+#: builtin/fetch.c:97
msgid "fetch from multiple remotes"
msgstr "доÑтавÑне от множеÑтво отдалечени хранилища"
-#: builtin/fetch.c:98
+#: builtin/fetch.c:99 builtin/pull.c:172
msgid "fetch all tags and associated objects"
msgstr "доÑтавÑне на вÑички етикети и принадлежащи обекти"
-#: builtin/fetch.c:100
+#: builtin/fetch.c:101
msgid "do not fetch all tags (--no-tags)"
msgstr "без доÑтавÑнето на вÑички етикети „--no-tags“"
-#: builtin/fetch.c:102
+#: builtin/fetch.c:103 builtin/pull.c:175
msgid "prune remote-tracking branches no longer on remote"
msgstr "окаÑÑ‚Ñ€Ñне на клоните ÑледÑщи вече неÑъщеÑтвуващи отдалечени клони"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:104 builtin/pull.c:178
msgid "on-demand"
msgstr "при нужда"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:105 builtin/pull.c:179
msgid "control recursive fetching of submodules"
msgstr "управление на рекурÑивното доÑтавÑне на подмодулите"
-#: builtin/fetch.c:108
+#: builtin/fetch.c:109 builtin/pull.c:184
msgid "keep downloaded pack"
msgstr "запазване на изтеглените пакети Ñ Ð¾Ð±ÐµÐºÑ‚Ð¸"
-#: builtin/fetch.c:110
+#: builtin/fetch.c:111
msgid "allow updating of HEAD ref"
msgstr "позволÑване на обновÑването на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:114 builtin/pull.c:187
msgid "deepen history of shallow clone"
msgstr "задълбочаване на иÑториÑта на плитко хранилище"
-#: builtin/fetch.c:115
+#: builtin/fetch.c:116 builtin/pull.c:190
msgid "convert to a complete repository"
msgstr "превръщане в пълно хранилище"
-#: builtin/fetch.c:117 builtin/log.c:1208
+#: builtin/fetch.c:118 builtin/log.c:1233
msgid "dir"
msgstr "директориÑ"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:119
msgid "prepend this to submodule path output"
msgstr "добавÑне на това пред Ð¿ÑŠÑ‚Ñ Ð½Ð° подмодула"
-#: builtin/fetch.c:121
+#: builtin/fetch.c:122
msgid "default mode for recursion"
msgstr "Ñтандартен режим на рекурÑиÑ"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:124 builtin/pull.c:193
msgid "accept refs that update .git/shallow"
msgstr "приемане на указатели, които обновÑват „.git/shallow“"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:125 builtin/pull.c:195
msgid "refmap"
msgstr "карта Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ð¸"
-#: builtin/fetch.c:125
+#: builtin/fetch.c:126 builtin/pull.c:196
msgid "specify fetch refmap"
msgstr "указване на картата Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ð¸ за доÑтавÑне"
-#: builtin/fetch.c:377
+#: builtin/fetch.c:378
msgid "Couldn't find remote ref HEAD"
msgstr "УказателÑÑ‚ „HEAD“ в отдалеченото хранилище не може да бъде открит"
-#: builtin/fetch.c:457
+#: builtin/fetch.c:458
#, c-format
msgid "object %s not found"
msgstr "обектът „%s“ липÑва"
-#: builtin/fetch.c:462
+#: builtin/fetch.c:463
msgid "[up to date]"
msgstr "[актуализиран]"
-#: builtin/fetch.c:476
+#: builtin/fetch.c:477
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s → %s (в Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ не може да Ñе доÑтавÑ)"
-#: builtin/fetch.c:477 builtin/fetch.c:563
+#: builtin/fetch.c:478 builtin/fetch.c:566
msgid "[rejected]"
msgstr "[отхвърлен]"
-#: builtin/fetch.c:488
+#: builtin/fetch.c:489
msgid "[tag update]"
msgstr "[обновÑване на етикетите]"
-#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
+#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
msgid " (unable to update local ref)"
msgstr " (локалните указатели не могат да бъдат обновени)"
-#: builtin/fetch.c:508
+#: builtin/fetch.c:509
msgid "[new tag]"
msgstr "[нов етикет]"
-#: builtin/fetch.c:511
+#: builtin/fetch.c:512
msgid "[new branch]"
msgstr "[нов клон]"
-#: builtin/fetch.c:514
+#: builtin/fetch.c:515
msgid "[new ref]"
msgstr "[нов указател]"
-#: builtin/fetch.c:559
+#: builtin/fetch.c:561
msgid "unable to update local ref"
msgstr "локален указател не може да бъде обновен"
-#: builtin/fetch.c:559
+#: builtin/fetch.c:561
msgid "forced update"
msgstr "принудително обновÑване"
-#: builtin/fetch.c:565
+#: builtin/fetch.c:568
msgid "(non-fast-forward)"
msgstr "(Ñливането не е тривиално)"
-#: builtin/fetch.c:599 builtin/fetch.c:832
+#: builtin/fetch.c:602 builtin/fetch.c:843
#, c-format
msgid "cannot open %s: %s\n"
msgstr "файлът „%s“ не може да бъде отворен: %s\n"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:611
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати вÑички необходими обекти\n"
-#: builtin/fetch.c:626
+#: builtin/fetch.c:629
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"отхвърлÑне на върха „%s“, защото плитките хранилища не могат да бъдат "
"обновÑвани"
-#: builtin/fetch.c:714 builtin/fetch.c:797
+#: builtin/fetch.c:716 builtin/fetch.c:808
#, c-format
msgid "From %.*s\n"
msgstr "От %.*s\n"
# FIXME - is the space necessary
-#: builtin/fetch.c:725
+#: builtin/fetch.c:727
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -5690,55 +6206,55 @@ msgstr ""
"„git remote prune %s“, за да премахнете оÑтарелите клони, които\n"
"предизвикват конфликта"
-#: builtin/fetch.c:777
+#: builtin/fetch.c:779
#, c-format
msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще Ñе окаже извън клон)"
-#: builtin/fetch.c:778
+#: builtin/fetch.c:780
#, c-format
msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)"
-#: builtin/fetch.c:802
+#: builtin/fetch.c:812
msgid "[deleted]"
msgstr "[изтрит]"
-#: builtin/fetch.c:803 builtin/remote.c:1057
+#: builtin/fetch.c:813 builtin/remote.c:1040
msgid "(none)"
msgstr "(нищо)"
-#: builtin/fetch.c:822
+#: builtin/fetch.c:833
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Ðе може да изтеглÑте в Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“ на хранилище, което не е голо"
+msgstr "Ðе може да доÑтавите в Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“ на хранилище, което не е голо"
-#: builtin/fetch.c:841
+#: builtin/fetch.c:852
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "СтойноÑтта „%2$s“ за опциÑта „%1$s“ не е ÑъвмеÑтима Ñ â€ž%3$s“"
-#: builtin/fetch.c:844
+#: builtin/fetch.c:855
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "ОпциÑта „%s“ Ñе игнорира при „%s“\n"
-#: builtin/fetch.c:900
+#: builtin/fetch.c:911
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Ðе Ñе поддържа доÑтавÑне от „%s“"
-#: builtin/fetch.c:1063
+#: builtin/fetch.c:1072
#, c-format
msgid "Fetching %s\n"
msgstr "ДоÑтавÑне на „%s“\n"
-#: builtin/fetch.c:1065 builtin/remote.c:90
+#: builtin/fetch.c:1074 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "„%s“ не може да Ñе доÑтави"
-#: builtin/fetch.c:1083
+#: builtin/fetch.c:1092
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -5746,225 +6262,251 @@ msgstr ""
"Ðе Ñте указали отдалечено хранилище. Задайте или адреÑ, или име\n"
"на отдалечено хранилище, откъдето да Ñе доÑтавÑÑ‚ новите верÑии."
-#: builtin/fetch.c:1106
+#: builtin/fetch.c:1115
msgid "You need to specify a tag name."
msgstr "ТрÑбва да укажете име на етикет."
-#: builtin/fetch.c:1148
+#: builtin/fetch.c:1157
msgid "--depth and --unshallow cannot be used together"
msgstr "опциите „--depth“ и „--unshallow“ Ñа неÑъвмеÑтими"
-#: builtin/fetch.c:1150
+#: builtin/fetch.c:1159
msgid "--unshallow on a complete repository does not make sense"
msgstr "не можете да използвате опциÑта „--unshallow“ върху пълно хранилище"
-#: builtin/fetch.c:1173
+#: builtin/fetch.c:1179
msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
-#: builtin/fetch.c:1175
+#: builtin/fetch.c:1181
msgid "fetch --all does not make sense with refspecs"
msgstr ""
"към „git fetch --all“ не можете да добавите аргумент — указател на верÑиÑ"
-#: builtin/fetch.c:1186
+#: builtin/fetch.c:1192
#, c-format
msgid "No such remote or remote group: %s"
msgstr "ÐÑма нито отдалечено хранилище, нито група от хранилища на име „%s“"
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1200
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Указването на група и указването на верÑÐ¸Ñ Ñа неÑъвмеÑтими"
-#: builtin/fmt-merge-msg.c:13
+#: builtin/fmt-merge-msg.c:14
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m СЪОБЩЕÐИЕ] [--log[=БРОЙ] | --no-log] [--file ФÐЙЛ]"
-#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698
-#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
-#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590
-#: parse-options.h:131 parse-options.h:238
-msgid "n"
-msgstr "БРОЙ"
-
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:667
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
"вмъкване на журнал ÑÑŠÑтоÑщ Ñе от не повече от БРОЙ запиÑа от ÑÑŠÐºÑ€Ð°Ñ‚ÐµÐ½Ð¸Ñ "
"журнал"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:670
msgid "alias for --log (deprecated)"
msgstr "Ñиноним на „--log“ (оÑтарÑло)"
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:673
msgid "text"
msgstr "ТЕКСТ"
-#: builtin/fmt-merge-msg.c:676
+#: builtin/fmt-merge-msg.c:674
msgid "use <text> as start of message"
msgstr "за начало на Ñъобщението да Ñе ползва ТЕКСТ"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:675
msgid "file to read from"
msgstr "файл, от който да Ñе чете"
-#: builtin/for-each-ref.c:687
-msgid "unable to parse format"
-msgstr "форматът не може да бъде анализиран"
-
-#: builtin/for-each-ref.c:1083
+#: builtin/for-each-ref.c:9
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [ОПЦИЯ…] [ШÐБЛОÐ]"
-#: builtin/for-each-ref.c:1098
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points ОБЕКТ]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr "git for-each-ref[(--merged | --no-merged) [ОБЕКТ]]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr "git for-each-ref [--contains ОБЕКТ]"
+
+#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr "цитиране подходÑщо за командни интерпретатори на обвивката"
-#: builtin/for-each-ref.c:1100
+#: builtin/for-each-ref.c:29
msgid "quote placeholders suitably for perl"
msgstr "цитиране подходÑщо за perl"
-#: builtin/for-each-ref.c:1102
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for python"
msgstr "цитиране подходÑщо за python"
-#: builtin/for-each-ref.c:1104
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for Tcl"
msgstr "цитиране подходÑщо за tcl"
-#: builtin/for-each-ref.c:1107
+#: builtin/for-each-ref.c:36
msgid "show only <n> matched refs"
msgstr "извеждане Ñамо на този БРОЙ напаÑнати указатели"
-#: builtin/for-each-ref.c:1108 builtin/replace.c:438
-msgid "format"
-msgstr "ФОРМÐТ"
-
-#: builtin/for-each-ref.c:1108
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
msgid "format to use for the output"
msgstr "ФОРМÐТ за изхода"
-#: builtin/for-each-ref.c:1109
-msgid "key"
-msgstr "ключ"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
+msgstr "извеждане Ñамо на указателите, Ñочещи към обекта"
-#: builtin/for-each-ref.c:1110
-msgid "field name to sort on"
-msgstr "име на полето, по което да е подредбата"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr "извеждане Ñамо на Ñлетите указатели"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr "извеждане Ñамо на неÑлетите указатели"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr "извеждане Ñамо на указателите, които Ñъдържат това подаване"
-#: builtin/fsck.c:147 builtin/prune.c:137
+#: builtin/fsck.c:156 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "Проверка на връзката"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:486
msgid "Checking object directories"
msgstr "Проверка на директориите Ñ Ð¾Ð±ÐµÐºÑ‚Ð¸"
-#: builtin/fsck.c:611
+#: builtin/fsck.c:553
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
-#: builtin/fsck.c:617
+#: builtin/fsck.c:559
msgid "show unreachable objects"
msgstr "показване на недоÑтижимите обекти"
-#: builtin/fsck.c:618
+#: builtin/fsck.c:560
msgid "show dangling objects"
msgstr "показване на обектите извън клоните"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:561
msgid "report tags"
msgstr "показване на етикетите"
-#: builtin/fsck.c:620
+#: builtin/fsck.c:562
msgid "report root nodes"
msgstr "показване на кореновите възли"
-#: builtin/fsck.c:621
+#: builtin/fsck.c:563
msgid "make index objects head nodes"
msgstr "задаване на обекти от индекÑа да Ñа коренови"
# FIXME bad message
-#: builtin/fsck.c:622
+#: builtin/fsck.c:564
msgid "make reflogs head nodes (default)"
msgstr "проÑледÑване на указателите от журнала като глави (Ñтандартно)"
-#: builtin/fsck.c:623
+#: builtin/fsck.c:565
msgid "also consider packs and alternate objects"
msgstr "допълнително да Ñе проверÑват пакетите и алтернативните обекти"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:566
+msgid "check only connectivity"
+msgstr "проверка Ñамо на връзката"
+
+#: builtin/fsck.c:567
msgid "enable more strict checking"
msgstr "по-Ñтроги проверки"
-#: builtin/fsck.c:626
+#: builtin/fsck.c:569
msgid "write dangling objects in .git/lost-found"
msgstr "запазване на обектите извън клоните в директориÑта „.git/lost-found“"
-#: builtin/fsck.c:627 builtin/prune.c:107
+#: builtin/fsck.c:570 builtin/prune.c:107
msgid "show progress"
msgstr "показване на напредъка"
-#: builtin/fsck.c:677
+#: builtin/fsck.c:631
msgid "Checking objects"
msgstr "Проверка на обектите"
# FIXME plural with ...
-#: builtin/gc.c:24
+#: builtin/gc.c:25
msgid "git gc [<options>]"
msgstr "git gc [ОПЦИЯ…]"
-#: builtin/gc.c:67
+#: builtin/gc.c:72
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Ðеправилен %s: „%s“"
-#: builtin/gc.c:112
+#: builtin/gc.c:139
#, c-format
msgid "insanely long object directory %.*s"
msgstr "прекалено дълга Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ Ð¾Ð±ÐµÐºÑ‚Ð¸ „%.*s“"
-#: builtin/gc.c:281
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"При поÑледното изпълнение на „git gc“ бе докладвана грешка. Коригирайте "
+"причината за\n"
+"Ð½ÐµÑ Ð¸ изтрийте „%s“.\n"
+"Ðвтоматичното изчиÑтване на боклука нÑма да работи, преди да изтриете "
+"файла.\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:327
msgid "prune unreferenced objects"
msgstr "окаÑÑ‚Ñ€Ñне на обектите, към които нищо не Ñочи"
-#: builtin/gc.c:283
+#: builtin/gc.c:329
msgid "be more thorough (increased runtime)"
msgstr "изчерпателно Ñ‚ÑŠÑ€Ñене на боклука (за Ñметка на повече време работа)"
-#: builtin/gc.c:284
+#: builtin/gc.c:330
msgid "enable auto-gc mode"
msgstr "включване на автоматичното Ñъбиране на боклука (auto-gc)"
-#: builtin/gc.c:285
+#: builtin/gc.c:331
msgid "force running gc even if there may be another gc running"
msgstr ""
"изрично Ñтартиране на Ñъбирането на боклука, дори и ако вече работи друго "
"Ñъбиране"
-#: builtin/gc.c:327
+#: builtin/gc.c:373
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Ðвтоматично пакетиране на заден фон на хранилището за по-добра "
"производителноÑÑ‚.\n"
-#: builtin/gc.c:329
+#: builtin/gc.c:375
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Ðвтоматично пакетиране на хранилището за по-добра производителноÑÑ‚.\n"
-#: builtin/gc.c:330
+#: builtin/gc.c:376
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
"Погледнете ръководÑтвото за повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÐºÐ°Ðº да изпълните „git help "
"gc“.\n"
-#: builtin/gc.c:348
+#: builtin/gc.c:397
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -5973,7 +6515,7 @@ msgstr ""
"процеÑа: %<PRIuMAX> (ако Ñте Ñигурни, че това не е вÑрно, това използвайте\n"
"опциÑта „--force“)"
-#: builtin/gc.c:376
+#: builtin/gc.c:441
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -6010,214 +6552,210 @@ msgstr "опциÑта „%c“ очаква чиÑло за аргумент"
msgid "cannot open '%s'"
msgstr "„%s“ не може да бъде отворен"
-#: builtin/grep.c:638
+#: builtin/grep.c:633
msgid "search in index instead of in the work tree"
msgstr "Ñ‚ÑŠÑ€Ñене в индекÑа, а не в работното дърво"
-#: builtin/grep.c:640
+#: builtin/grep.c:635
msgid "find in contents not managed by git"
msgstr "Ñ‚ÑŠÑ€Ñене и във файловете, които не Ñа под управлението на git"
-#: builtin/grep.c:642
+#: builtin/grep.c:637
msgid "search in both tracked and untracked files"
msgstr "Ñ‚ÑŠÑ€Ñене и в Ñледените, и в неÑледените файлове"
-#: builtin/grep.c:644
+#: builtin/grep.c:639
msgid "ignore files specified via '.gitignore'"
msgstr "игнориране на файловете указани в „.gitignore“"
-#: builtin/grep.c:647
+#: builtin/grep.c:642
msgid "show non-matching lines"
msgstr "извеждане на редовете, които не Ñъвпадат"
-#: builtin/grep.c:649
+#: builtin/grep.c:644
msgid "case insensitive matching"
msgstr "без значение на региÑтъра на буквите (главни/малки)"
-#: builtin/grep.c:651
+#: builtin/grep.c:646
msgid "match patterns only at word boundaries"
msgstr "напаÑване на шаблоните Ñамо по границите на думите"
-#: builtin/grep.c:653
+#: builtin/grep.c:648
msgid "process binary files as text"
msgstr "обработване на двоичните файлове като текÑтови"
-#: builtin/grep.c:655
+#: builtin/grep.c:650
msgid "don't match patterns in binary files"
msgstr "преÑкачане на двоичните файлове"
-#: builtin/grep.c:658
+#: builtin/grep.c:653
msgid "process binary files with textconv filters"
msgstr ""
"обработване на двоичните файлове чрез филтри за преобразуване към текÑÑ‚"
-#: builtin/grep.c:660
+#: builtin/grep.c:655
msgid "descend at most <depth> levels"
msgstr "навлизане макÑимално на тази ДЪЛБОЧИÐРв дървото"
-#: builtin/grep.c:664
+#: builtin/grep.c:659
msgid "use extended POSIX regular expressions"
msgstr "разширени регулÑрни изрази по POSIX"
-#: builtin/grep.c:667
+#: builtin/grep.c:662
msgid "use basic POSIX regular expressions (default)"
msgstr "оÑновни регулÑрни изрази по POSIX (Ñтандартно)"
-#: builtin/grep.c:670
+#: builtin/grep.c:665
msgid "interpret patterns as fixed strings"
msgstr "шаблоните Ñа доÑловни низове"
-#: builtin/grep.c:673
+#: builtin/grep.c:668
msgid "use Perl-compatible regular expressions"
msgstr "регулÑрни изрази на Perl"
-#: builtin/grep.c:676
+#: builtin/grep.c:671
msgid "show line numbers"
msgstr "извеждане на номерата на редовете"
-#: builtin/grep.c:677
+#: builtin/grep.c:672
msgid "don't show filenames"
msgstr "без извеждане на имената на файловете"
-#: builtin/grep.c:678
+#: builtin/grep.c:673
msgid "show filenames"
msgstr "извеждане на имената на файловете"
-#: builtin/grep.c:680
+#: builtin/grep.c:675
msgid "show filenames relative to top directory"
msgstr ""
"извеждане на отноÑителните имена на файловете ÑпрÑмо оÑновната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° "
"хранилището"
-#: builtin/grep.c:682
+#: builtin/grep.c:677
msgid "show only filenames instead of matching lines"
msgstr "извеждане Ñамо на имената на файловете без напаÑващите редове"
-#: builtin/grep.c:684
+#: builtin/grep.c:679
msgid "synonym for --files-with-matches"
msgstr "Ñиноним на „--files-with-matches“"
-#: builtin/grep.c:687
+#: builtin/grep.c:682
msgid "show only the names of files without match"
msgstr ""
"извеждане Ñамо на имената на файловете, които не Ñъдържат ред, напаÑващ на "
"шаблона"
-#: builtin/grep.c:689
+#: builtin/grep.c:684
msgid "print NUL after filenames"
msgstr "извеждане на Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“ Ñлед вÑÑко име на файл"
-#: builtin/grep.c:691
+#: builtin/grep.c:686
msgid "show the number of matches instead of matching lines"
msgstr "извеждане на Ð±Ñ€Ð¾Ñ Ð½Ð° ÑъвпадениÑта вмеÑто напаÑващите редове"
-#: builtin/grep.c:692
+#: builtin/grep.c:687
msgid "highlight matches"
msgstr "оцветÑване на напаÑваниÑта"
-#: builtin/grep.c:694
+#: builtin/grep.c:689
msgid "print empty line between matches from different files"
msgstr "извеждане на празен ред между напаÑваниÑта от различни файлове"
-#: builtin/grep.c:696
+#: builtin/grep.c:691
msgid "show filename only once above matches from same file"
msgstr ""
"извеждане на името на файла Ñамо веднъж за вÑички напаÑÐ²Ð°Ð½Ð¸Ñ Ð¾Ñ‚ този файл"
-#: builtin/grep.c:699
+#: builtin/grep.c:694
msgid "show <n> context lines before and after matches"
msgstr "извеждане на такъв БРОЙ редове преди и Ñлед напаÑваниÑта"
-#: builtin/grep.c:702
+#: builtin/grep.c:697
msgid "show <n> context lines before matches"
msgstr "извеждане на такъв БРОЙ редове преди напаÑваниÑта"
-#: builtin/grep.c:704
+#: builtin/grep.c:699
msgid "show <n> context lines after matches"
msgstr "извеждане на такъв БРОЙ редове Ñлед напаÑваниÑта"
-#: builtin/grep.c:705
+#: builtin/grep.c:700
msgid "shortcut for -C NUM"
msgstr "Ñиноним на „-C БРОЙ“"
-#: builtin/grep.c:708
+#: builtin/grep.c:703
msgid "show a line with the function name before matches"
msgstr "извеждане на ред Ñ Ð¸Ð¼ÐµÑ‚Ð¾ на функциÑта, в коÑто е напаÑнат шаблона"
-#: builtin/grep.c:710
+#: builtin/grep.c:705
msgid "show the surrounding function"
msgstr "извеждане на обхващащата функциÑ"
-#: builtin/grep.c:713
+#: builtin/grep.c:708
msgid "read patterns from file"
msgstr "изчитане на шаблоните от файл"
-#: builtin/grep.c:715
+#: builtin/grep.c:710
msgid "match <pattern>"
msgstr "напаÑване на ШÐБЛОÐ"
-#: builtin/grep.c:717
+#: builtin/grep.c:712
msgid "combine patterns specified with -e"
msgstr "комбиниране на шаблоните указани Ñ Ð¾Ð¿Ñ†Ð¸Ñта „-e“"
-#: builtin/grep.c:729
+#: builtin/grep.c:724
msgid "indicate hit with exit status without output"
msgstr ""
"без извеждане на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´. ИзходниÑÑ‚ код указва наличието на "
"напаÑване"
-#: builtin/grep.c:731
+#: builtin/grep.c:726
msgid "show only matches from files that match all patterns"
msgstr ""
"извеждане на редове Ñамо от файловете, които напаÑват на вÑички шаблони"
-#: builtin/grep.c:733
+#: builtin/grep.c:728
msgid "show parse tree for grep expression"
msgstr "извеждане на дървото за анализ на регулÑÑ€Ð½Ð¸Ñ Ð¸Ð·Ñ€Ð°Ð·"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "pager"
msgstr "програма за преглед по Ñтраници"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "show matching files in the pager"
msgstr "извеждане на Ñъвпадащите файлове в програма за преглед по Ñтраници"
-#: builtin/grep.c:740
+#: builtin/grep.c:735
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
"позволÑване на Ñтартирането на grep(1) (текущиÑÑ‚ компилат пренебрегва тази "
"опциÑ)"
-#: builtin/grep.c:741 builtin/show-ref.c:189
-msgid "show usage"
-msgstr "извеждане на начина на употреба на командата"
-
-#: builtin/grep.c:808
+#: builtin/grep.c:793
msgid "no pattern given."
msgstr "липÑва шаблон."
-#: builtin/grep.c:866
+#: builtin/grep.c:851
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"опциÑта „--open-files-in-pager“ е ÑъвмеÑтима Ñамо Ñ Ñ‚ÑŠÑ€Ñене в работното дърво"
-#: builtin/grep.c:892
+#: builtin/grep.c:877
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "опциите „--cached“ и „--untracked“ Ñа неÑъвмеÑтими Ñ â€ž--no-index“."
-#: builtin/grep.c:897
+#: builtin/grep.c:882
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
"опциите „--cached“ и „--untracked“ Ñа неÑъвмеÑтими Ñ Ñ‚ÑŠÑ€Ñене във верÑии."
-#: builtin/grep.c:900
+#: builtin/grep.c:885
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"опциите „--(no-)exclude-standard“ Ñа неÑъвмеÑтими Ñ Ñ‚ÑŠÑ€Ñене по Ñледени "
"файлове."
-#: builtin/grep.c:908
+#: builtin/grep.c:893
msgid "both --cached and trees are given."
msgstr "опциÑта „--cached“ е неÑъвмеÑтима ÑÑŠÑ Ð·Ð°Ð´Ð°Ð²Ð°Ð½Ðµ на дърво."
@@ -6229,12 +6767,11 @@ msgstr ""
"git hash-object [-t ВИД] [-w] [--path=ФÐЙЛ | --no-filters] [--stdin] [--] "
"ФÐЙЛ…"
-# FIXME - list of paths or path...
#: builtin/hash-object.c:81
-msgid "git hash-object --stdin-paths < <list-of-paths>"
-msgstr "git hash-object --stdin-paths < ПЪТ…"
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:92 builtin/tag.c:612
+#: builtin/hash-object.c:92
msgid "type"
msgstr "ВИД"
@@ -6307,12 +6844,12 @@ msgstr "ВерÑиÑта на „emacsclient“ не може да Ñе анал
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Прекалено Ñтара верÑÐ¸Ñ Ð½Ð° „emacsclient“ — %d (< 22)."
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
msgid "failed to exec '%s': %s"
msgstr "неуÑпешно изпълнение на „%s“: %s"
-#: builtin/help.c:215
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -6321,7 +6858,7 @@ msgstr ""
"„%s“: път към неподдържана програма за преглед на\n"
" ръководÑтвото. ВмеÑто Ð½ÐµÑ Ð¿Ñ€Ð¾Ð±Ð²Ð°Ð¹Ñ‚Ðµ „man.<tool>.cmd“."
-#: builtin/help.c:227
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -6330,194 +6867,194 @@ msgstr ""
"„%s“: команда за поддържана програма за преглед на\n"
" ръководÑтвото. ВмеÑто Ð½ÐµÑ Ð¿Ñ€Ð¾Ð±Ð²Ð°Ð¹Ñ‚Ðµ „man.<tool>.path“."
-#: builtin/help.c:354
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr "„%s“: непозната програма за преглед на ръководÑтвото."
-#: builtin/help.c:371
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr "Ð½Ð¸ÐºÐ¾Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° за преглед на ръководÑтво не уÑÐ¿Ñ Ð´Ð° обработи заÑвката"
-#: builtin/help.c:379
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr ""
"Ð½Ð¸ÐºÐ¾Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° за преглед на информационните Ñтраници не уÑÐ¿Ñ Ð´Ð° обработи "
"заÑвката"
-#: builtin/help.c:428
+#: builtin/help.c:411
msgid "Defining attributes per path"
msgstr "Указване на атрибути към път"
-#: builtin/help.c:429
+#: builtin/help.c:412
msgid "Everyday Git With 20 Commands Or So"
msgstr "Ежедневието в Git в рамките на 20-ина команди"
-#: builtin/help.c:430
+#: builtin/help.c:413
msgid "A Git glossary"
msgstr "Речник Ñ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð¸Ñ‚Ðµ на Git"
-#: builtin/help.c:431
+#: builtin/help.c:414
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указване на неÑледени файлове, които да бъдат нарочно пренебрегвани"
-#: builtin/help.c:432
+#: builtin/help.c:415
msgid "Defining submodule properties"
msgstr "Дефиниране на ÑвойÑтвата на подмодулите"
-#: builtin/help.c:433
+#: builtin/help.c:416
msgid "Specifying revisions and ranges for Git"
msgstr "Указване на верÑии и интервали в Git"
-#: builtin/help.c:434
+#: builtin/help.c:417
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Въвеждащ урок за Git (верÑии поне 1.5.1)"
-#: builtin/help.c:435
+#: builtin/help.c:418
msgid "An overview of recommended workflows with Git"
msgstr "Общ преглед на препоръчваните начини за работа Ñ Git"
-#: builtin/help.c:447
+#: builtin/help.c:430
msgid "The common Git guides are:\n"
msgstr "ПопулÑрните пътеводители в Git Ñа:\n"
-#: builtin/help.c:468 builtin/help.c:485
+#: builtin/help.c:451 builtin/help.c:468
#, c-format
msgid "usage: %s%s"
msgstr "употреба: %s%s"
-#: builtin/help.c:501
+#: builtin/help.c:484
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "„git %s“ е Ñиноним на „%s“"
# FIXME merge with next?
-#: builtin/index-pack.c:151
+#: builtin/index-pack.c:152
#, c-format
msgid "unable to open %s"
msgstr "обектът „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:201
+#: builtin/index-pack.c:202
#, c-format
msgid "object type mismatch at %s"
msgstr "неправилен вид на обекта „%s“"
-#: builtin/index-pack.c:221
+#: builtin/index-pack.c:222
#, c-format
msgid "did not receive expected object %s"
msgstr "очакваниÑÑ‚ обект „%s“ не бе получен"
-#: builtin/index-pack.c:224
+#: builtin/index-pack.c:225
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "неправилен вид на обекта „%s“: очакваше Ñе „%s“, а бе получен „%s“"
-#: builtin/index-pack.c:266
+#: builtin/index-pack.c:267
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "не може да Ñе запълни %d байт"
msgstr[1] "не може да Ñе запълнÑÑ‚ %d байта"
-#: builtin/index-pack.c:276
+#: builtin/index-pack.c:277
msgid "early EOF"
msgstr "неочакван край на файл"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
msgid "read error on input"
msgstr "грешка при четене на входните данни"
-#: builtin/index-pack.c:289
+#: builtin/index-pack.c:290
msgid "used more bytes than were available"
msgstr "използвани Ñа повече от наличните байтове"
-#: builtin/index-pack.c:296
+#: builtin/index-pack.c:297
msgid "pack too large for current definition of off_t"
msgstr "пакетниÑÑ‚ файл е прекалено голÑм за текущата ÑтойноÑÑ‚ на типа „off_t“"
-#: builtin/index-pack.c:312
+#: builtin/index-pack.c:313
#, c-format
msgid "unable to create '%s'"
msgstr "пакетниÑÑ‚ файл „%s“ не може да бъде Ñъздаден"
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:318
#, c-format
msgid "cannot open packfile '%s'"
msgstr "пакетниÑÑ‚ файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:331
+#: builtin/index-pack.c:332
msgid "pack signature mismatch"
msgstr "неÑъответÑтвие в подпиÑа към Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»"
-#: builtin/index-pack.c:333
+#: builtin/index-pack.c:334
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "не Ñе поддържа пакетиране вeÑ€ÑÐ¸Ñ â€ž%<PRIu32>“"
-#: builtin/index-pack.c:351
+#: builtin/index-pack.c:352
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr "повреден обект в Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» при отмеÑтване %lu: %s"
-#: builtin/index-pack.c:472
+#: builtin/index-pack.c:473
#, c-format
msgid "inflate returned %d"
msgstr "декомпреÑирането Ñ â€žinflate“ върна %d"
-#: builtin/index-pack.c:521
+#: builtin/index-pack.c:522
msgid "offset value overflow for delta base object"
msgstr "ÑтойноÑтта на отмеÑтването за обекта-разлика води до препълване"
-#: builtin/index-pack.c:529
+#: builtin/index-pack.c:530
msgid "delta base offset is out of bound"
msgstr "ÑтойноÑтта на отмеÑтването за обекта-разлика е извън диапазона"
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
#, c-format
msgid "unknown object type %d"
msgstr "непознат вид обект %d"
-#: builtin/index-pack.c:568
+#: builtin/index-pack.c:569
msgid "cannot pread pack file"
msgstr "пакетниÑÑ‚ файл не може да бъде прочетен"
-#: builtin/index-pack.c:570
+#: builtin/index-pack.c:571
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] "неочакван край на файл, липÑва %lu байт"
msgstr[1] "неочакван край на файл, липÑват %lu байта"
-#: builtin/index-pack.c:596
+#: builtin/index-pack.c:597
msgid "serious inflate inconsistency"
msgstr "Ñериозна грешка при декомпреÑиране Ñ â€žinflate“"
-#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
-#: builtin/index-pack.c:805 builtin/index-pack.c:814
+#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
+#: builtin/index-pack.c:806 builtin/index-pack.c:815
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
"СЪВПÐДЕÐИЕ ÐРСТОЙÐОСТИТЕ ЗРСУМИТЕ ЗРSHA1: „%s“ ÐРДВРРÐЗЛИЧÐИ ОБЕКТÐ!"
# FIXME merge with next?
-#: builtin/index-pack.c:745 builtin/pack-objects.c:162
+#: builtin/index-pack.c:746 builtin/pack-objects.c:162
#: builtin/pack-objects.c:254
#, c-format
msgid "unable to read %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:811
+#: builtin/index-pack.c:812
#, c-format
msgid "cannot read existing object %s"
msgstr "ÑъщеÑтвуващиÑÑ‚ обект „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:826
#, c-format
msgid "invalid blob object %s"
msgstr "неправилен обект BLOB „%s“"
# FIXME perhaps invalid object
-#: builtin/index-pack.c:839
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid %s"
msgstr "неправилен обект „%s“"
@@ -6644,7 +7181,7 @@ msgstr "зададена е неправилна верÑÐ¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸Ñ€Ð°Ð½
msgid "invalid number of threads specified (%d)"
msgstr "зададен е неправилен брой нишки: %d"
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1658
+#: builtin/index-pack.c:1479 builtin/index-pack.c:1663
#, c-format
msgid "no threads support, ignoring %s"
msgstr "липÑва поддръжка за нишки. „%s“ ще Ñе пренебрегне"
@@ -6674,114 +7211,86 @@ msgstr[0] "дължината на веригата е %d: %lu обект"
msgstr[1] "дължината на веригата е %d: %lu обекта"
# FIXME it is not the cwd it is the previous cwd
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
msgid "Cannot come back to cwd"
msgstr "ПроцеÑÑŠÑ‚ не може да Ñе върне към предишната работна директориÑ"
-#: builtin/index-pack.c:1670 builtin/index-pack.c:1673
-#: builtin/index-pack.c:1685 builtin/index-pack.c:1689
+#: builtin/index-pack.c:1675 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1694
#, c-format
msgid "bad %s"
msgstr "неправилна ÑтойноÑÑ‚ „%s“"
-#: builtin/index-pack.c:1703
+#: builtin/index-pack.c:1708
msgid "--fix-thin cannot be used without --stdin"
msgstr "опциÑта „--fix-thin“ изиÑква „--stdin“"
-#: builtin/index-pack.c:1707 builtin/index-pack.c:1716
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1721
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "името на Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“ не завършва на „.pack“"
-#: builtin/index-pack.c:1724
+#: builtin/index-pack.c:1729
msgid "--verify with no packfile name given"
msgstr "опциÑта „--verify“ изиÑква име на пакетен файл"
-#: builtin/init-db.c:35
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Ðе могат да Ñе дадат права за Ð·Ð°Ð¿Ð¸Ñ Ð² директориÑта „%s“ на групата"
-
-# FIXME - bad wording insanely
-#: builtin/init-db.c:62
-#, c-format
-msgid "insanely long template name %s"
-msgstr "твърде дълго име на шаблон: „%s“"
-
-#: builtin/init-db.c:67
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "не може да Ñе получи Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за директориÑта „%s“"
-#: builtin/init-db.c:73
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "не може да Ñе получи Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за шаблона „%s“"
-#: builtin/init-db.c:80
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "директориÑта „%s“ не може да бъде отворена"
-#: builtin/init-db.c:97
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr "връзката „%s“ не може да бъде прочетена"
-# FIXME - bad wording insanely
-#: builtin/init-db.c:99
-#, c-format
-msgid "insanely long symlink %s"
-msgstr "твърде дълго име на Ñимволна връзка: „%s“"
-
-#: builtin/init-db.c:102
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "не може да Ñе Ñъздаде Ñимволна връзка „%s“ в „%s“"
-#: builtin/init-db.c:106
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "„%s“ не може да Ñе копира в „%s“"
-#: builtin/init-db.c:110
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr "игнориране на шаблона „%s“"
-# FIXME bad word insanely
-#: builtin/init-db.c:136
-#, c-format
-msgid "insanely long template path %s"
-msgstr "твърде дълъг път към шаблон: „%s“"
-
-#: builtin/init-db.c:144
+#: builtin/init-db.c:118
#, c-format
msgid "templates not found %s"
msgstr "директориÑта Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¸Ñ‚Ðµ не е открита: „%s“"
-#: builtin/init-db.c:157
+#: builtin/init-db.c:131
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr ""
-"шаблоните Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ номер на формата %d нÑма да бъдат копирани от „%s“"
-
-#: builtin/init-db.c:211
-#, c-format
-msgid "insane git directory %s"
-msgstr "твърде дълго име на Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° Git: „%s“"
+"шаблоните Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ номер на форма̀та %d нÑма да бъдат копирани от „%s“"
-#: builtin/init-db.c:343 builtin/init-db.c:346
+#: builtin/init-db.c:309 builtin/init-db.c:312
#, c-format
msgid "%s already exists"
msgstr "ДиректориÑта „%s“ вече ÑъщеÑтвува"
-#: builtin/init-db.c:374
+#: builtin/init-db.c:340
#, c-format
msgid "unable to handle file type %d"
msgstr "файлове от вид %d не Ñе поддържат"
-#: builtin/init-db.c:377
+#: builtin/init-db.c:343
#, c-format
msgid "unable to move %s to %s"
msgstr "„%s“ не може да Ñе премеÑти в „%s“"
@@ -6789,24 +7298,24 @@ msgstr "„%s“ не може да Ñе премеÑти в „%s“"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:433
+#: builtin/init-db.c:399
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s хранилище на Git в „%s%s“\n"
-#: builtin/init-db.c:434
+#: builtin/init-db.c:400
msgid "Reinitialized existing"
msgstr "Ðаново инициализирано, ÑъщеÑтвуващо"
-#: builtin/init-db.c:434
+#: builtin/init-db.c:400
msgid "Initialized empty"
msgstr "Инициализирано празно"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:401
msgid " shared"
msgstr ", Ñподелено"
-#: builtin/init-db.c:482
+#: builtin/init-db.c:448
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -6814,31 +7323,27 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШÐБЛОÐИ] [--"
"shared[=ПРÐÐ’Ð]] [ДИРЕКТОРИЯ]"
-#: builtin/init-db.c:505
+#: builtin/init-db.c:471
msgid "permissions"
msgstr "права"
-#: builtin/init-db.c:506
+#: builtin/init-db.c:472
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
"указване, че хранилището на Git ще бъде Ñподелено от повече от един "
"потребител"
-#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
-msgid "be quiet"
-msgstr "без извеждане на информациÑ"
-
-#: builtin/init-db.c:540 builtin/init-db.c:545
+#: builtin/init-db.c:506 builtin/init-db.c:511
#, c-format
msgid "cannot mkdir %s"
msgstr "директориÑта „%s“ не може да бъде Ñъздадена"
-#: builtin/init-db.c:549
+#: builtin/init-db.c:515
#, c-format
msgid "cannot chdir to %s"
msgstr "не може да Ñе влезе в директориÑта „%s“"
-#: builtin/init-db.c:570
+#: builtin/init-db.c:536
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -6847,7 +7352,7 @@ msgstr ""
"%s (или --work-tree=ДИРЕКТОРИЯ) изиÑква указването на %s (или --git-"
"dir=ДИРЕКТОРИЯ)"
-#: builtin/init-db.c:598
+#: builtin/init-db.c:564
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Работното дърво в „%s“ е недоÑтъпно"
@@ -6872,291 +7377,290 @@ msgstr "епилог"
msgid "trailer(s) to add"
msgstr "епилог(зи) за добавÑне"
-#: builtin/log.c:41
+#: builtin/log.c:43
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [ОПЦИЯ…] [ДИÐПÐЗОÐ_ÐÐ_ВЕРСИИТЕ] [[--] ПЪТ…]"
-#: builtin/log.c:42
+#: builtin/log.c:44
msgid "git show [<options>] <object>..."
msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
-#: builtin/log.c:81
+#: builtin/log.c:83
#, c-format
msgid "invalid --decorate option: %s"
msgstr "неправилна Ð¾Ð¿Ñ†Ð¸Ñ â€ž--decorate“: %s"
-#: builtin/log.c:127
+#: builtin/log.c:131
msgid "suppress diff output"
msgstr "без извеждане на разликите"
-#: builtin/log.c:128
+#: builtin/log.c:132
msgid "show source"
msgstr "извеждане на Ð¸Ð·Ñ…Ð¾Ð´Ð½Ð¸Ñ ÐºÐ¾Ð´"
-#: builtin/log.c:129
+#: builtin/log.c:133
msgid "Use mail map file"
msgstr ""
"Използване на файл за ÑъответÑтвиÑта на имената и адреÑите на е-поща („."
"mailmap“)"
-#: builtin/log.c:130
+#: builtin/log.c:134
msgid "decorate options"
msgstr "наÑтройки на форма̀та на извежданата информациÑ"
-#: builtin/log.c:133
+#: builtin/log.c:137
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Обработване Ñамо на редовете във файла в интервала от n до m включително. "
"Броенето започва от 1"
-#: builtin/log.c:229
+#: builtin/log.c:233
#, c-format
msgid "Final output: %d %s\n"
msgstr "Резултат: %d %s\n"
-#: builtin/log.c:458
+#: builtin/log.c:465
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: повреден файл"
-#: builtin/log.c:472 builtin/log.c:564
+#: builtin/log.c:479 builtin/log.c:572
#, c-format
msgid "Could not read object %s"
msgstr "Обектът не може да бъде прочетен: %s"
-#: builtin/log.c:588
+#: builtin/log.c:596
#, c-format
msgid "Unknown type: %d"
msgstr "ÐеизвеÑтен вид: %d"
-#: builtin/log.c:689
+#: builtin/log.c:714
msgid "format.headers without value"
msgstr "не е зададена ÑтойноÑÑ‚ на „format.headers“"
-#: builtin/log.c:773
+#: builtin/log.c:798
msgid "name of output directory is too long"
msgstr "прекалено дълго име на директориÑта за изходната информациÑ"
-#: builtin/log.c:789
+#: builtin/log.c:813
#, c-format
msgid "Cannot open patch file %s"
msgstr "Файлът-кръпка „%s“ не може да бъде отворен"
-#: builtin/log.c:803
+#: builtin/log.c:827
msgid "Need exactly one range."
msgstr "ТрÑбва да зададете точно един диапазон."
-#: builtin/log.c:813
+#: builtin/log.c:837
msgid "Not a range."
msgstr "Ðе е диапазон."
-#: builtin/log.c:919
+#: builtin/log.c:943
msgid "Cover letter needs email format"
msgstr "Придружаващото пиÑмо Ñ‚Ñ€Ñбва да е форматирано като е-пиÑмо"
# FIXME bad wording insanely
-#: builtin/log.c:998
+#: builtin/log.c:1022
#, c-format
msgid "insane in-reply-to: %s"
msgstr "неправилен формат на заглавната чаÑÑ‚ за отговор „in-reply-to“: %s"
-#: builtin/log.c:1026
+#: builtin/log.c:1050
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИÐПÐЗОÐ_ÐÐ_ВЕРСИИТЕ]"
# FIXME message WTF why ask it
-#: builtin/log.c:1071
+#: builtin/log.c:1095
msgid "Two output directories?"
msgstr "Можете да укажете макÑимум една Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° изход."
-#: builtin/log.c:1186
+#: builtin/log.c:1211
msgid "use [PATCH n/m] even with a single patch"
msgstr "Ð½Ð¾Ð¼ÐµÑ€Ð°Ñ†Ð¸Ñ â€ž[PATCH n/m]“ дори и при единÑтвена кръпка"
-#: builtin/log.c:1189
+#: builtin/log.c:1214
msgid "use [PATCH] even with multiple patches"
msgstr "Ð½Ð¾Ð¼ÐµÑ€Ð°Ñ†Ð¸Ñ â€ž[PATCH]“ дори и при множеÑтво кръпки"
-#: builtin/log.c:1193
+#: builtin/log.c:1218
msgid "print patches to standard out"
msgstr "извеждане на кръпките на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´"
-#: builtin/log.c:1195
+#: builtin/log.c:1220
msgid "generate a cover letter"
msgstr "Ñъздаване на придружаващо пиÑмо"
-#: builtin/log.c:1197
+#: builtin/log.c:1222
msgid "use simple number sequence for output file names"
msgstr "проÑта чиÑлова поÑледователноÑÑ‚ за имената на файловете-кръпки"
-#: builtin/log.c:1198
+#: builtin/log.c:1223
msgid "sfx"
msgstr "ЗÐÐЦИ"
-#: builtin/log.c:1199
+#: builtin/log.c:1224
msgid "use <sfx> instead of '.patch'"
msgstr "използване на тези ЗÐÐЦИ за ÑÑƒÑ„Ð¸ÐºÑ Ð²Ð¼ÐµÑто „.patch“"
-#: builtin/log.c:1201
+#: builtin/log.c:1226
msgid "start numbering patches at <n> instead of 1"
msgstr "номерирането на кръпките да започва от този БРОЙ, а не Ñ 1"
-#: builtin/log.c:1203
+#: builtin/log.c:1228
msgid "mark the series as Nth re-roll"
msgstr "отбелÑзване, че това е N-тата поредна Ñ€ÐµÐ´Ð°ÐºÑ†Ð¸Ñ Ð½Ð° поредицата от кръпки"
-#: builtin/log.c:1205
+#: builtin/log.c:1230
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Използване на този „[ПРЕФИКС]“ вмеÑто „[PATCH]“"
-#: builtin/log.c:1208
+#: builtin/log.c:1233
msgid "store resulting files in <dir>"
msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
-#: builtin/log.c:1211
+#: builtin/log.c:1236
msgid "don't strip/add [PATCH]"
msgstr "без добавÑне/махане на префикÑа „[PATCH]“"
-#: builtin/log.c:1214
+#: builtin/log.c:1239
msgid "don't output binary diffs"
msgstr "без извеждане на разлики между двоични файлове"
-#: builtin/log.c:1216
+#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr "в заглавната чаÑÑ‚ „From:“ (от) хешът да е Ñамо от нули"
+
+#: builtin/log.c:1243
msgid "don't include a patch matching a commit upstream"
msgstr "да не Ñе включват кръпки, които приÑÑŠÑтват в ÑÐ»ÐµÐ´ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/log.c:1218
+#: builtin/log.c:1245
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"извеждане във формат за кръпки, а на в ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ (кръпка и ÑтатиÑтика)"
-#: builtin/log.c:1220
+#: builtin/log.c:1247
msgid "Messaging"
msgstr "Опции при изпращане"
-#: builtin/log.c:1221
+#: builtin/log.c:1248
msgid "header"
msgstr "ЗÐГЛÐÐ’ÐÐ_ЧÐСТ"
-#: builtin/log.c:1222
+#: builtin/log.c:1249
msgid "add email header"
msgstr "добавÑне на тази ЗÐГЛÐÐ’ÐÐ_ЧÐСТ"
-#: builtin/log.c:1223 builtin/log.c:1225
+#: builtin/log.c:1250 builtin/log.c:1252
msgid "email"
msgstr "Е-ПОЩÐ"
-#: builtin/log.c:1223
+#: builtin/log.c:1250
msgid "add To: header"
msgstr "добавÑне на заглавна чаÑÑ‚ „To:“ (до)"
-#: builtin/log.c:1225
+#: builtin/log.c:1252
msgid "add Cc: header"
msgstr "добавÑне на заглавна чаÑÑ‚ „Cc:“ (и до)"
-#: builtin/log.c:1227
+#: builtin/log.c:1254
msgid "ident"
msgstr "ИДЕÐТИЧÐОСТ"
-#: builtin/log.c:1228
+#: builtin/log.c:1255
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-"задаване на адреÑа в заглавната чаÑÑ‚ „From“ да е тази ИДЕÐТИЧÐОСТ. Ðко не е "
-"зададена такава, Ñе взима адреÑа на подаващиÑ"
+"задаване на адреÑа в заглавната чаÑÑ‚ „From“ (от) да е тази ИДЕÐТИЧÐОСТ. Ðко "
+"не е зададена такава, Ñе взима адреÑа на подаващиÑ"
-#: builtin/log.c:1230
+#: builtin/log.c:1257
msgid "message-id"
msgstr "ИДЕÐТИФИКÐТОР_ÐÐ_СЪОБЩЕÐИЕ"
-#: builtin/log.c:1231
+#: builtin/log.c:1258
msgid "make first mail a reply to <message-id>"
msgstr ""
"първото Ñъобщение да е в отговор на е-пиÑмото Ñ Ñ‚Ð¾Ð·Ð¸ "
"ИДЕÐТИФИКÐТОР_ÐÐ_СЪОБЩЕÐИЕ"
-#: builtin/log.c:1232 builtin/log.c:1235
+#: builtin/log.c:1259 builtin/log.c:1262
msgid "boundary"
msgstr "граница"
-#: builtin/log.c:1233
+#: builtin/log.c:1260
msgid "attach the patch"
msgstr "прикрепÑне на кръпката"
-#: builtin/log.c:1236
+#: builtin/log.c:1263
msgid "inline the patch"
msgstr "включване на кръпката в текÑта на пиÑмата"
-#: builtin/log.c:1240
+#: builtin/log.c:1267
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"използване на нишки за ÑъобщениÑта. Стилът е „shallow“ (плитък) или "
"„deep“ (дълбок)"
-#: builtin/log.c:1242
+#: builtin/log.c:1269
msgid "signature"
msgstr "подпиÑ"
-#: builtin/log.c:1243
+#: builtin/log.c:1270
msgid "add a signature"
msgstr "добавÑне на поле за подпиÑ"
-#: builtin/log.c:1245
+#: builtin/log.c:1272
msgid "add a signature from a file"
msgstr "добавÑне на Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ файл"
-#: builtin/log.c:1246
+#: builtin/log.c:1273
msgid "don't print the patch filenames"
msgstr "без извеждане на имената на кръпките"
-#: builtin/log.c:1320
-#, c-format
-msgid "invalid ident line: %s"
-msgstr "грешна идентичноÑÑ‚: %s"
-
-#: builtin/log.c:1335
+#: builtin/log.c:1362
msgid "-n and -k are mutually exclusive."
msgstr "опциите „-n“ и „-k“ Ñа неÑъвмеÑтими."
-#: builtin/log.c:1337
+#: builtin/log.c:1364
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "опциите „--subject-prefix“ и „-k“ Ñа неÑъвмеÑтими."
-#: builtin/log.c:1345
+#: builtin/log.c:1372
msgid "--name-only does not make sense"
msgstr "опциÑта „--name-only“ е неÑъвмеÑтима Ñ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ на кръпки"
-#: builtin/log.c:1347
+#: builtin/log.c:1374
msgid "--name-status does not make sense"
msgstr "опциÑта „--name-status“ е неÑъвмеÑтима Ñ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ на кръпки"
-#: builtin/log.c:1349
+#: builtin/log.c:1376
msgid "--check does not make sense"
msgstr "опциÑта „--check“ е неÑъвмеÑтима Ñ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ на кръпки"
-#: builtin/log.c:1372
+#: builtin/log.c:1401
msgid "standard output, or directory, which one?"
msgstr ""
"изходът може да или ÑтандартниÑÑ‚, или да е в директориÑ, но не и двете."
-#: builtin/log.c:1374
+#: builtin/log.c:1403
#, c-format
msgid "Could not create directory '%s'"
msgstr "ДиректориÑта „%s“ не може да бъде Ñъздадена"
-#: builtin/log.c:1472
+#: builtin/log.c:1500
#, c-format
msgid "unable to read signature file '%s'"
msgstr "файлът „%s“ Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð½Ðµ може да бъде прочетен"
-#: builtin/log.c:1535
+#: builtin/log.c:1563
msgid "Failed to create output files"
msgstr "Изходните файлове не могат да бъдат Ñъздадени"
-#: builtin/log.c:1583
+#: builtin/log.c:1611
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [ОТДÐЛЕЧЕÐ_КЛОР[ВРЪХ [ПРЕДЕЛ]]]"
-#: builtin/log.c:1637
+#: builtin/log.c:1665
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7164,7 +7668,7 @@ msgstr ""
"СледениÑÑ‚ отдалечен клон не бе открит, затова изрично задайте "
"ОТДÐЛЕЧЕÐ_КЛОÐ.\n"
-#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
+#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr "Ðепознато подаване „%s“"
@@ -7268,35 +7772,35 @@ msgstr "извеждане на информациÑта за изчиÑтван
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [ОПЦИЯ…] УКÐЗÐТЕЛ_КЪМ_ДЪРВО [ПЪТ…]"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "извеждане Ñамо на дървета"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "рекурÑивно обхождане поддърветата"
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "извеждане на дърветата при рекурÑивното обхождане"
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "разделÑне на обектите Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "извеждане на размера на обекта"
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "извеждане Ñамо имената на файловете"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "използване на пълните имена на пътищата"
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"извеждане на цÑлото дърво, не Ñамо на текущата Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ (включва опциÑта "
@@ -7334,33 +7838,33 @@ msgstr "Ðаличните Ñтратегии Ñа:"
msgid "Available custom strategies are:"
msgstr "Допълнителните Ñтратегии Ñа:"
-#: builtin/merge.c:193
+#: builtin/merge.c:193 builtin/pull.c:119
msgid "do not show a diffstat at the end of the merge"
msgstr "без извеждане на ÑтатиÑтиката Ñлед завършване на Ñливане"
-#: builtin/merge.c:196
+#: builtin/merge.c:196 builtin/pull.c:122
msgid "show a diffstat at the end of the merge"
msgstr "извеждане на ÑтатиÑтиката Ñлед завършване на Ñливане"
-#: builtin/merge.c:197
+#: builtin/merge.c:197 builtin/pull.c:125
msgid "(synonym to --stat)"
msgstr "(Ñиноним на „--stat“)"
-#: builtin/merge.c:199
+#: builtin/merge.c:199 builtin/pull.c:128
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"добавÑне (на макÑимум такъв БРОЙ) запиÑи от ÑÑŠÐºÑ€Ð°Ñ‚ÐµÐ½Ð¸Ñ Ð¶ÑƒÑ€Ð½Ð°Ð» в Ñъобщението "
"за подаване"
-#: builtin/merge.c:202
+#: builtin/merge.c:202 builtin/pull.c:131
msgid "create a single commit instead of doing a merge"
msgstr "Ñъздаване на едно подаване вмеÑто извършване на Ñливане"
-#: builtin/merge.c:204
+#: builtin/merge.c:204 builtin/pull.c:134
msgid "perform a commit if the merge succeeds (default)"
msgstr "извършване на подаване при уÑпешно Ñливане (Ñтандартно дейÑтвие)"
-#: builtin/merge.c:206
+#: builtin/merge.c:206 builtin/pull.c:137
msgid "edit message before committing"
msgstr "редактиране на Ñъобщението преди подаване"
@@ -7368,7 +7872,7 @@ msgstr "редактиране на Ñъобщението преди подав
msgid "allow fast-forward (default)"
msgstr "позволÑване на тривиално Ñливане (Ñтандартно дейÑтвие)"
-#: builtin/merge.c:209
+#: builtin/merge.c:209 builtin/pull.c:143
msgid "abort if fast-forward is not possible"
msgstr "преуÑтановÑване, ако Ñливането не е тривиално"
@@ -7376,19 +7880,20 @@ msgstr "преуÑтановÑване, ако Ñливането не е три
msgid "Verify that the named commit has a valid GPG signature"
msgstr "Проверка, че именуваното подаване е Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð½Ð° GPG"
-#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
+#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
+#: builtin/revert.c:89
msgid "strategy"
msgstr "ÑтратегиÑ"
-#: builtin/merge.c:215
+#: builtin/merge.c:215 builtin/pull.c:149
msgid "merge strategy to use"
msgstr "ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° Ñливане, коÑто да Ñе ползва"
-#: builtin/merge.c:216
+#: builtin/merge.c:216 builtin/pull.c:152
msgid "option=value"
msgstr "опциÑ=ÑтойноÑÑ‚"
-#: builtin/merge.c:217
+#: builtin/merge.c:217 builtin/pull.c:153
msgid "option for selected merge strategy"
msgstr "Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° избраната ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° Ñливане"
@@ -7426,6 +7931,12 @@ msgstr " (нÑма какво да Ñе Ñмачка)"
msgid "Squash commit -- not updating HEAD\n"
msgstr "Подаване ÑÑŠÑ Ñмачкване — указателÑÑ‚ „HEAD“ нÑма да бъде обновен\n"
+#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
+#: builtin/merge.c:988
+#, c-format
+msgid "Could not write to '%s'"
+msgstr "„%s“ не може да бъде запиÑан"
+
#: builtin/merge.c:372
msgid "Writing SQUASH_MSG"
msgstr "ЗапиÑване на Ñъобщението за Ñмачкване SQUASH_MSG"
@@ -7450,10 +7961,6 @@ msgstr "„%s“ не Ñочи към подаване"
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Ðеправилен низ за наÑтройката „branch.%s.mergeoptions“: „%s“"
-#: builtin/merge.c:632
-msgid "git write-tree failed to write a tree"
-msgstr "Командата „git write-tree“ не уÑÐ¿Ñ Ð´Ð° запише обект-дърво"
-
#: builtin/merge.c:656
msgid "Not handling anything other than two heads merge."
msgstr "Поддържа Ñе Ñамо Ñливане на точно две иÑтории."
@@ -7532,18 +8039,18 @@ msgstr "ТекущиÑÑ‚ клон не Ñледи никой клон."
msgid "No remote-tracking branch for %s from %s"
msgstr "Ðикой клон не Ñледи клона „%s“ от хранилището „%s“"
-#: builtin/merge.c:1081
+#: builtin/merge.c:1079
#, c-format
msgid "could not close '%s'"
msgstr "„%s“ не може да Ñе затвори"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1206
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Ðе може да преуÑтановите Ñливане, защото в момента не Ñе извършва такова "
"(липÑва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1224
+#: builtin/merge.c:1222
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7551,11 +8058,7 @@ msgstr ""
"Ðе Ñте завършили Ñливане. (УказателÑÑ‚ „MERGE_HEAD“ ÑъщеÑтвува).\n"
"Подайте промените Ñи, преди да започнете ново Ñливане."
-#: builtin/merge.c:1227 git-pull.sh:74
-msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr "Ðе Ñте завършили Ñливане. (УказателÑÑ‚ „MERGE_HEAD“ ÑъщеÑтвува)."
-
-#: builtin/merge.c:1231
+#: builtin/merge.c:1229
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7563,58 +8066,58 @@ msgstr ""
"Ðе Ñте завършили отбиране на подаване (указателÑÑ‚ „CHERRY_PICK_HEAD“\n"
"ÑъщеÑтвува). Подайте промените Ñи, преди да започнете ново Ñливане."
-#: builtin/merge.c:1234
+#: builtin/merge.c:1232
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Ðе Ñте завършили отбиране на подаване (указателÑÑ‚ „CHERRY_PICK_HEAD“\n"
"ÑъщеÑтвува)."
-#: builtin/merge.c:1243
+#: builtin/merge.c:1241
msgid "You cannot combine --squash with --no-ff."
msgstr "ОпциÑта „--squash“ е неÑъвмеÑтима Ñ â€ž--no-ff“."
-#: builtin/merge.c:1251
+#: builtin/merge.c:1249
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Ðе е указано подаване и наÑтройката „merge.defaultToUpstream“ не е зададена."
-#: builtin/merge.c:1268
+#: builtin/merge.c:1266
msgid "Squash commit into empty head not supported yet"
msgstr "Подаване ÑÑŠÑ Ñмачкване във връх без иÑÑ‚Ð¾Ñ€Ð¸Ñ Ð²Ñе още не Ñе поддържа"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1268
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Понеже върхът е без иÑториÑ, вÑички ÑÐ»Ð¸Ð²Ð°Ð½Ð¸Ñ Ñа тривиални, не може да Ñе "
"извърши нетривиално Ñливане изиÑквано от опциÑта „--no-ff“"
-#: builtin/merge.c:1276
+#: builtin/merge.c:1274
#, c-format
msgid "%s - not something we can merge"
msgstr "„%s“ — не е нещо, което може да Ñе Ñлее"
-#: builtin/merge.c:1278
+#: builtin/merge.c:1276
msgid "Can merge only exactly one commit into empty head"
msgstr "Можете да Ñлеете точно едно подаване във връх без иÑториÑ"
-#: builtin/merge.c:1333
+#: builtin/merge.c:1331
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Подаването „%s“ е Ñ Ð½ÐµÐ´Ð¾Ð²ÐµÑ€ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ GPG, който твърди, че е на „%s“."
-#: builtin/merge.c:1336
+#: builtin/merge.c:1334
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Подаването „%s“ е Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ GPG, който твърди, че е на „%s“."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Подаването „%s“ е без Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ GPG."
-#: builtin/merge.c:1342
+#: builtin/merge.c:1340
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Подаването „%s“ е Ñ ÐºÐ¾Ñ€ÐµÐºÑ‚ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ GPG на „%s“.\n"
@@ -7624,50 +8127,50 @@ msgstr "Подаването „%s“ е Ñ ÐºÐ¾Ñ€ÐµÐºÑ‚ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ G
msgid "Updating %s..%s\n"
msgstr "ОбновÑване „%s..%s“\n"
-#: builtin/merge.c:1462
+#: builtin/merge.c:1460
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Проба Ñ Ð½Ð°Ð¹-тривиалното Ñливане в рамките на индекÑа…\n"
# FIXME WTF message
-#: builtin/merge.c:1469
+#: builtin/merge.c:1467
#, c-format
msgid "Nope.\n"
msgstr "ÐеуÑпешно Ñливане.\n"
-#: builtin/merge.c:1501
+#: builtin/merge.c:1499
msgid "Not possible to fast-forward, aborting."
msgstr ""
"Ðе може да Ñе извърши тривиално Ñливане, преуÑтановÑване на дейÑтвието."
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Привеждане на дървото към първоначалното…\n"
-#: builtin/merge.c:1528
+#: builtin/merge.c:1526
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Пробване ÑÑŠÑ ÑтратегиÑта за Ñливане „%s“…\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1592
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "ÐÐ¸ÐºÐ¾Ñ ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° Ñливане не може да извърши Ñливането.\n"
-#: builtin/merge.c:1596
+#: builtin/merge.c:1594
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "ÐеуÑпешно Ñливане ÑÑŠÑ ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ â€ž%s“.\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1603
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
"Ползва Ñе ÑтратегиÑта „%s“, коÑто ще подготви дървото за коригиране на "
"ръка.\n"
-#: builtin/merge.c:1617
+#: builtin/merge.c:1615
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -7862,59 +8365,59 @@ msgstr "%s, обект: „%s“, цел: „%s“"
msgid "Renaming %s to %s\n"
msgstr "Преименуване на „%s“ на „%s“\n"
-#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "неуÑпешно преименуване на „%s“"
-#: builtin/name-rev.c:255
+#: builtin/name-rev.c:251
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [ОПЦИЯ…] ПОДÐÐ’ÐÐЕ…"
-#: builtin/name-rev.c:256
+#: builtin/name-rev.c:252
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [ОПЦИЯ…] --all"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:253
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [ОПЦИЯ…] --stdin"
# FIXME sha
-#: builtin/name-rev.c:309
+#: builtin/name-rev.c:305
msgid "print only names (no SHA-1)"
msgstr "извеждане Ñамо на имената (без Ñумите по SHA1)"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:306
msgid "only use tags to name the commits"
msgstr "използване Ñамо на етикетите за именуване на подаваниÑта"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:308
msgid "only use refs matching <pattern>"
msgstr "използване Ñамо на шаблоните напаÑващи на ШÐБЛОÐа"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:310
msgid "list all commits reachable from all refs"
msgstr ""
"извеждане на вÑички подаваниÑ, които могат да бъдат доÑтигнати от вÑички "
"указатели"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:311
msgid "read from stdin"
msgstr "четене от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:312
msgid "allow to print `undefined` names (default)"
msgstr "да Ñе извеждат и недефинираните имена (Ñтандартна ÑтойноÑÑ‚ на опциÑта)"
-#: builtin/name-rev.c:322
+#: builtin/name-rev.c:318
msgid "dereference tags in the input (internal use)"
msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)"
-#: builtin/notes.c:24
+#: builtin/notes.c:25
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] [list [ОБЕКТ]]"
-#: builtin/notes.c:25
+#: builtin/notes.c:26
msgid ""
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
@@ -7922,12 +8425,12 @@ msgstr ""
"git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] add [-f] [--allow-empty] [-m СЪОБЩЕÐИЕ "
"| -F ФÐЙЛ | (-c | -C) ОБЕКТ] [ОБЕКТ]"
-#: builtin/notes.c:26
+#: builtin/notes.c:27
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
"git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] copy [-f] ОБЕКТ_ИЗТОЧÐИК ОБЕКТ_ЦЕЛ"
-#: builtin/notes.c:27
+#: builtin/notes.c:28
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
@@ -7935,205 +8438,190 @@ msgstr ""
"git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] append [--allow-empty] [-m СЪОБЩЕÐИЕ | "
"-F ФÐЙЛ | (-c | -C) ОБЕКТ] [ОБЕКТ]"
-#: builtin/notes.c:28
+#: builtin/notes.c:29
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] edit [--allow-empty] [ОБЕКТ]"
-#: builtin/notes.c:29
+#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] show [ОБЕКТ]"
-#: builtin/notes.c:30
+#: builtin/notes.c:31
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
"git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] merge [-v | -q] [-s СТРÐТЕГИЯ] "
"УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ"
-#: builtin/notes.c:31
+#: builtin/notes.c:32
msgid "git notes merge --commit [-v | -q]"
msgstr "git notes merge --commit [-v | -q]"
-#: builtin/notes.c:32
+#: builtin/notes.c:33
msgid "git notes merge --abort [-v | -q]"
msgstr "git notes merge --abort [-v | -q]"
-#: builtin/notes.c:33
+#: builtin/notes.c:34
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] remove [ОБЕКТ…]"
-#: builtin/notes.c:34
+#: builtin/notes.c:35
msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] prune [-n | -v]"
-#: builtin/notes.c:35
+#: builtin/notes.c:36
msgid "git notes [--ref <notes-ref>] get-ref"
msgstr "git notes [--ref УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ] get-ref"
-#: builtin/notes.c:40
+#: builtin/notes.c:41
msgid "git notes [list [<object>]]"
msgstr "git notes [list [ОБЕКТ]]"
-#: builtin/notes.c:45
+#: builtin/notes.c:46
msgid "git notes add [<options>] [<object>]"
msgstr "git notes add [ОПЦИЯ…] [ОБЕКТ]"
-#: builtin/notes.c:50
+#: builtin/notes.c:51
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr "git notes copy [ОПЦИЯ…] ОБЕКТ_ИЗТОЧÐИК ОБЕКТ_ЦЕЛ"
-#: builtin/notes.c:51
+#: builtin/notes.c:52
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr "git notes copy --stdin [ОБЕКТ_ИЗТОЧÐИК ОБЕКТ_ЦЕЛ]…"
-#: builtin/notes.c:56
+#: builtin/notes.c:57
msgid "git notes append [<options>] [<object>]"
msgstr "git notes append [ОПЦИЯ…] [ОБЕКТ]"
-#: builtin/notes.c:61
+#: builtin/notes.c:62
msgid "git notes edit [<object>]"
msgstr "git notes edit [ОБЕКТ]"
-#: builtin/notes.c:66
+#: builtin/notes.c:67
msgid "git notes show [<object>]"
msgstr "git notes show [ОБЕКТ]"
-#: builtin/notes.c:71
+#: builtin/notes.c:72
msgid "git notes merge [<options>] <notes-ref>"
msgstr "git notes merge [ОПЦИЯ…] УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ"
-#: builtin/notes.c:72
+#: builtin/notes.c:73
msgid "git notes merge --commit [<options>]"
msgstr "git notes merge --commit [ОПЦИЯ…]"
-#: builtin/notes.c:73
+#: builtin/notes.c:74
msgid "git notes merge --abort [<options>]"
msgstr "git notes merge --abort [ОПЦИЯ…]"
-#: builtin/notes.c:78
+#: builtin/notes.c:79
msgid "git notes remove [<object>]"
msgstr "git notes remove [ОБЕКТ]"
-#: builtin/notes.c:83
+#: builtin/notes.c:84
msgid "git notes prune [<options>]"
msgstr "git notes prune [ОПЦИЯ…]"
-#: builtin/notes.c:88
+#: builtin/notes.c:89
msgid "git notes get-ref"
msgstr "git notes get-ref"
-#: builtin/notes.c:146
+#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "дейÑтвието „show“ не може да Ñе изпълни за обект „%s“"
-#: builtin/notes.c:150
+#: builtin/notes.c:151
msgid "could not read 'show' output"
msgstr "изведената Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚ дейÑтвието „show“ не може да Ñе прочете"
-#: builtin/notes.c:158
+#: builtin/notes.c:159
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "дейÑтвието „show“ не може да Ñе завърши за обект „%s“"
-#: builtin/notes.c:173 builtin/tag.c:477
+#: builtin/notes.c:174 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "файлът „%s“ не може да бъде Ñъздаден"
-#: builtin/notes.c:192
+#: builtin/notes.c:193
msgid "Please supply the note contents using either -m or -F option"
msgstr "Задайте Ñъдържанието на бележката Ñ Ð½ÑÐºÐ¾Ñ Ð¾Ñ‚ опциите „-m“ или „-F“"
-#: builtin/notes.c:201
+#: builtin/notes.c:202
msgid "unable to write note object"
msgstr "обектът-бележка не може да бъде запиÑан"
-#: builtin/notes.c:203
+#: builtin/notes.c:204
#, c-format
msgid "The note contents have been left in %s"
msgstr "Съдържанието на бележката е във файла „%s“"
-#: builtin/notes.c:231 builtin/tag.c:693
+#: builtin/notes.c:232 builtin/tag.c:440
#, c-format
msgid "cannot read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: builtin/notes.c:233 builtin/tag.c:696
+#: builtin/notes.c:234 builtin/tag.c:443
#, c-format
msgid "could not open or read '%s'"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
-#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
-#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
-#: builtin/notes.c:854 builtin/tag.c:709
+#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
+#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
+#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
+#: builtin/notes.c:877 builtin/tag.c:456
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Ðе може да Ñе открие към какво Ñочи „%s“."
-#: builtin/notes.c:255
+#: builtin/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
msgstr "Обектът „%s“ не може да бъде прочетен."
-#: builtin/notes.c:259
+#: builtin/notes.c:260
#, c-format
msgid "Cannot read note data from non-blob object '%s'."
msgstr ""
"Съдържанието на бележка не може да Ñе вземе от обект, който не е BLOB: „%s“."
-#: builtin/notes.c:299
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "ДадениÑÑ‚ входен ред е Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ формат: „%s“."
-
-#: builtin/notes.c:314
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "Бележката не може да Ñе копира от „%s“ към „%s“"
-
-#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
-#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
-#: builtin/notes.c:919
+#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
+#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
+#: builtin/notes.c:942
msgid "too many parameters"
msgstr "прекалено много параметри"
-#: builtin/notes.c:371 builtin/notes.c:658
+#: builtin/notes.c:372 builtin/notes.c:659
#, c-format
msgid "No note found for object %s."
msgstr "ÐÑма бележки за обекта „%s“."
-#: builtin/notes.c:392 builtin/notes.c:555
+#: builtin/notes.c:393 builtin/notes.c:556
msgid "note contents as a string"
msgstr "низ, който е Ñъдържанието на бележката"
-#: builtin/notes.c:395 builtin/notes.c:558
+#: builtin/notes.c:396 builtin/notes.c:559
msgid "note contents in a file"
msgstr "файл ÑÑŠÑ Ñъдържанието на бележката"
-#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
-#: builtin/notes.c:563 builtin/tag.c:628
-msgid "object"
-msgstr "обект"
-
-#: builtin/notes.c:398 builtin/notes.c:561
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr "преизползване и редактиране на ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚-бележка"
-#: builtin/notes.c:401 builtin/notes.c:564
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "reuse specified note object"
msgstr "преизползване на ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚-бележка"
-#: builtin/notes.c:404 builtin/notes.c:567
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "allow storing empty note"
msgstr "приемане и на празни бележки"
-#: builtin/notes.c:405 builtin/notes.c:476
+#: builtin/notes.c:406 builtin/notes.c:477
msgid "replace existing notes"
msgstr "замÑна на ÑъщеÑтвуващите бележки"
-#: builtin/notes.c:430
+#: builtin/notes.c:431
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8142,32 +8630,32 @@ msgstr ""
"Ðе може да Ñе добави бележка, защото такава вече ÑъщеÑтвува за обекта „%s“. "
"Използвайте опциÑта „-f“, за да презапишете ÑъщеÑтвуващи бележки."
-#: builtin/notes.c:445 builtin/notes.c:524
+#: builtin/notes.c:446 builtin/notes.c:525
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "ПрезапиÑване на ÑъщеÑтвуващите бележки за обекта „%s“\n"
-#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
+#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
#, c-format
msgid "Removing note for object %s\n"
msgstr "Изтриване на бележката за обекта „%s“\n"
-#: builtin/notes.c:477
+#: builtin/notes.c:478
msgid "read objects from stdin"
msgstr "изчитане на обектите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
# FIXME imporve message
-#: builtin/notes.c:479
+#: builtin/notes.c:480
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"зареждане на наÑтройките за КОМÐÐДÐта, коÑто презапиÑва Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ (включва "
"опциÑта „--stdin“)"
-#: builtin/notes.c:497
+#: builtin/notes.c:498
msgid "too few parameters"
msgstr "прекалено малко параметри"
-#: builtin/notes.c:518
+#: builtin/notes.c:519
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8176,14 +8664,14 @@ msgstr ""
"Ðе може да Ñе копира бележка, защото такава вече ÑъщеÑтвува за обекта „%s“. "
"Използвайте опциÑта „-f“, за да презапишете ÑъщеÑтвуващи бележки."
-#: builtin/notes.c:530
+#: builtin/notes.c:531
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr ""
"Ðе може да Ñе копира бележка, коÑто не ÑъщеÑтвува — нÑма бележки за обекта-"
"източник „%s“."
-#: builtin/notes.c:582
+#: builtin/notes.c:583
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -8191,18 +8679,18 @@ msgid ""
msgstr ""
"Задаването на опциите „-m“/„-F“/„-c“/„-C“ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „edit“ вече е "
"оÑтарÑло.\n"
-"ВмеÑто това ги използвайте Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „add“: „git notes add -f -m/-F/-c/-"
+"ВмеÑто това ги използвайте Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „add“: „git notes add -f -m/-F/-c/-"
"C“.\n"
-#: builtin/notes.c:750
+#: builtin/notes.c:764
msgid "General options"
msgstr "Общи опции"
-#: builtin/notes.c:752
+#: builtin/notes.c:766
msgid "Merge options"
msgstr "Опции при Ñливане"
-#: builtin/notes.c:754
+#: builtin/notes.c:768
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -8212,58 +8700,65 @@ msgstr ""
"„union“ (обединÑване), „cat_sort_uniq“ (обединÑване, подреждане, уникални "
"резултати)"
-#: builtin/notes.c:756
+#: builtin/notes.c:770
msgid "Committing unmerged notes"
msgstr "Подаване на неÑлети бележки"
-#: builtin/notes.c:758
+#: builtin/notes.c:772
msgid "finalize notes merge by committing unmerged notes"
msgstr "завършване на Ñливането чрез подаване на неÑлети бележки"
-#: builtin/notes.c:760
+#: builtin/notes.c:774
msgid "Aborting notes merge resolution"
msgstr "ПреуÑтановÑване на корекциÑта при Ñливането на бележки"
-#: builtin/notes.c:762
+#: builtin/notes.c:776
msgid "abort notes merge"
msgstr "преуÑтановÑване на Ñливането на бележки"
-#: builtin/notes.c:857
+#: builtin/notes.c:853
+#, c-format
+msgid "A notes merge into %s is already in-progress at %s"
+msgstr "Ð’ момента Ñе извършва Ñливане на бележките в „%s“ при „%s“"
+
+#: builtin/notes.c:880
#, c-format
msgid "Object %s has no note\n"
msgstr "ÐÑма бележки за обекта „%s“\n"
-#: builtin/notes.c:869
+#: builtin/notes.c:892
msgid "attempt to remove non-existent note is not an error"
msgstr "опитът за изтриването на неÑъщеÑтвуваща бележка не Ñе Ñчита за грешка"
-#: builtin/notes.c:872
+#: builtin/notes.c:895
msgid "read object names from the standard input"
msgstr "изчитане на имената на обектите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
-#: builtin/notes.c:953
+#: builtin/notes.c:976
msgid "notes-ref"
msgstr "УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ"
-#: builtin/notes.c:954
+#: builtin/notes.c:977
msgid "use notes from <notes-ref>"
msgstr "да Ñе използва бележката Ñочена от този УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ"
-#: builtin/notes.c:989 builtin/remote.c:1618
+#: builtin/notes.c:1012 builtin/remote.c:1647
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Ðепозната подкоманда: %s"
#: builtin/pack-objects.c:28
-msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-"git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_ВЕРСИИ | < СПИСЪК_С_ОБЕКТИ]"
+"git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_УКÐЗÐТЕЛИ | < СПИСЪК_С_ОБЕКТИ]"
# FIXME [options] vs [options...]
#: builtin/pack-objects.c:29
-msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-"git pack-objects [ОПЦИЯ…] ПРЕФИКС_ÐÐ_ИМЕТО [< СПИСЪК_С_ВЕРСИИ | < "
+"git pack-objects [ОПЦИЯ…] ПРЕФИКС_ÐÐ_ИМЕТО [< СПИСЪК_С_УКÐЗÐТЕЛИ | < "
"СПИСЪК_С_ОБЕКТИ]"
#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
@@ -8295,167 +8790,157 @@ msgstr "неподдържана верÑÐ¸Ñ Ð½Ð° индекÑа „%s“"
msgid "bad index version '%s'"
msgstr "неправилна верÑÐ¸Ñ Ð½Ð° индекÑа „%s“"
-#: builtin/pack-objects.c:2595
-#, c-format
-msgid "option %s does not accept negative form"
-msgstr "опциÑта „%s“ не притежава отрицателна верÑиÑ"
-
-#: builtin/pack-objects.c:2599
-#, c-format
-msgid "unable to parse value '%s' for option %s"
-msgstr "неразпозната ÑтойноÑÑ‚ „%s“ за опциÑта „%s“"
-
-#: builtin/pack-objects.c:2619
+#: builtin/pack-objects.c:2602
msgid "do not show progress meter"
msgstr "без извеждане на напредъка"
-#: builtin/pack-objects.c:2621
+#: builtin/pack-objects.c:2604
msgid "show progress meter"
msgstr "извеждане на напредъка"
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2606
msgid "show progress meter during object writing phase"
msgstr "извеждане на напредъка във фазата на запазване на обектите"
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2609
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
"Ñъщото дейÑтвие като опциÑта „--all-progress“ при извеждането на напредъка"
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2610
msgid "version[,offset]"
msgstr "ВЕРСИЯ[,ОТМЕСТВÐÐЕ]"
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2611
msgid "write the pack index file in the specified idx format version"
msgstr ""
"запазване на индекÑа на пакетните файлове във форма̀та Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð°Ñ‚Ð° верÑиÑ"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2614
msgid "maximum size of each output pack file"
msgstr "макÑимален размер на вÑеки пакетен файл"
-#: builtin/pack-objects.c:2633
+#: builtin/pack-objects.c:2616
msgid "ignore borrowed objects from alternate object store"
msgstr "игнориране на обектите заети от други хранилища на обекти"
-#: builtin/pack-objects.c:2635
+#: builtin/pack-objects.c:2618
msgid "ignore packed objects"
msgstr "игнориране на пакетираните обекти"
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2620
msgid "limit pack window by objects"
msgstr "ограничаване на прозореца за пакетиране по брой обекти"
-#: builtin/pack-objects.c:2639
+#: builtin/pack-objects.c:2622
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"ограничаване на прозореца за пакетиране и по памет оÑвен по брой обекти"
-#: builtin/pack-objects.c:2641
+#: builtin/pack-objects.c:2624
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"макÑимална дължина на веригата от разлики, коÑто е позволена в Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»"
-#: builtin/pack-objects.c:2643
+#: builtin/pack-objects.c:2626
msgid "reuse existing deltas"
msgstr "преизползване на ÑъщеÑтвуващите разлики"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2628
msgid "reuse existing objects"
msgstr "преизползване на ÑъщеÑтвуващите обекти"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2630
msgid "use OFS_DELTA objects"
msgstr "използване на обекти „OFS_DELTA“"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2632
msgid "use threads when searching for best delta matches"
msgstr ""
"Ñтартиране на нишки за претърÑване на най-добрите ÑÑŠÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð½Ð° разликите"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2634
msgid "do not create an empty pack output"
msgstr "без Ñъздаване на празен пакетен файл"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2636
msgid "read revision arguments from standard input"
msgstr "изчитане на верÑиите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2638
msgid "limit the objects to those that are not yet packed"
msgstr "ограничаване до вÑе още непакетираните обекти"
-#: builtin/pack-objects.c:2658
+#: builtin/pack-objects.c:2641
msgid "include objects reachable from any reference"
msgstr ""
"включване на вÑички обекти, които могат да Ñе доÑтигнат от произволен "
"указател"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2644
msgid "include objects referred by reflog entries"
msgstr "включване и на обектите Ñочени от запиÑите в журнала на указателите"
-#: builtin/pack-objects.c:2664
+#: builtin/pack-objects.c:2647
msgid "include objects referred to by the index"
msgstr "включване и на обектите Ñочени от индекÑа"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2650
msgid "output pack to stdout"
msgstr "извеждане на пакета на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´"
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2652
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"включване и на обектите-етикети, които Ñочат към обектите, които ще бъдат "
"пакетирани"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2654
msgid "keep unreachable objects"
msgstr "запазване на недоÑтижимите обекти"
-#: builtin/pack-objects.c:2672 parse-options.h:139
+#: builtin/pack-objects.c:2655 parse-options.h:142
msgid "time"
msgstr "ВРЕМЕ"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2656
msgid "unpack unreachable objects newer than <time>"
msgstr "разпакетиране на недоÑтижимите обекти, които Ñа по-нови от това ВРЕМЕ"
-#: builtin/pack-objects.c:2676
+#: builtin/pack-objects.c:2659
msgid "create thin packs"
msgstr "Ñъздаване на Ñъкратени пакети"
-#: builtin/pack-objects.c:2678
+#: builtin/pack-objects.c:2661
msgid "create packs suitable for shallow fetches"
msgstr "пакетиране подходÑщо за плитко доÑтавÑне"
-#: builtin/pack-objects.c:2680
+#: builtin/pack-objects.c:2663
msgid "ignore packs that have companion .keep file"
msgstr "игнориране на пакетите, които Ñа придружени от файл „.keep“"
-#: builtin/pack-objects.c:2682
+#: builtin/pack-objects.c:2665
msgid "pack compression level"
msgstr "ниво на компреÑиране при пакетиране"
-#: builtin/pack-objects.c:2684
+#: builtin/pack-objects.c:2667
msgid "do not hide commits by grafts"
msgstr ""
"извеждане на вÑички родители — дори и тези, които нормално Ñа Ñкрити при "
"приÑажданиÑта"
-#: builtin/pack-objects.c:2686
+#: builtin/pack-objects.c:2669
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"използване на ÑъщеÑтвуващи индекÑи на база битови маÑки за уÑкорÑване на "
"преброÑването на обектите"
-#: builtin/pack-objects.c:2688
+#: builtin/pack-objects.c:2671
msgid "write a bitmap index together with the pack index"
msgstr ""
"запазване и на Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° база побитова маÑка, заедно Ñ Ð¸Ð½Ð´ÐµÐºÑа за пакета"
-#: builtin/pack-objects.c:2779
+#: builtin/pack-objects.c:2762
msgid "Counting objects"
msgstr "ПреброÑване на обектите"
@@ -8483,31 +8968,195 @@ msgstr "Изтриване на повтарÑщите Ñе обекти"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
-#: builtin/prune.c:105 builtin/worktree.c:112
+#: builtin/prune.c:105 builtin/worktree.c:124
msgid "do not remove, show only"
msgstr "Ñамо извеждане без дейÑтвително окаÑÑ‚Ñ€Ñне"
-#: builtin/prune.c:106 builtin/worktree.c:113
+#: builtin/prune.c:106 builtin/worktree.c:125
msgid "report pruned objects"
msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° окаÑтрените обекти"
-#: builtin/prune.c:109 builtin/worktree.c:115
+#: builtin/prune.c:109 builtin/worktree.c:127
msgid "expire objects older than <time>"
msgstr "окаÑÑ‚Ñ€Ñне на обектите по-Ñтари от това ВРЕМЕ"
-#: builtin/push.c:14
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "хранилище Ñ Ð²Ð°Ð¶Ð½Ð¸ обекти не може да Ñе окаÑÑ‚Ñ€Ñ"
+
+#: builtin/pull.c:69
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [ОПЦИЯ…] [ХРÐÐИЛИЩЕ [УКÐЗÐТЕЛ_ÐÐ_ВЕРСИЯ…]]"
+
+#: builtin/pull.c:113
+msgid "Options related to merging"
+msgstr "Опции при Ñливане"
+
+#: builtin/pull.c:116
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "внаÑÑне на промените чрез пребазиране, а не чрез Ñливане"
+
+#: builtin/pull.c:140 builtin/revert.c:105
+msgid "allow fast-forward"
+msgstr "позволÑване на тривиални ÑливаниÑ"
+
+#: builtin/pull.c:146
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "Проверка, че указаното подаване е Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð½Ð° GPG"
+
+#: builtin/pull.c:160
+msgid "Options related to fetching"
+msgstr "Опции при доÑтавÑне"
+
+#: builtin/pull.c:268
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "Ðеправилна ÑтойноÑÑ‚ за „pull.ff“: „%s“"
+
+#: builtin/pull.c:352
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+"Ðе можете да издърпвате при това пребазиране, защото има промени, които не "
+"Ñа в индекÑа"
+
+#: builtin/pull.c:358
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "ОÑвен това в индекÑа има неподадени промени."
+
+#: builtin/pull.c:360
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"Ðе можете да издърпвате при това пребазиране, защото в индекÑа има "
+"неподадени промени."
+
+#: builtin/pull.c:436
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+"Между указателите, които току що доÑтавихте, нÑма подходÑщ кандидат, върху "
+"който да пребазирате."
+
+#: builtin/pull.c:438
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+"Между указателите, които току що доÑтавихте, нÑма подходÑщ кандидат, който "
+"да Ñлеете."
+
+#: builtin/pull.c:439
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+"Ðай вероÑтно Ñте подали шаблон за указатели, който не е напаÑнал Ñ Ð½Ð¸Ñ‰Ð¾ в "
+"отдалеченото хранилище."
+
+#: builtin/pull.c:442
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+"ЗаÑвихте издърпване от отдалеченото хранилище „%s“, но не указахте клон.\n"
+"Понеже това не е хранилището по подразбиране на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½, Ñ‚Ñ€Ñбва\n"
+"да укажете Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ на ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´."
+
+#: builtin/pull.c:447
+msgid "You are not currently on a branch."
+msgstr "Извън вÑички клони."
+
+#: builtin/pull.c:449 builtin/pull.c:464
+msgid "Please specify which branch you want to rebase against."
+msgstr "Укажете върху кой клон иÑкате да пребазирате."
+
+#: builtin/pull.c:451 builtin/pull.c:466
+msgid "Please specify which branch you want to merge with."
+msgstr "Укажете кой клон иÑкате да Ñлеете."
+
+#: builtin/pull.c:452 builtin/pull.c:467
+msgid "See git-pull(1) for details."
+msgstr "За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ ръководÑтвото „git-pull(1)“"
+
+#: builtin/pull.c:462
+msgid "There is no tracking information for the current branch."
+msgstr "ТекущиÑÑ‚ клон не Ñледи никой."
+
+#: builtin/pull.c:471
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
+msgstr ""
+"Ðко вÑе пак иÑкате да зададете Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ñледен клон,\n"
+"можете да направите това Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð°:\n"
+"\n"
+" git branch --set-upstream-to=%s/СЛЕДЕÐ_КЛОР%s\n"
+"\n"
+
+#: builtin/pull.c:476
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"За Ñливане е указан отдалечениÑÑ‚ указател „%s“,\n"
+"но такъв не е доÑтавен."
+
+#: builtin/pull.c:830
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "ОбновÑване на вÑе още неÑъздаден клон Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ от индекÑа"
+
+#: builtin/pull.c:859
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"доÑтавÑнето обнови върха на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½. Работното\n"
+"ви копие бе тривиално ÑлÑто от подаване „%s“."
+
+#: builtin/pull.c:864
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+"Работното ви копие не може да бъде тривиално ÑлÑто.\n"
+"След като запазите вÑичко необходимо поÑочено от командата:\n"
+" $ git diff %s\n"
+"изпълнете:\n"
+" $ git reset --hard\n"
+"за връщане към нормално ÑÑŠÑтоÑние."
+
+#: builtin/pull.c:879
+msgid "Cannot merge multiple branches into empty head."
+msgstr "Ðе може да Ñливате множеÑтво клони в празен върхов указател."
+
+#: builtin/pull.c:883
+msgid "Cannot rebase onto multiple branches."
+msgstr "Ðе може да пребазирате върху повече от един клон."
+
+#: builtin/push.c:16
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [ОПЦИЯ…] [ХРÐÐИЛИЩЕ [УКÐЗÐТЕЛ_ÐÐ_ВЕРСИЯ…]]"
-#: builtin/push.c:85
+#: builtin/push.c:88
msgid "tag shorthand without <tag>"
msgstr "Ñъкращение за етикет без ЕТИКЕТ"
-#: builtin/push.c:95
+#: builtin/push.c:98
msgid "--delete only accepts plain target ref names"
msgstr "опциÑта „--delete“ приема за цел Ñамо проÑти имена на указатели"
-#: builtin/push.c:139
+#: builtin/push.c:142
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -8516,7 +9165,7 @@ msgstr ""
"За да включите тази Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° поÑтоÑнно, погледнете документациÑта за "
"наÑтройката „push.default“ в „git help config“."
-#: builtin/push.c:142
+#: builtin/push.c:145
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -8541,7 +9190,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:157
+#: builtin/push.c:160
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -8555,7 +9204,7 @@ msgstr ""
"\n"
" git push %s HEAD:ИМЕ_ÐÐ_ОТДÐЛЕЧЕÐИЯ_КЛОÐ\n"
-#: builtin/push.c:171
+#: builtin/push.c:174
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -8569,14 +9218,14 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:179
+#: builtin/push.c:182
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"ТекущиÑÑ‚ клон „%s“ Ñледи нÑколко отдалечени клона, не можете проÑто да "
"изтлаÑкате."
-#: builtin/push.c:182
+#: builtin/push.c:185
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -8588,7 +9237,7 @@ msgstr ""
"ТрÑбва да укажете ÐºÐ¾Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð´Ð° Ñе изтлаÑка, за обновÑване на Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ "
"клон."
-#: builtin/push.c:205
+#: builtin/push.c:208
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -8641,14 +9290,14 @@ msgstr ""
"Ðовата ÑтойноÑÑ‚ „simple“ бе въведена Ñ Ð²ÐµÑ€ÑÐ¸Ñ 1.7.11 на Git. Ðко понÑкога\n"
"ползвате Ñтари верÑии на Git, задайте ÑтойноÑÑ‚ „current“ вмеÑто „simple“."
-#: builtin/push.c:272
+#: builtin/push.c:275
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Ðе Ñте указали верÑÐ¸Ñ Ð·Ð° подаване, а наÑтройката „push.default“ е "
"„nothing“ (нищо без изрично указана верÑÐ¸Ñ Ð´Ð° не Ñе изтлаÑква)"
-#: builtin/push.c:279
+#: builtin/push.c:282
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -8662,7 +9311,7 @@ msgstr ""
"преди отново да изтлаÑкате промените. За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð²Ð¸Ð¶Ñ‚Ðµ раздела\n"
"„Note about fast-forwards“ в Ñтраницата от ръководÑтвото „git push --help“."
-#: builtin/push.c:285
+#: builtin/push.c:288
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -8675,7 +9324,7 @@ msgstr ""
"Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ раздела „Note about fast-forwards“ в Ñтраницата от\n"
"ръководÑтвото „git push --help“."
-#: builtin/push.c:291
+#: builtin/push.c:294
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -8694,14 +9343,14 @@ msgstr ""
"Ñтраницата\n"
"от ръководÑтвото „git push --help“."
-#: builtin/push.c:298
+#: builtin/push.c:301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"ИзтлаÑкването е отхвърлено, защото в отдалеченото хранилище ÑъщеÑтвува "
"етикет,\n"
"който ще припокриете Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚ от вашето хранилище."
-#: builtin/push.c:301
+#: builtin/push.c:304
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -8711,22 +9360,22 @@ msgstr ""
"указател, който вече Ñочи към обект, който не е подаване, както и тепърва\n"
"да го промените да Ñочи към подобен обект.\n"
-#: builtin/push.c:360
+#: builtin/push.c:363
#, c-format
msgid "Pushing to %s\n"
msgstr "ИзтлаÑкване към „%s“\n"
-#: builtin/push.c:364
+#: builtin/push.c:367
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "чаÑÑ‚ от указателите не бÑха изтлаÑкани към „%s“"
-#: builtin/push.c:394
+#: builtin/push.c:397
#, c-format
msgid "bad repository '%s'"
msgstr "неправилно указано хранилище „%s“"
-#: builtin/push.c:395
+#: builtin/push.c:398
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -8748,113 +9397,118 @@ msgstr ""
"\n"
" git push ИМЕ\n"
-#: builtin/push.c:410
+#: builtin/push.c:413
msgid "--all and --tags are incompatible"
msgstr "опциите „--all“ и „--tags“ Ñа неÑъвмеÑтими"
-#: builtin/push.c:411
+#: builtin/push.c:414
msgid "--all can't be combined with refspecs"
msgstr "опциÑта „--all“ е неÑъвмеÑтима Ñ ÑƒÐºÐ°Ð·Ð²Ð°Ð½ÐµÑ‚Ð¾ на верÑиÑ"
-#: builtin/push.c:416
+#: builtin/push.c:419
msgid "--mirror and --tags are incompatible"
msgstr "опциите „--mirror“ и „--tags“ Ñа неÑъвмеÑтими"
-#: builtin/push.c:417
+#: builtin/push.c:420
msgid "--mirror can't be combined with refspecs"
msgstr "опциÑта „--mirror“ е неÑъвмеÑтима Ñ ÑƒÐºÐ°Ð·Ð²Ð°Ð½ÐµÑ‚Ð¾ на верÑиÑ"
-#: builtin/push.c:422
+#: builtin/push.c:425
msgid "--all and --mirror are incompatible"
msgstr "опциите „--all“ и „--mirror“ Ñа неÑъвмеÑтими"
-#: builtin/push.c:502
+#: builtin/push.c:537
msgid "repository"
msgstr "хранилище"
-#: builtin/push.c:503
+#: builtin/push.c:538 builtin/send-pack.c:161
msgid "push all refs"
msgstr "изтлаÑкване на вÑички указатели"
-#: builtin/push.c:504
+#: builtin/push.c:539 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "огледално копие на вÑички указатели"
-#: builtin/push.c:506
+#: builtin/push.c:541
msgid "delete refs"
msgstr "изтриване на указателите"
-#: builtin/push.c:507
+#: builtin/push.c:542
msgid "push tags (can't be used with --all or --mirror)"
msgstr "изтлаÑкване на етикетите (неÑъвмеÑтимо Ñ Ð¾Ð¿Ñ†Ð¸Ð¸Ñ‚Ðµ „--all“ и „--mirror“)"
-#: builtin/push.c:510
+#: builtin/push.c:545 builtin/send-pack.c:164
msgid "force updates"
msgstr "принудително обновÑване"
# FIXME double check this
-#: builtin/push.c:512
+#: builtin/push.c:547 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "УКÐЗÐТЕЛ>:<ОЧÐКВÐÐÐ_СТОЙÐОСТ"
-#: builtin/push.c:513
+#: builtin/push.c:548 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "УКÐЗÐТЕЛÑÑ‚ Ñ‚Ñ€Ñбва първоначално да е Ñ Ñ‚Ð°Ð·Ð¸ ОЧÐКВÐÐÐ_СТОЙÐОСТ"
-#: builtin/push.c:516
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr "„check“ (проверка), „on-demand“ (при нужда) или „no“ (без)"
+
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr "управление на рекурÑивното изтлаÑкване на подмодулите"
-#: builtin/push.c:518
+#: builtin/push.c:553 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "използване на Ñъкратени пакети"
-#: builtin/push.c:519 builtin/push.c:520
+#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
+#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "програма за получаването на пакети"
-#: builtin/push.c:521
+#: builtin/push.c:556
msgid "set upstream for git pull/status"
msgstr "задаване на отдалеченото хранилище за командите „git pull/status“"
-#: builtin/push.c:524
+#: builtin/push.c:559
msgid "prune locally removed refs"
msgstr "окаÑÑ‚Ñ€Ñне на указателите, които Ñа премахнати от локалното хранилище"
-#: builtin/push.c:526
+#: builtin/push.c:561
msgid "bypass pre-push hook"
msgstr "без изпълнение на куката преди изтлаÑкване (pre-push)"
-#: builtin/push.c:527
+#: builtin/push.c:562
msgid "push missing but relevant tags"
msgstr ""
"изтлаÑкване на липÑващите в отдалеченото хранилище, но Ñвързани Ñ Ñ‚ÐµÐºÑƒÑ‰Ð¾Ñ‚Ð¾ "
"изтлаÑкване, етикети"
-#: builtin/push.c:529
+#: builtin/push.c:565 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "подпиÑване на изтлаÑкването Ñ GPG"
-#: builtin/push.c:530
+#: builtin/push.c:567 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "изиÑкване на атомарни операции от отÑрещната Ñтрана"
-#: builtin/push.c:539
+#: builtin/push.c:577
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
"опциÑта „--delete“ е неÑъвмеÑтима Ñ Ð¾Ð¿Ñ†Ð¸Ð¸Ñ‚Ðµ „--all“, „--mirror“ и „--tags“"
-#: builtin/push.c:541
+#: builtin/push.c:579
msgid "--delete doesn't make sense without any refs"
msgstr "опциÑта „--delete“ изиÑква поне един указател на верÑиÑ"
#: builtin/read-tree.c:37
msgid ""
-"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=ПРЕФИКС] "
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=ПРЕФИКС) "
"[-u [--exclude-per-directory=ФÐЙЛ_С_ИЗКЛЮЧЕÐИЯ] | -i]] [--no-sparse-"
"checkout] [--index-output=ФÐЙЛ] (--empty | УКÐЗÐТЕЛ_КЪМ_ДЪРВО_1 "
"[УКÐЗÐТЕЛ_КЪМ_ДЪРВО_2 [УКÐЗÐТЕЛ_КЪМ_ДЪРВО_3]])"
@@ -8924,12 +9578,12 @@ msgid "debug unpack-trees"
msgstr "изчиÑтване на грешки в командата „unpack-trees“"
# FIXME
-#: builtin/reflog.c:430
+#: builtin/reflog.c:428
#, c-format
-msgid "%s' for '%s' is not a valid timestamp"
+msgid "'%s' for '%s' is not a valid timestamp"
msgstr "„%s“ не е правилна ÑтойноÑÑ‚ за време за „%s“"
-#: builtin/reflog.c:547 builtin/reflog.c:552
+#: builtin/reflog.c:545 builtin/reflog.c:550
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "„%s“ не е правилна ÑтойноÑÑ‚ за време"
@@ -8946,15 +9600,15 @@ msgstr ""
"git remote add [-t КЛОÐ] [-m ОСÐОВЕÐ_КЛОÐ] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] ИМЕ ÐДРЕС"
-#: builtin/remote.c:14 builtin/remote.c:33
+#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
msgstr "git remote rename СТÐРО_ИМЕ ÐОВО_ИМЕ"
-#: builtin/remote.c:15 builtin/remote.c:38
+#: builtin/remote.c:15 builtin/remote.c:39
msgid "git remote remove <name>"
msgstr "git remote remove ИМЕ"
-#: builtin/remote.c:16 builtin/remote.c:43
+#: builtin/remote.c:16 builtin/remote.c:44
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head ИМЕ (-a | --auto | -d | --delete | КЛОÐ)"
@@ -8977,49 +9631,53 @@ msgstr ""
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] ИМЕ КЛОÐ…"
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] ИМЕ"
+
+#: builtin/remote.c:22 builtin/remote.c:75
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] ИМЕ ÐОВ_ÐДРЕС [СТÐР_ÐДРЕС]"
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add ИМЕ ÐОВ_ÐДРЕС"
-#: builtin/remote.c:23 builtin/remote.c:71
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete ИМЕ ÐДРЕС"
-#: builtin/remote.c:28
+#: builtin/remote.c:29
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [ОПЦИЯ…] ИМЕ ÐДРЕС"
-#: builtin/remote.c:48
+#: builtin/remote.c:49
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches ИМЕ КЛОÐ…"
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add ИМЕ КЛОÐ…"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote show [<options>] <name>"
msgstr "git remote show [ОПЦИЯ…] ИМЕ"
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [ОПЦИЯ…] ИМЕ"
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [ОПЦИЯ…] [ГРУПР| ОТДÐЛЕЧЕÐО_ХРÐÐИЛИЩЕ]…"
-#: builtin/remote.c:88
+#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
msgstr "ОбновÑване на „%s“"
# FIXME tabulator
-#: builtin/remote.c:120
+#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -9027,101 +9685,101 @@ msgstr ""
"Използването Ñамо на „--mirror“ е опаÑно. ВмеÑто това\n"
"ползвайте „--mirror=fetch“ или „--mirror=push“"
-#: builtin/remote.c:137
+#: builtin/remote.c:143
#, c-format
msgid "unknown mirror argument: %s"
msgstr "неправилна ÑтойноÑÑ‚ за „--mirror“: %s"
-#: builtin/remote.c:153
+#: builtin/remote.c:159
msgid "fetch the remote branches"
msgstr "отдалечените клони не могат да бъдат доÑтавени"
-#: builtin/remote.c:155
+#: builtin/remote.c:161
msgid "import all tags and associated objects when fetching"
msgstr "внаÑÑне на вÑички етикети и принадлежащите им обекти при доÑтавÑне"
-#: builtin/remote.c:158
+#: builtin/remote.c:164
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "може и да не Ñе доÑтавÑÑ‚ никакви етикети (чрез опциÑта „--no-tags“)"
-#: builtin/remote.c:160
+#: builtin/remote.c:166
msgid "branch(es) to track"
msgstr "клон/и за Ñледене"
-#: builtin/remote.c:161
+#: builtin/remote.c:167
msgid "master branch"
msgstr "оÑновен клон"
-#: builtin/remote.c:162
+#: builtin/remote.c:168
msgid "push|fetch"
msgstr "издърпване|доÑтавÑне"
-#: builtin/remote.c:163
+#: builtin/remote.c:169
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
"наÑтройване на отдалечено хранилище, от което да Ñе издърпва или доÑтавÑ"
-#: builtin/remote.c:175
+#: builtin/remote.c:181
msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
"нÑма ÑмиÑъл да Ñе указва оÑновен клон при използване на опциÑта „--mirror“"
-#: builtin/remote.c:177
+#: builtin/remote.c:183
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"указването на Ñледени клони е ÑмиÑлено Ñамо за отдалечени хранилища, от "
"които Ñе доÑтавÑ"
-#: builtin/remote.c:187 builtin/remote.c:640
+#: builtin/remote.c:193 builtin/remote.c:643
#, c-format
msgid "remote %s already exists."
msgstr "вече ÑъщеÑтвува отдалечено хранилище Ñ Ð¸Ð¼Ðµ „%s“."
-#: builtin/remote.c:191 builtin/remote.c:644
+#: builtin/remote.c:197 builtin/remote.c:647
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "„%s“ е неправилно име за отдалечено хранилище"
-#: builtin/remote.c:235
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "ОÑновниÑÑ‚ клон „%s“ не може да бъде наÑтроен"
-#: builtin/remote.c:335
+#: builtin/remote.c:341
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Обектите за доÑтавÑне за ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€ž%s“ не могат да бъдат получени"
-#: builtin/remote.c:436 builtin/remote.c:444
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr "(Ñъвпадащи)"
-#: builtin/remote.c:448
+#: builtin/remote.c:454
msgid "(delete)"
msgstr "(за изтриване)"
-#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "„%s“ не може да Ñе добави към „%s“"
-#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
#, c-format
msgid "No such remote: %s"
msgstr "Такова отдалечено хранилище нÑма: %s"
-#: builtin/remote.c:650
+#: builtin/remote.c:653
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Разделът „%s“ в наÑтройките не може да бъде преименуван на „%s“"
-#: builtin/remote.c:656 builtin/remote.c:844
+#: builtin/remote.c:659 builtin/remote.c:827
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Разделът „%s“ в наÑтройките не може да бъде изтрит"
# FIXME tabulator
-#: builtin/remote.c:671
+#: builtin/remote.c:674
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9132,32 +9790,27 @@ msgstr ""
" %s\n"
" Променете наÑтройките ръчно, ако е необходимо."
-#: builtin/remote.c:677
+#: builtin/remote.c:680
#, c-format
msgid "Could not append '%s'"
msgstr "Разделът „%s“ не може да бъде добавен в наÑтройките"
-#: builtin/remote.c:688
+#: builtin/remote.c:691
#, c-format
msgid "Could not set '%s'"
msgstr "Разделът „%s“ не може да бъде зададен в наÑтройките"
-#: builtin/remote.c:710
+#: builtin/remote.c:713
#, c-format
msgid "deleting '%s' failed"
msgstr "неуÑпешно изтриване на „%s“"
-#: builtin/remote.c:744
+#: builtin/remote.c:747
#, c-format
msgid "creating '%s' failed"
msgstr "неуÑпешно Ñъздаване на „%s“"
-#: builtin/remote.c:763
-#, c-format
-msgid "Could not remove branch %s"
-msgstr "Клонът „%s“ не може да бъде изтрит"
-
-#: builtin/remote.c:830
+#: builtin/remote.c:813
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9171,125 +9824,125 @@ msgstr[1] ""
"Бележка: ÐÑколко клона извън йерархиÑта „refs/remotes/“ не бÑха изтрити.\n"
"Изтрийте ги чрез командата:"
-#: builtin/remote.c:945
+#: builtin/remote.c:928
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " нов (Ñледващото доÑтавÑне ще го разположи в „remotes/%s“)"
-#: builtin/remote.c:948
+#: builtin/remote.c:931
msgid " tracked"
msgstr " Ñледен"
-#: builtin/remote.c:950
+#: builtin/remote.c:933
msgid " stale (use 'git remote prune' to remove)"
msgstr " Ñтар (изтрийте чрез „git remote prune“)"
# FIXME
-#: builtin/remote.c:952
+#: builtin/remote.c:935
msgid " ???"
msgstr " неÑÑно ÑÑŠÑтоÑние"
# CHECK
-#: builtin/remote.c:993
+#: builtin/remote.c:976
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
"неправилен клон за Ñливане „%s“. Ðевъзможно е да пребазирате върху повече от "
"1 клон"
-#: builtin/remote.c:1000
+#: builtin/remote.c:983
#, c-format
msgid "rebases onto remote %s"
msgstr "пребазиране върху Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“"
-#: builtin/remote.c:1003
+#: builtin/remote.c:986
#, c-format
msgid " merges with remote %s"
msgstr " Ñливане Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“"
-#: builtin/remote.c:1004
+#: builtin/remote.c:987
msgid " and with remote"
msgstr " и Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/remote.c:1006
+#: builtin/remote.c:989
#, c-format
msgid "merges with remote %s"
msgstr "Ñливане Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“"
-#: builtin/remote.c:1007
+#: builtin/remote.c:990
msgid " and with remote"
msgstr " и Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/remote.c:1053
+#: builtin/remote.c:1036
msgid "create"
msgstr "Ñъздаден"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1039
msgid "delete"
msgstr "изтрит"
-#: builtin/remote.c:1060
+#: builtin/remote.c:1043
msgid "up to date"
msgstr "актуален"
-#: builtin/remote.c:1063
+#: builtin/remote.c:1046
msgid "fast-forwardable"
msgstr "може да Ñе Ñлее тривиално"
-#: builtin/remote.c:1066
+#: builtin/remote.c:1049
msgid "local out of date"
msgstr "локалниÑÑ‚ е изоÑтанал"
-#: builtin/remote.c:1073
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s принудително изтлаÑква към %-*s (%s)"
-#: builtin/remote.c:1076
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s изтлаÑква към %-*s (%s)"
-#: builtin/remote.c:1080
+#: builtin/remote.c:1063
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s принудително изтлаÑква към %s"
-#: builtin/remote.c:1083
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s изтлаÑква към %s"
-#: builtin/remote.c:1151
+#: builtin/remote.c:1134
msgid "do not query remotes"
msgstr "без заÑвки към отдалечените хранилища"
-#: builtin/remote.c:1178
+#: builtin/remote.c:1161
#, c-format
msgid "* remote %s"
msgstr "◠отдалечено хранилище „%s“"
-#: builtin/remote.c:1179
+#: builtin/remote.c:1162
#, c-format
msgid " Fetch URL: %s"
msgstr " ÐÐ´Ñ€ÐµÑ Ð·Ð° доÑтавÑне: %s"
-#: builtin/remote.c:1180 builtin/remote.c:1331
+#: builtin/remote.c:1163 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(без адреÑ)"
# FIXME spaces betwen Push and URL
-#: builtin/remote.c:1189 builtin/remote.c:1191
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr " ÐÐ´Ñ€ÐµÑ Ð·Ð° изтлаÑкване: %s"
-#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr " клон Ñочен от HEAD: %s"
-#: builtin/remote.c:1199
+#: builtin/remote.c:1182
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -9298,146 +9951,159 @@ msgstr ""
"хранилище е\n"
" нееднозначен и е нÑкой от Ñледните):\n"
-#: builtin/remote.c:1211
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Отдалечен клон:%s"
msgstr[1] " Отдалечени клони:%s"
-#: builtin/remote.c:1214 builtin/remote.c:1241
+#: builtin/remote.c:1197 builtin/remote.c:1224
msgid " (status not queried)"
msgstr " (ÑÑŠÑтоÑнието не бе проверено)"
-#: builtin/remote.c:1223
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Локален клон наÑтроен за издърпване чрез „git pull“:"
msgstr[1] " Локални клони наÑтроени за издърпване чрез „git pull“:"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локалните указатели ще бъдат пренеÑени чрез „ push“"
-#: builtin/remote.c:1238
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " ЛокалниÑÑ‚ указател, наÑтроен за „git push“%s:"
msgstr[1] " Локалните указатели, наÑтроени за „git push“%s:"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "задаване на refs/remotes/ИМЕ/HEAD Ñпоред отдалеченото хранилище"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
-#: builtin/remote.c:1276
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "Ðе може да Ñе уÑтанови отдалечениÑÑ‚ връх"
-#: builtin/remote.c:1278
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"МножеÑтво клони Ñ Ð²ÑŠÑ€Ñ…Ð¾Ð²Ðµ. Изберете изрично нÑкой от Ñ‚ÑÑ… чрез командата:"
-#: builtin/remote.c:1288
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "„%s“ не може да бъде изтрит"
-#: builtin/remote.c:1296
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "Ðеправилен указател: %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "„%s“ не може да Ñе наÑтрои"
-#: builtin/remote.c:1316
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr "„%s“ ще Ñе превърне в обект извън клоните!"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr "„%s“ Ñе превърна в обект извън клоните!"
-#: builtin/remote.c:1327
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "ОкаÑÑ‚Ñ€Ñне на „%s“"
-#: builtin/remote.c:1328
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "адреÑ: %s"
-#: builtin/remote.c:1351
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " â— [ще бъде окаÑтрено] %s"
-#: builtin/remote.c:1354
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " â— [окаÑтрено] %s"
-#: builtin/remote.c:1399
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "окаÑÑ‚Ñ€Ñне на огледалата на отдалечените хранилища Ñлед доÑтавÑне"
-#: builtin/remote.c:1465 builtin/remote.c:1539
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
#, c-format
msgid "No such remote '%s'"
msgstr "ÐÑма отдалечено хранилище на име „%s“"
-#: builtin/remote.c:1485
+#: builtin/remote.c:1461
msgid "add branch"
msgstr "добавÑне на клон"
-#: builtin/remote.c:1492
+#: builtin/remote.c:1468
msgid "no remote specified"
msgstr "не е указано отдалечено хранилище"
-#: builtin/remote.c:1514
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr "запитване към адреÑите за изтлаÑкване, а не за доÑтавÑне"
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr "извеждане на вÑички адреÑи"
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "не е зададен Ð°Ð´Ñ€ÐµÑ Ð·Ð° отдалеченото хранилище „%s“"
+
+#: builtin/remote.c:1541
msgid "manipulate push URLs"
msgstr "промÑна на адреÑите за изтлаÑкване"
-#: builtin/remote.c:1516
+#: builtin/remote.c:1543
msgid "add URL"
msgstr "добавÑне на адреÑи"
-#: builtin/remote.c:1518
+#: builtin/remote.c:1545
msgid "delete URLs"
msgstr "изтриване на адреÑи"
# FIXME message - incompatible
-#: builtin/remote.c:1525
+#: builtin/remote.c:1552
msgid "--add --delete doesn't make sense"
msgstr "опциите „--add“ и „--delete“ Ñа неÑъвмеÑтими"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1592
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Ðеправилен (Ñтар) формат за адреÑ: %s"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1600
#, c-format
msgid "No such URL found: %s"
msgstr "Такъв Ð°Ð´Ñ€ÐµÑ Ð½Ðµ е открит: %s"
# FIXME CHECK MEANING
-#: builtin/remote.c:1575
+#: builtin/remote.c:1602
msgid "Will not delete all non-push URLs"
msgstr "Ðикой от адреÑите, които не Ñа за изтлаÑкване, нÑма да Ñе изтрие"
-#: builtin/remote.c:1589
+#: builtin/remote.c:1616
msgid "be verbose; must be placed before a subcommand"
msgstr "повече подробноÑти. ПоÑÑ‚Ð°Ð²Ñ Ñе пред подкоманда"
@@ -9518,7 +10184,11 @@ msgstr "макÑимален размер на вÑеки пакет"
msgid "repack objects in packs marked with .keep"
msgstr "препакетиране на обектите в пакети белÑзани Ñ â€ž.keep“"
-#: builtin/repack.c:377
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "пакетите в хранилище Ñ Ð²Ð°Ð¶Ð½Ð¸ обекти не може да Ñе триÑÑ‚"
+
+#: builtin/repack.c:381
#, c-format
msgid "removing '%s' failed"
msgstr "неуÑпешно изтриване на „%s“"
@@ -9613,7 +10283,7 @@ msgstr "използване на този ФОРМÐТ"
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget ПЪТ… | status | remaining | diff | gc]"
-#: builtin/rerere.c:57
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "региÑтриране на чиÑти корекции на конфликти в индекÑа"
@@ -9706,11 +10376,6 @@ msgstr ""
msgid "Failed to resolve '%s' as a valid revision."
msgstr "СтойноÑтта „%s“ не е разпозната като ÑъщеÑтвуваща верÑиÑ."
-#: builtin/reset.c:308 builtin/reset.c:316
-#, c-format
-msgid "Could not parse object '%s'."
-msgstr "„%s“ не е разпознат като обект."
-
#: builtin/reset.c:313
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
@@ -9754,19 +10419,23 @@ msgstr "ИндекÑÑŠÑ‚ не може да бъде занулен към веÑ
msgid "Could not write new index file."
msgstr "ÐовиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запиÑан."
-#: builtin/rev-parse.c:361
+#: builtin/rev-list.c:354
+msgid "rev-list does not support display of notes"
+msgstr "командата „rev-list“ не поддържа извеждането на бележки"
+
+#: builtin/rev-parse.c:358
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [ÐРГУМЕÐТ…]"
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
msgstr "зададениÑÑ‚ низ „--“ да Ñе тълкува като аргумент"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
msgstr "Ñпиране на анализа Ñлед Ð¿ÑŠÑ€Ð²Ð¸Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚, който не е опциÑ"
-#: builtin/rev-parse.c:371
+#: builtin/rev-parse.c:368
msgid "output in stuck long form"
msgstr "изход в Ð´ÑŠÐ»Ð³Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚"
@@ -9812,7 +10481,7 @@ msgstr "завършване на поредица от Ð¾Ñ‚Ð±Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð¸Ð»Ð
#: builtin/revert.c:81
msgid "resume revert or cherry-pick sequence"
-msgstr "завършване на поредица от Ð¾Ñ‚Ð±Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ отмени на подаваниÑ"
+msgstr "продължаване на поредица от Ð¾Ñ‚Ð±Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ отмени на подаваниÑ"
#: builtin/revert.c:82
msgid "cancel revert or cherry-pick sequence"
@@ -9846,10 +10515,6 @@ msgstr "Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° ÑтратегиÑта на Ñливане"
msgid "append commit name"
msgstr "добавÑне на името на подаването"
-#: builtin/revert.c:105
-msgid "allow fast-forward"
-msgstr "позволÑване на тривиални ÑливаниÑ"
-
#: builtin/revert.c:106
msgid "preserve initially empty commits"
msgstr "запазване на първоначално празните подаваниÑ"
@@ -9985,6 +10650,33 @@ msgstr "без използването на опциÑта „-r“ „%s“ н
msgid "git rm: unable to remove %s"
msgstr "git rm: „%s“ не може да Ñе изтрие"
+#: builtin/send-pack.c:18
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+" --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-"
+"pack=ПÐКЕТ] [--verbose] [--thin] [--atomic] [ХОСТ:]ДИРЕКТОРИЯ [УКÐЗÐТЕЛ…]\n"
+" опциÑта „--all“ и изричното поÑочване на УКÐЗÐТЕЛ Ñа взаимно неÑъвмеÑтими."
+
+#: builtin/send-pack.c:160
+msgid "remote name"
+msgstr "име на отдалечено хранилище"
+
+#: builtin/send-pack.c:171
+msgid "use stateless RPC protocol"
+msgstr "използване на протокол без запазване на ÑÑŠÑтоÑнието за RPC"
+
+#: builtin/send-pack.c:172
+msgid "read refs from stdin"
+msgstr "четене на указателите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
+
+#: builtin/send-pack.c:173
+msgid "print status from remote helper"
+msgstr "извеждане на ÑÑŠÑтоÑнието от отдалечената помощна функциÑ"
+
#: builtin/shortlog.c:13
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [ОПЦИЯ…] [ДИÐПÐЗОÐ_ÐÐ_ВЕРСИИТЕ] [[--] [ПЪТ…]]"
@@ -10017,7 +10709,7 @@ msgstr ""
"ПренаÑÑне на редовете до тази обща ШИРОЧИÐÐ (76), Ñ ÐžÐ¢Ð¡Ð¢ÐªÐŸ_1 (6) за Ð¿ÑŠÑ€Ð²Ð¸Ñ "
"ред и ОТСТЪП_2 (9) за оÑтаналите"
-#: builtin/show-branch.c:9
+#: builtin/show-branch.c:10
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -10029,73 +10721,73 @@ msgstr ""
" [--more=БРОЙ | --list | --independent | --merge-base]\n"
" [--no-name | --sha1-name] [--topics] [(РЕВИЗИЯ | УКÐЗÐТЕЛ)…]"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=БРОЙ[,БÐЗÐ]] [--list] [УКÐЗÐТЕЛ]"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
msgstr "извеждане на ÑледÑщите и локалните клони"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
msgstr "извеждане на ÑледÑщите клони"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
msgstr "оцветÑване на „*!+-“ Ñпоред клоните"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:646
msgid "show <n> more commits after the common ancestor"
msgstr "извеждане на такъв БРОЙ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð¾Ñ‚ Ð¾Ð±Ñ‰Ð¸Ñ Ð¿Ñ€ÐµÐ´ÑˆÐµÑтвеник"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:648
msgid "synonym to more=-1"
msgstr "Ñиноним на „more=-1“"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:649
msgid "suppress naming strings"
msgstr "без низове за имената на клоните"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:651
msgid "include the current branch"
msgstr "включване и на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:653
msgid "name commits with their object names"
msgstr "именуване на подаваниÑта Ñ Ð¸Ð¼ÐµÐ½Ð°Ñ‚Ð° им на обекти"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:655
msgid "show possible merge bases"
msgstr "извеждане на възможните бази за ÑливаниÑ"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
msgstr "извеждане на недоÑтижимите указатели"
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:659
msgid "show commits in topological order"
msgstr "извеждане на подаваниÑта в топологичеÑка подредба"
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:662
msgid "show only commits not on the first branch"
msgstr "извеждане Ñамо на подаваниÑта, които не Ñа от Ð¿ÑŠÑ€Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/show-branch.c:683
+#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
msgstr "извеждане на ÑливаниÑта, които могат да Ñе доÑтигнат Ñамо от един връх"
-#: builtin/show-branch.c:685
+#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
msgstr ""
"топологичеÑка подредба, при запазване на подредбата по дата, доколкото е\n"
"възможно"
-#: builtin/show-branch.c:688
+#: builtin/show-branch.c:669
msgid "<n>[,<base>]"
msgstr "БРОЙ[,БÐЗÐ]"
-#: builtin/show-branch.c:689
+#: builtin/show-branch.c:670
msgid "show <n> most recent ref-log entries starting at base"
msgstr "показване на най-много БРОЙ журнални запиÑа Ñ Ð½Ð°Ñ‡Ð°Ð»Ð¾ Ñъответната БÐЗÐ"
@@ -10108,47 +10800,138 @@ msgstr ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=ЧИСЛО]] [--abbrev[=ЧИСЛО]] [--tags] [--heads] [--] [ШÐБЛОÐ…]"
-# FIXME pattern & ref-list must be in <>
#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=pattern] < ref-list"
-msgstr "git show-ref --exclude-existing[=ШÐБЛОÐ] < СПИСЪК_С_УКÐЗÐТЕЛИ"
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=ШÐБЛОÐ]"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
msgstr "извеждане на етикетите (може да Ñе комбинира Ñ Ð²ÑŠÑ€Ñ…Ð¾Ð²ÐµÑ‚Ðµ)"
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
msgstr "извеждане на върховете (може да Ñе комбинира Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚Ð¸Ñ‚Ðµ)"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
msgstr "Ñтрога проверка на указателите, изиÑква Ñе указател Ñ Ð¿ÑŠÐ»ÐµÐ½ път"
-#: builtin/show-ref.c:175 builtin/show-ref.c:177
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "задължително извеждане и на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ HEAD"
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:174
msgid "dereference tags into object IDs"
msgstr "да Ñе извеждат идентификаторите на обектите-етикети"
-#: builtin/show-ref.c:181
+#: builtin/show-ref.c:176
msgid "only show SHA1 hash using <n> digits"
msgstr "извеждане Ñамо на този БРОЙ цифри от вÑÑка Ñума по SHA1"
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:180
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"без извеждане на резултатите на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´ (полезно Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--"
"verify“)"
-#: builtin/show-ref.c:187
+#: builtin/show-ref.c:182
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"извеждане на указателите приети от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´, които липÑват в "
"локалното хранилище"
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr "пропуÑкане на вÑички редове, които започват Ñ â€ž#“"
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr "добавÑне на „# “ на вÑеки ред"
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° определÑнето на отноÑителните пътища"
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name ПЪТ"
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "Във файла „.gitmodules“ липÑва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ð¿ÑŠÑ‚Ñ â€ž%s“"
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr "къде да Ñе клонира новиÑÑ‚ подмодул"
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr "име на Ð½Ð¾Ð²Ð¸Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»"
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr "адреÑ, от който да Ñе клонира новиÑÑ‚ подмодул"
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr "дълбочина на плитките хранилища"
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+msgstr ""
+"git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРÐÐИЛИЩЕ] "
+"[--name ИМЕ] [--url ÐДРЕС][--depth ДЪЛБОЧИÐÐ] [--] ПЪТ…]"
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "ДиректориÑта „%s“ не може да бъде Ñъздадена"
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "ÐеуÑпешно клониране на адреÑа „%s“ в Ð¿ÑŠÑ‚Ñ â€ž%s“ като подмодул"
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr "файлът „%s“ не може да бъде отворен"
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr "файлът „%s“ не може да Ñе затвори"
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "директориÑта на подмодула „%s“ не може да бъде получена"
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr "ФÐТÐЛÐРГРЕШКÐ: „submodule--helper“ Ñ‚Ñ€Ñбва да Ñе Ñтартира Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr "ФÐТÐЛÐРГРЕШКÐ: „%s“ не е подкоманда на „submodule--helper“"
+
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [ОПЦИЯ…] ИМЕ [УКÐЗÐТЕЛ]"
@@ -10169,15 +10952,15 @@ msgstr "изтриване на Ñимволен указател"
msgid "shorten ref output"
msgstr "кратка Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° указателÑ"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "причина"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "причина за обновÑването"
-#: builtin/tag.c:22
+#: builtin/tag.c:23
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
@@ -10185,49 +10968,44 @@ msgstr ""
"git tag [-a | -s | -u ИДЕÐТИФИКÐТОР_ÐÐ_КЛЮЧ] [-f] [-m СЪОБЩЕÐИЕ | -F ФÐЙЛ] "
"ЕТИКЕТ [ВРЪХ]"
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid "git tag -d <tagname>..."
msgstr "git tag -d ЕТИКЕТ…"
# FIXME tabulator
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[<pattern>...]"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-"git tag -l [-nБРОЙ] [--contains ПОДÐÐ’ÐÐЕ] [--points-at ОБЕКТ] \n"
-" [ШÐБЛОÐ…]"
+"git tag -l [-nБРОЙ] [--contains ПОДÐÐ’ÐÐЕ] [--points-at ОБЕКТ]\n"
+" [--format=ФОРМÐТ] [--[no-]merged [ПОДÐÐ’ÐÐЕ]] [ШÐБЛОÐ…]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -v <tagname>..."
msgstr "git tag -v ЕТИКЕТ…"
-#: builtin/tag.c:69
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "обект ÑÑŠÑ Ñгрешен формат при „%s“"
-
-#: builtin/tag.c:301
+#: builtin/tag.c:80
#, c-format
msgid "tag name too long: %.*s..."
msgstr "името на етикета е твърде дълго: „%.*s“…"
-#: builtin/tag.c:306
+#: builtin/tag.c:85
#, c-format
msgid "tag '%s' not found."
msgstr "етикетът „%s“ не е открит."
-#: builtin/tag.c:321
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n"
-#: builtin/tag.c:333
+#: builtin/tag.c:112
#, c-format
msgid "could not verify the tag '%s'"
msgstr "етикетът „%s“ не може да бъде проверен"
-#: builtin/tag.c:343
+#: builtin/tag.c:122
#, c-format
msgid ""
"\n"
@@ -10240,7 +11018,7 @@ msgstr ""
" %s\n"
"Редовете, които започват Ñ â€ž%c“, ще бъдат пропуÑнати.\n"
-#: builtin/tag.c:347
+#: builtin/tag.c:126
#, c-format
msgid ""
"\n"
@@ -10255,157 +11033,145 @@ msgstr ""
"Редовете, които започват Ñ â€ž%c“, Ñъщо ще бъдат включени — може да ги "
"изтриете вие.\n"
-#: builtin/tag.c:371
-#, c-format
-msgid "unsupported sort specification '%s'"
-msgstr "зададена е неподдържана подредба „%s“"
-
-#: builtin/tag.c:373
-#, c-format
-msgid "unsupported sort specification '%s' in variable '%s'"
-msgstr "зададена е неподдържана подредба „%s“ в променливата „%s“"
-
-#: builtin/tag.c:428
+#: builtin/tag.c:199
msgid "unable to sign the tag"
msgstr "етикетът не може да бъде подпиÑан"
-#: builtin/tag.c:430
+#: builtin/tag.c:201
msgid "unable to write tag file"
msgstr "файлът за етикета не може да бъде запазен"
-#: builtin/tag.c:455
+#: builtin/tag.c:226
msgid "bad object type."
msgstr "неправилен вид обект."
-#: builtin/tag.c:468
+#: builtin/tag.c:239
msgid "tag header too big."
msgstr "заглавната чаÑÑ‚ на етикета е прекалено дълга."
# FIXME - why the ? - either we need to specify or not or it is good to specify
-#: builtin/tag.c:504
+#: builtin/tag.c:275
msgid "no tag message?"
msgstr "липÑва Ñъобщение за етикета"
-#: builtin/tag.c:510
+#: builtin/tag.c:281
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Съобщението за етикета е запазено във файла „%s“\n"
-# FIXME - the name of the option '--points-at'
-#: builtin/tag.c:559
-msgid "switch 'points-at' requires an object"
-msgstr "опциÑта „--points-at“ изиÑква аргумент-обект"
-
-#: builtin/tag.c:561
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "неправилно име на обект „%s“"
-
-#: builtin/tag.c:589
+#: builtin/tag.c:339
msgid "list tag names"
msgstr "извеждане на имената на етикетите"
-#: builtin/tag.c:591
+#: builtin/tag.c:341
msgid "print <n> lines of each tag message"
msgstr "извеждане на този БРОЙ редове от вÑÑко Ñъобщение за етикет"
-#: builtin/tag.c:593
+#: builtin/tag.c:343
msgid "delete tags"
msgstr "изтриване на етикети"
-#: builtin/tag.c:594
+#: builtin/tag.c:344
msgid "verify tags"
msgstr "проверка на етикети"
-#: builtin/tag.c:596
+#: builtin/tag.c:346
msgid "Tag creation options"
msgstr "Опции при Ñъздаването на етикети"
-#: builtin/tag.c:598
+#: builtin/tag.c:348
msgid "annotated tag, needs a message"
msgstr "анотирането на етикети изиÑква Ñъобщение"
-#: builtin/tag.c:600
+#: builtin/tag.c:350
msgid "tag message"
msgstr "Ñъобщение за етикет"
-#: builtin/tag.c:602
+#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
msgstr "анотиран етикет Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¿Ð¾ GPG"
-#: builtin/tag.c:606
+#: builtin/tag.c:356
msgid "use another key to sign the tag"
msgstr "използване на друг ключ за подпиÑването на етикет"
-#: builtin/tag.c:607
+#: builtin/tag.c:357
msgid "replace the tag if exists"
msgstr "замÑна на етикета, ако ÑъщеÑтвува"
-#: builtin/tag.c:609
+#: builtin/tag.c:358 builtin/update-ref.c:368
+msgid "create a reflog"
+msgstr "Ñъздаване на журнал на указателите"
+
+#: builtin/tag.c:360
msgid "Tag listing options"
msgstr "Опции за извеждането на етикети"
-#: builtin/tag.c:610
+#: builtin/tag.c:361
msgid "show tag list in columns"
msgstr "извеждане на ÑпиÑъка на етикетите по колони"
-#: builtin/tag.c:612
-msgid "sort tags"
-msgstr "подреждане на етикетите"
-
-#: builtin/tag.c:617 builtin/tag.c:623
+#: builtin/tag.c:362 builtin/tag.c:363
msgid "print only tags that contain the commit"
msgstr "извеждане Ñамо на етикетите, които Ñъдържат подаването"
-#: builtin/tag.c:629
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
+msgstr "извеждане Ñамо на Ñлетите етикети"
+
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
+msgstr "извеждане Ñамо на неÑлетите етикети"
+
+#: builtin/tag.c:370
msgid "print only tags of the object"
msgstr "извеждане Ñамо на етикетите на обекта"
-#: builtin/tag.c:655
+#: builtin/tag.c:399
msgid "--column and -n are incompatible"
msgstr "Опциите „--column“ и „-n“ Ñа неÑъвмеÑтими"
-#: builtin/tag.c:667
-msgid "--sort and -n are incompatible"
-msgstr "Опциите „--long“ и „-n“ Ñа неÑъвмеÑтими"
-
-#: builtin/tag.c:674
+#: builtin/tag.c:419
msgid "-n option is only allowed with -l."
msgstr "ОпциÑта „-n“ изиÑква опциÑта „-l“."
-#: builtin/tag.c:676
+#: builtin/tag.c:421
msgid "--contains option is only allowed with -l."
msgstr "ОпциÑта „-contains“ изиÑква опциÑта „-l“."
-#: builtin/tag.c:678
+#: builtin/tag.c:423
msgid "--points-at option is only allowed with -l."
msgstr "ОпциÑта „-points-at“ изиÑква опциÑта „-l“."
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr "Опцииите „--merged“ и „--no-merged“ изиÑкват опциÑта „-l“."
+
# FIXME message pattern
-#: builtin/tag.c:686
+#: builtin/tag.c:433
msgid "only one -F or -m option is allowed."
msgstr "Опциите „-F“ и „-m“ Ñа неÑъвмеÑтими."
-#: builtin/tag.c:706
+#: builtin/tag.c:453
msgid "too many params"
msgstr "Прекалено много аргументи"
-#: builtin/tag.c:712
+#: builtin/tag.c:459
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s“ е неправилно име за етикет."
-#: builtin/tag.c:717
+#: builtin/tag.c:464
#, c-format
msgid "tag '%s' already exists"
msgstr "етикетът „%s“ вече ÑъщеÑтвува"
-#: builtin/tag.c:741
+#: builtin/tag.c:489
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Обновен етикет „%s“ (бе „%s“)\n"
-#: builtin/unpack-objects.c:489
+#: builtin/unpack-objects.c:490
msgid "Unpacking objects"
msgstr "Разпакетиране на обектите"
@@ -10626,21 +11392,21 @@ msgstr "git update-ref [ОПЦИЯ…] ИМЕ_ÐÐ_УКÐЗÐТЕЛ ÐОВÐ_СÐ
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]"
-#: builtin/update-ref.c:359
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "изтриване на указателÑ"
-#: builtin/update-ref.c:361
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "обновÑване на ИМЕто_ÐÐ_УКÐЗÐТЕЛÑ, а не това, към което Ñочи"
-#: builtin/update-ref.c:362
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr ""
"нÑкои от елементите подадени на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´ завършват Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº "
"„NUL“"
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "изчитане на указателите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
@@ -10656,10 +11422,14 @@ msgstr "обновÑване на информационните файлове
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-tag [-v | --verbose] ПОДÐÐ’ÐÐЕ…"
-#: builtin/verify-commit.c:75
+#: builtin/verify-commit.c:72
msgid "print commit contents"
msgstr "извеждане на Ñъдържанието на подаването"
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+msgid "print raw gpg status output"
+msgstr "извеждане на Ð½ÐµÐ¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´ от ÑÑŠÑтоÑнието на „gpg“"
+
#: builtin/verify-pack.c:54
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] ПÐКЕТ…"
@@ -10676,89 +11446,89 @@ msgstr "извеждане Ñамо на ÑтатиÑтиката"
msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr "git verify-tag [-v | --verbose] ЕТИКЕТ…"
-#: builtin/verify-tag.c:73
+#: builtin/verify-tag.c:83
msgid "print tag contents"
msgstr "извеждане на Ñъдържанието на ЕТИКЕТи"
-#: builtin/worktree.c:11
-msgid "git worktree add [<options>] <path> <branch>"
-msgstr "git worktree add [ОПЦИЯ…] ПЪТ КЛОÐ"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [ОПЦИЯ…] ПЪТ [КЛОÐ]"
-#: builtin/worktree.c:12
+#: builtin/worktree.c:16
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [ОПЦИЯ…]"
-#: builtin/worktree.c:27
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [ОПЦИЯ…]"
+
+#: builtin/worktree.c:39
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректориÑ"
-#: builtin/worktree.c:33
+#: builtin/worktree.c:45
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не ÑъщеÑтвува"
-#: builtin/worktree.c:38
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
"Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен"
-#: builtin/worktree.c:49
+#: builtin/worktree.c:61
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“"
-#: builtin/worktree.c:65
+#: builtin/worktree.c:77
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Изтриване на „worktrees/%s“: файлът „gitdir“ Ñочи неÑъщеÑтвуващо "
"меÑтоположение"
-#: builtin/worktree.c:100
+#: builtin/worktree.c:112
#, c-format
msgid "failed to remove: %s"
msgstr "„%s“ не може да Ñе изтрие"
-#: builtin/worktree.c:186
+#: builtin/worktree.c:201
#, c-format
msgid "'%s' already exists"
msgstr "„%s“ вече ÑъщеÑтвува"
-#: builtin/worktree.c:207
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "директориÑта „%s“ не може да бъде Ñъздадена"
-#: builtin/worktree.c:241
-msgid "unable to resolve HEAD"
-msgstr "Ñоченото от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ не може да бъде открито"
-
-#: builtin/worktree.c:249
+#: builtin/worktree.c:271
#, c-format
-msgid "Enter %s (identifier %s)"
-msgstr "Въведете %s (идентификатор %s)"
+msgid "Preparing %s (identifier %s)"
+msgstr "ПодготвÑне на %s (идентификатор %s)"
-#: builtin/worktree.c:281
+#: builtin/worktree.c:319
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "ИзтеглÑне КЛОÐа, дори и да е изтеглен в друго работно дърво"
-#: builtin/worktree.c:283
+#: builtin/worktree.c:321
msgid "create a new branch"
msgstr "Ñъздаване на нов клон"
-#: builtin/worktree.c:285
+#: builtin/worktree.c:323
msgid "create or reset a branch"
msgstr "Ñъздаване или занулÑване на клони"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:324
msgid "detach HEAD at named commit"
msgstr "отделÑне на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ към указаното подаване"
-#: builtin/worktree.c:292
-msgid "-b and -B are mutually exclusive"
-msgstr "опциите „-b“ и „-B“ Ñа неÑъвмеÑтими"
+#: builtin/worktree.c:331
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "Опциите „-b“, „-B“ и „--detach“ Ñа неÑъвмеÑтими една Ñ Ð´Ñ€ÑƒÐ³Ð°"
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -10776,7 +11546,7 @@ msgstr "Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° обект-дърво за поддиректориÑÑ‚Ð
msgid "only useful for debugging"
msgstr "Ñамо за изчиÑтване на грешки"
-#: credential-cache--daemon.c:267
+#: credential-cache--daemon.c:255
msgid "print debugging messages to stderr"
msgstr "извеждане на ÑъобщениÑта за траÑиране на Ñтандартната грешка"
@@ -10792,548 +11562,350 @@ msgstr ""
"за\n"
"нÑкое определено ПОÐЯТИЕ използвайте „git help ПОÐЯТИЕ“."
-#: common-cmds.h:10
+#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
msgstr "Ñъздаване на работно дърво (погледнете: „git help tutorial“)"
-#: common-cmds.h:11
+#: common-cmds.h:10
msgid "work on the current change (see also: git help everyday)"
msgstr "работа по текущата промÑна (погледнете: „git help everyday“)"
-#: common-cmds.h:12
+#: common-cmds.h:11
msgid "examine the history and state (see also: git help revisions)"
msgstr "преглед на иÑториÑта и ÑÑŠÑтоÑнието (погледнете: „git help revisions“)"
-#: common-cmds.h:13
+#: common-cmds.h:12
msgid "grow, mark and tweak your common history"
msgstr "увеличаване, отбелÑзване и промÑна на общата иÑториÑ"
-#: common-cmds.h:14
+#: common-cmds.h:13
msgid "collaborate (see also: git help workflows)"
msgstr "ÑъвмеÑтна работа (погледнете: „git help workflows“)"
-#: common-cmds.h:18
+#: common-cmds.h:17
msgid "Add file contents to the index"
msgstr "ДобавÑне на Ñъдържанието на файла към индекÑа"
-#: common-cmds.h:19
-msgid "Find by binary search the change that introduced a bug"
+#: common-cmds.h:18
+msgid "Use binary search to find the commit that introduced a bug"
msgstr "Двоично Ñ‚ÑŠÑ€Ñене на промÑната, коÑто е причинила грешка"
# FIXME - should be similar to tag
-#: common-cmds.h:20
+#: common-cmds.h:19
msgid "List, create, or delete branches"
msgstr "Извеждане, Ñъздаване, изтриване на клони"
-#: common-cmds.h:21
+#: common-cmds.h:20
msgid "Switch branches or restore working tree files"
msgstr ""
"Преминаване към друг клон или възÑтановÑване на файловете в работното дърво"
-#: common-cmds.h:22
+#: common-cmds.h:21
msgid "Clone a repository into a new directory"
msgstr "Клониране на хранилище в нова директориÑ"
-#: common-cmds.h:23
+#: common-cmds.h:22
msgid "Record changes to the repository"
msgstr "Подаване на промени в хранилището"
-#: common-cmds.h:24
+#: common-cmds.h:23
msgid "Show changes between commits, commit and working tree, etc"
msgstr "Извеждане на разликите между подаваниÑта, верÑиите, работното дърво"
-#: common-cmds.h:25
+#: common-cmds.h:24
msgid "Download objects and refs from another repository"
msgstr "ИзтеглÑне на обекти и указатели от друго хранилище"
-#: common-cmds.h:26
+#: common-cmds.h:25
msgid "Print lines matching a pattern"
msgstr "Извеждане на редовете напаÑващи на шаблон"
-#: common-cmds.h:27
+#: common-cmds.h:26
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Създаване на празно хранилище на Git или занулÑване на ÑъщеÑтвуващо"
-#: common-cmds.h:28
+#: common-cmds.h:27
msgid "Show commit logs"
msgstr "Извеждане на журнала Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта"
-#: common-cmds.h:29
+#: common-cmds.h:28
msgid "Join two or more development histories together"
msgstr "Сливане на две или повече поредици/иÑтории от промени"
-#: common-cmds.h:30
+#: common-cmds.h:29
msgid "Move or rename a file, a directory, or a symlink"
msgstr "ПремеÑтване или преименуване на файл, Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð¸Ð»Ð¸ Ñимволна връзка"
-#: common-cmds.h:31
+#: common-cmds.h:30
msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "ДоÑтавÑне и интегрирането на промените от друго хранилище или клон"
+msgstr "ДоÑтавÑне и внаÑÑне на промените от друго хранилище или клон"
-#: common-cmds.h:32
+#: common-cmds.h:31
msgid "Update remote refs along with associated objects"
msgstr "ОбновÑване на отдалечените указатели и Ñвързаните Ñ Ñ‚ÑÑ… обекти"
-#: common-cmds.h:33
+#: common-cmds.h:32
msgid "Forward-port local commits to the updated upstream head"
msgstr "Пребазиране на промени към нова оÑнова"
-#: common-cmds.h:34
+#: common-cmds.h:33
msgid "Reset current HEAD to the specified state"
msgstr "Привеждане на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ към зададеното ÑÑŠÑтоÑние"
-#: common-cmds.h:35
+#: common-cmds.h:34
msgid "Remove files from the working tree and from the index"
msgstr "Изтриване на файлове от работното дърво и индекÑа"
-#: common-cmds.h:36
+#: common-cmds.h:35
msgid "Show various types of objects"
msgstr "Извеждане на различните видове обекти в Git"
-#: common-cmds.h:37
+#: common-cmds.h:36
msgid "Show the working tree status"
msgstr "Извеждане на ÑÑŠÑтоÑнието на работното дърво"
# FIXME - should be similar to branch
-#: common-cmds.h:38
+#: common-cmds.h:37
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Извеждане, Ñъздаване, изтриване, проверка на етикети подпиÑани Ñ GPG"
-#: parse-options.h:142
+#: parse-options.h:145
msgid "expiry-date"
msgstr "период на валидноÑÑ‚/запазване"
-#: parse-options.h:157
+#: parse-options.h:160
msgid "no-op (backward compatibility)"
msgstr "нулева Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ (за ÑъвмеÑтимоÑÑ‚ Ñ Ð¿Ñ€ÐµÐ´Ð¸ÑˆÐ½Ð¸ верÑии)"
-#: parse-options.h:231
+#: parse-options.h:237
msgid "be more verbose"
msgstr "повече подробноÑти"
-#: parse-options.h:233
+#: parse-options.h:239
msgid "be more quiet"
msgstr "по-малко подробноÑти"
# FIXME SHA-1 -> SHA1
-#: parse-options.h:239
+#: parse-options.h:245
msgid "use <n> digits to display SHA-1s"
msgstr "да Ñе показват такъв БРОЙ цифри от Ñумите по SHA1"
-#: rerere.h:27
+#: rerere.h:38
msgid "update the index with reused conflict resolution if possible"
msgstr ""
"при възможноÑÑ‚ преизползване на решението на конфликта за обновÑване на "
"индекÑа"
-#: git-am.sh:53
-msgid "You need to set your committer info first"
-msgstr "Първо Ñ‚Ñ€Ñбва да зададете Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ñебе Ñи"
-
-#: git-am.sh:100
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr ""
-"Изглежда указателÑÑ‚ „HEAD“ е променен и не Ñочи към ÑÑŠÑ‰Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚ както по "
-"времето\n"
-"на поÑледното неуÑпешно изпълнение на „git am“. УказателÑÑ‚ Ñе задава да Ñочи "
-"към\n"
-"„ORIG_HEAD“"
-
-#: git-am.sh:110
-#, sh-format
-msgid ""
-"When you have resolved this problem, run \"$cmdline --continue\".\n"
-"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-"To restore the original branch and stop patching, run \"$cmdline --abort\"."
-msgstr ""
-"След коригирането на този проблем изпълнете командата „$cmdline --"
-"continue“.\n"
-"За да преÑкочите тази кръпка, изпълнете командата „$cmdline --skip“.\n"
-"За да възÑтановите първоначалното ÑÑŠÑтоÑние и да преуÑтановите прилагането "
-"на \n"
-"кръпки, изпълнете командата „$cmdline --abort“."
-
-#: git-am.sh:126
-msgid "Cannot fall back to three-way merge."
-msgstr "Ðе може да Ñе премине към тройно Ñливане."
-
-#: git-am.sh:142
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr ""
-"Ð’ хранилището липÑват необходимите обекти BLOB, за да Ñе премине към тройно "
-"Ñливане."
-
-#: git-am.sh:144
-msgid "Using index info to reconstruct a base tree..."
-msgstr "Базовото дърво Ñе реконÑтруира от информациÑта в индекÑа…"
-
-#: git-am.sh:159
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-"Кръпката не може да Ñе приложи към обектите BLOB в индекÑа.\n"
-"Да не би да Ñте Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð°Ð»Ð¸ на ръка?"
-
-#: git-am.sh:168
-msgid "Falling back to patching base and 3-way merge..."
-msgstr "Преминаване към прилагане на кръпка към базата и тройно Ñливане…"
-
-#: git-am.sh:185
-msgid "Failed to merge in the changes."
-msgstr "ÐеуÑпешно Ñливане на промените."
-
-#: git-am.sh:280
-msgid "Only one StGIT patch series can be applied at once"
-msgstr ""
-"Само една ÑÐµÑ€Ð¸Ñ ÐºÑ€ÑŠÐ¿ÐºÐ¸ от „StGIT“ може да бъде прилагана в даден момент"
-
-#: git-am.sh:367
-#, sh-format
-msgid "Patch format $patch_format is not supported."
-msgstr "Ðеподдържан формат на кръпки: „$patch_format“."
-
-#: git-am.sh:369
-msgid "Patch format detection failed."
-msgstr "Форматът на кръпката не може да бъде определен."
-
-#: git-am.sh:407
-msgid ""
-"The -b/--binary option has been a no-op for long time, and\n"
-"it will be removed. Please do not use it anymore."
-msgstr ""
-"Опциите „-b“/„--binary“ отдавна не правÑÑ‚ нищо и\n"
-"ще бъдат премахнати в бъдеще. Ðе ги ползвайте."
-
-#: git-am.sh:507
-#, sh-format
-msgid "previous rebase directory $dotest still exists but mbox given."
-msgstr ""
-"предишната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° пребазиране „$dotest“ вÑе още ÑъщеÑтвува, а е "
-"зададен файл „mbox“."
-
-# FIXME better message
-#: git-am.sh:512
-msgid "Please make up your mind. --skip or --abort?"
-msgstr "Опциите „--skip“ и „--abort“ Ñа неÑъвмеÑтими."
-
-#: git-am.sh:560
-#, sh-format
-msgid ""
-"Stray $dotest directory found.\n"
-"Use \"git am --abort\" to remove it."
-msgstr ""
-"Открита е излишна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€ž$dotest“.\n"
-"Можете да Ñ Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git am --abort“."
-
-#: git-am.sh:568
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr "Ð’ момента не тече Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾ коригиране и нÑма как да Ñе продължи."
-
-#: git-am.sh:635
-#, sh-format
-msgid "Dirty index: cannot apply patches (dirty: $files)"
-msgstr ""
-"ИндекÑÑŠÑ‚ не е чиÑÑ‚: кръпките не могат да бъдат приложени (замърÑени Ñа: "
-"$files)"
-
-# FIXME spaces
-#: git-am.sh:747
-#, sh-format
-msgid ""
-"Patch is empty. Was it split wrong?\n"
-"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-"To restore the original branch and stop patching run \"$cmdline --abort\"."
-msgstr ""
-"Кръпката е празна. ЧеÑта причина за това е неправилно разделÑне на кръпки.\n"
-"За да преÑкочите тази кръпка, изпълнете командата „$cmdline --skip“.\n"
-"За да възÑтановите първоначалното ÑÑŠÑтоÑние и да преуÑтановите прилагането "
-"на \n"
-"кръпки, изпълнете командата „$cmdline --abort“."
-
-#: git-am.sh:774
-msgid "Patch does not have a valid e-mail address."
-msgstr "Кръпката не Ñъдържа валиден Ð°Ð´Ñ€ÐµÑ Ð·Ð° е-поща."
-
-#: git-am.sh:821
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"За интерактивно изпълнение е необходимо ÑтандартниÑÑ‚\n"
-"изход да е Ñвързан Ñ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð», а в момента не е."
-
-#: git-am.sh:825
-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.
-#: git-am.sh:832
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
-msgstr ""
-"Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
-"на вÑичко"
-
-#: git-am.sh:868
-#, sh-format
-msgid "Applying: $FIRSTLINE"
-msgstr "Прилагане: $FIRSTLINE"
-
-#: git-am.sh:889
-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 ""
-"Без промени — възможно е да не Ñте изпълнили „git add“.\n"
-"Ðко нÑма друга промÑна за включване в индекÑа, най-вероÑтно нÑÐºÐ¾Ñ Ð´Ñ€ÑƒÐ³Ð°\n"
-"кръпка е довела до Ñъщите промени и в такъв Ñлучай проÑто пропуÑнете тази."
-
-#: git-am.sh:897
-msgid ""
-"You still have unmerged paths in your index\n"
-"did you forget to use 'git add'?"
-msgstr ""
-"ИндекÑÑŠÑ‚ вÑе още Ñъдържа неÑлети промени — възможно е да не Ñте изпълнили "
-"„git add“."
-
-#: git-am.sh:913
-msgid "No changes -- Patch already applied."
-msgstr "Без промени — кръпката вече е приложена."
-
-#: git-am.sh:923
-#, sh-format
-msgid "Patch failed at $msgnum $FIRSTLINE"
-msgstr "ÐеуÑпешно прилагане на кръпката „$msgnum“: „$FIRSTLINE“"
-
-#: git-am.sh:926
-#, sh-format
-msgid ""
-"The copy of the patch that failed is found in:\n"
-" $dotest/patch"
-msgstr ""
-"Дубликат на проблемната кръпка Ñе намира в:\n"
-" $dotest/patch"
-
-#: git-am.sh:945
-msgid "applying to an empty history"
-msgstr "прилагане върху празна иÑториÑ"
-
-#: git-bisect.sh:48
+#: git-bisect.sh:55
msgid "You need to start by \"git bisect start\""
msgstr "Започнете като изпълните командата „git bisect start“"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:54
+#: git-bisect.sh:61
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Да Ñе извърши ли автоматично? „Y“ — ДÐ, „n“ — не"
-#: git-bisect.sh:95
+#: git-bisect.sh:122
#, sh-format
msgid "unrecognised option: '$arg'"
-msgstr "непозната Ð¾Ð¿Ñ†Ð¸Ñ â€ž$arg“"
+msgstr "непозната Ð¾Ð¿Ñ†Ð¸Ñ â€ž${arg}“"
-#: git-bisect.sh:99
+#: git-bisect.sh:126
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "„$arg“ не изглежда като указател към верÑиÑ"
# FIXME - I ??? the message does not convey what is actually wrong - that the "HEAD" points to sth that is unparsable
-#: git-bisect.sh:117
+#: git-bisect.sh:155
msgid "Bad HEAD - I need a HEAD"
msgstr "ТекущиÑÑ‚ указател „HEAD“ е неправилен."
-#: git-bisect.sh:130
+#: git-bisect.sh:168
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr ""
-"ÐеуÑпешно преминаване към „$start_head“. Изпълнете командата „git bisect "
+"ÐеуÑпешно преминаване към „${start_head}“. Изпълнете командата „git bisect "
"reset СЪЩЕСТВУВÐЩ_КЛОГ."
-#: git-bisect.sh:140
+#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
"не може да Ñе Ñ‚ÑŠÑ€Ñи двоично, когато е изпълнена командата „cg-seek“ от "
"„cogito“"
-#: git-bisect.sh:144
+#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
msgstr "Ðеправилен указател „HEAD“"
-#: git-bisect.sh:189
+#: git-bisect.sh:234
#, sh-format
msgid "Bad bisect_write argument: $state"
-msgstr "Ðеправилен аргумент на функциÑта „bisect_write“: „$state“"
+msgstr "Ðеправилен аргумент на функциÑта „bisect_write“: „${state}“"
-#: git-bisect.sh:218
+#: git-bisect.sh:263
#, sh-format
msgid "Bad rev input: $arg"
-msgstr "Ðеправилна верÑиÑ: „$arg“"
+msgstr "Ðеправилна верÑиÑ: „${arg}“"
-#: git-bisect.sh:232
+#: git-bisect.sh:278
msgid "Please call 'bisect_state' with at least one argument."
msgstr "ФункциÑта „bisect_state“ изиÑква поне един аргумент."
-#: git-bisect.sh:244
+#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
-msgstr "Ðеправилна верÑиÑ: „$rev“"
+msgstr "Ðеправилна верÑиÑ: „${rev}“"
-#: git-bisect.sh:253
-msgid "'git bisect bad' can take only one argument."
-msgstr "Командата „git bisect bad“ приема Ñамо един аргумент."
+#: git-bisect.sh:299
+#, sh-format
+msgid "'git bisect $TERM_BAD' can take only one argument."
+msgstr "Командата „git bisect ${TERM_BAD}“ приема Ñамо един аргумент."
-#: git-bisect.sh:276
-msgid "Warning: bisecting only with a bad commit."
-msgstr "ПРЕДУПРЕЖДЕÐИЕ: двоично Ñ‚ÑŠÑ€Ñене Ñамо по лошо подаване."
+#: git-bisect.sh:322
+#, sh-format
+msgid "Warning: bisecting only with a $TERM_BAD commit."
+msgstr "ПРЕДУПРЕЖДЕÐИЕ: двоично Ñ‚ÑŠÑ€Ñене Ñамо по ${TERM_BAD} подаване."
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:282
+#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
msgstr "Да Ñе продължи ли? „Y“ — ДÐ, „n“ — не"
-# FIXME me?
-#: git-bisect.sh:292
+#: git-bisect.sh:340
+#, sh-format
msgid ""
-"You need to give me at least one good and one bad revision.\n"
-"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
+"You need to give me at least one $bad_syn and one $good_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
-"ТрÑбва да зададете поне една добра и една лоша верÑиÑ. (Това може да Ñе\n"
-"направи Ñъответно и чрез командите „git bisect bad“ и „git bisect good“.)"
+"ТрÑбва да зададете поне една ${bad_syn} и една ${good_syn} верÑиÑ. (Това "
+"може да Ñе\n"
+"направи Ñъответно и чрез командите „git bisect ${bad_syn}“ и „git bisect "
+"${good_syn}“.)"
-# FIXME me
-#: git-bisect.sh:295
+#: git-bisect.sh:343
+#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one good and one bad revision.\n"
-"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
+"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
"ТрÑбва да започнете двоичното Ñ‚ÑŠÑ€Ñене чрез командата „git bisect start“.\n"
"Ñ‚Ñ€Ñбва да зададете поне една добра и една лоша верÑиÑ. (Това може да Ñе\n"
-"направи Ñъответно и чрез командите „git bisect bad“ и „git bisect good“.)"
+"направи Ñъответно и чрез командите „git bisect ${bad_syn}“ и „git bisect "
+"${good_syn}“.)"
-#: git-bisect.sh:366 git-bisect.sh:493
+#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
msgstr "Ð’ момента не Ñе извършва двоично Ñ‚ÑŠÑ€Ñене."
-#: git-bisect.sh:373
+#: git-bisect.sh:421
#, sh-format
msgid "'$invalid' is not a valid commit"
-msgstr "„$invalid“ е неправилно подаване"
+msgstr "„${invalid}“ е неправилно подаване"
-#: git-bisect.sh:382
+#: git-bisect.sh:430
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
-"Първоначално указаниÑÑ‚ клон „$branch“ в ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ не може да бъде\n"
+"Първоначално указаниÑÑ‚ клон „${branch}“ в ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ не може да бъде\n"
"изтеглен. Пробвайте да изпълните командата „git bisect reset ПОДÐÐ’ÐÐЕ“."
-#: git-bisect.sh:409
+#: git-bisect.sh:458
msgid "No logfile given"
msgstr "Ðе е зададен журнален файл"
-#: git-bisect.sh:410
+#: git-bisect.sh:459
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
-"ЖурналниÑÑ‚ файл „$file“ не може да бъде прочетен, за да Ñе изпълнÑÑ‚ "
+"ЖурналниÑÑ‚ файл „${file}“ не може да бъде прочетен, за да Ñе изпълнÑÑ‚ "
"командите от него наново"
# FIXME WTF
-#: git-bisect.sh:427
+#: git-bisect.sh:480
msgid "?? what are you talking about?"
msgstr ""
"Ðепозната команда. Възможните варианти Ñа: „start“, „good“, „bad“, „skip“"
-#: git-bisect.sh:439
+#: git-bisect.sh:492
#, sh-format
msgid "running $command"
-msgstr "изпълнение на командата „$command“"
+msgstr "изпълнение на командата „${command}“"
-#: git-bisect.sh:446
+#: git-bisect.sh:499
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
"неуÑпешно двоично Ñ‚ÑŠÑ€Ñене:\n"
-"изходниÑÑ‚ код от командата „$command“ е $res — това е извън интервала [0, "
-"128)"
+"изходниÑÑ‚ код от командата „${command}“ е ${res} — това е извън интервала "
+"[0, 128)"
-#: git-bisect.sh:472
+#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
msgstr "двоичното Ñ‚ÑŠÑ€Ñене не може да продължи"
# FIXME initial space
-#: git-bisect.sh:478
+#: git-bisect.sh:531
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
"неуÑпешно двоично Ñ‚ÑŠÑ€Ñене:\n"
-"функциÑта „bisect_state $state“ завърши Ñ ÐºÐ¾Ð´ за грешка $res"
+"функциÑта „bisect_state ${state}“ завърши Ñ ÐºÐ¾Ð´ за грешка ${res}"
-#: git-bisect.sh:485
+#: git-bisect.sh:538
msgid "bisect run success"
msgstr "уÑпешно двоично Ñ‚ÑŠÑ€Ñене"
-#: git-pull.sh:61
-msgid ""
-"Pull is not possible because you have unmerged files.\n"
-"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
-"as appropriate to mark resolution and make a commit."
-msgstr ""
-"Ðевъзможно е да издърпвате в момента, защото нÑкои файлове не Ñа Ñлети. "
-"ТрÑбва\n"
-"да ги прегледате, коригирате, ако е необходимо и да ги добавите или извадите "
-"от\n"
-"индекÑа Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git add/rm ФÐЙЛ“, Ñлед което Ñ‚Ñ€Ñбва да подадете "
-"промените."
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "използвайте две различни управлÑващи думи"
-#: git-pull.sh:65
-msgid "Pull is not possible because you have unmerged files."
-msgstr ""
-"Ðевъзможно е да издърпвате в момента, защото нÑкои файлове не Ñа Ñлети."
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "„${term}“ не е правилна управлÑваща дума"
-#: git-pull.sh:71
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
msgstr ""
-"Ðе Ñте завършили Ñливане. (УказателÑÑ‚ „MERGE_HEAD“ ÑъщеÑтвува).\n"
-"Подайте промените Ñи, преди да започнете ново Ñливане."
+"„${term}“ е вградена команда и не може да Ñе използва като управлÑваща дума"
-#: git-pull.sh:285
-msgid "updating an unborn branch with changes added to the index"
-msgstr "обновÑване на вÑе още неÑъздаден клон Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ от индекÑа"
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "не може да Ñмените значението на управлÑващата дума „${term}“"
-#: git-pull.sh:311
+#: git-bisect.sh:606
#, sh-format
-msgid ""
-"Warning: fetch updated the current branch head.\n"
-"Warning: fast-forwarding your working tree from\n"
-"Warning: commit $orig_head."
+msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
-"ПРЕДУПРЕЖДЕÐИЕ: доÑтавÑнето обнови върха на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½. Работното ви\n"
-"ПРЕДУПРЕЖДЕÐИЕ: копие бе тривиално ÑлÑто от подаване „$orig_head“."
+"Ðеправилна команда: в момента Ñе изпълнÑва двоично Ñ‚ÑŠÑ€Ñене по ${TERM_BAD}/"
+"${TERM_GOOD}."
-#: git-pull.sh:336
-msgid "Cannot merge multiple branches into empty head"
-msgstr "Ðе може да Ñливате множеÑтво клони в празен върхов указател"
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "не Ñа указани управлÑващи думи"
-#: git-pull.sh:340
-msgid "Cannot rebase onto multiple branches"
-msgstr "Ðе може да пребазирате върху повече от един клон"
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"на „git bisect terms“ е подаден неправилен аргумент „${arg}“\n"
+"Поддържат Ñе опциите „--term-good|--term-old“ и „--term-bad|--term-new“."
#: git-rebase.sh:57
msgid ""
@@ -11354,7 +11926,7 @@ msgstr "Ðвтоматично Ñкатаното е приложено."
#: git-rebase.sh:168
#, sh-format
msgid "Cannot store $stash_sha1"
-msgstr "„$stash_sha1“ не може да бъде запазен"
+msgstr "„${stash_sha1}“ не може да бъде запазен"
#: git-rebase.sh:169
msgid ""
@@ -11376,25 +11948,24 @@ msgstr ""
"Изглежда, че Ñега Ñе прилагат кръпки чрез командата „git-am“. Ðе може да "
"пребазирате в момента."
-#: git-rebase.sh:351
+#: git-rebase.sh:354
msgid "The --exec option must be used with the --interactive option"
msgstr "ОпциÑта „--exec“ задължително изиÑква опциÑта „--interactive“"
-# FIXME message
-#: git-rebase.sh:356
+#: git-rebase.sh:359
msgid "No rebase in progress?"
msgstr "Изглежда в момента не тече пребазиране"
-#: git-rebase.sh:367
+#: git-rebase.sh:370
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"ОпциÑта „--edit-todo“ е доÑтъпна Ñамо по време на интерактивно пребазиране."
-#: git-rebase.sh:374
+#: git-rebase.sh:377
msgid "Cannot read HEAD"
msgstr "УказателÑÑ‚ „HEAD“ не може да бъде прочетен"
-#: git-rebase.sh:377
+#: git-rebase.sh:380
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11402,13 +11973,12 @@ msgstr ""
"ТрÑбва да редактирате вÑички конфликти при Ñливането. След това\n"
"отбележете коригирането им чрез командата „git add“"
-#: git-rebase.sh:395
+#: git-rebase.sh:398
#, sh-format
msgid "Could not move back to $head_name"
-msgstr "Връщането към „$head_name“ е невъзможно"
+msgstr "Връщането към „${head_name}“ е невъзможно"
-# FIXME tabulators, I, double spaces
-#: git-rebase.sh:414
+#: git-rebase.sh:417
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11420,83 +11990,81 @@ msgid ""
"and run me again. I am stopping in case you still have something\n"
"valuable there."
msgstr ""
-"Вече ÑъщеÑтвува Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€ž$state_dir_base directory“. Възможно ли е да "
-"Ñте\n"
+"Вече ÑъщеÑтвува Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€ž${state_dir_base}“. Възможно ли е да Ñте\n"
"в Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° друго пребазиране? Ðко това е така, изпълнете:\n"
-" $cmd_live_rebase\n"
+" ${cmd_live_rebase}\n"
"Ðко не Ñте в Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° друго пребазиране, изпълнете:\n"
-" $cmd_clear_stale_rebase\n"
+" ${cmd_clear_stale_rebase}\n"
"и отново започнете пребазирането. Текущото пребазиране Ñе преуÑтановÑва, за\n"
"да не загубите Ñлучайно промени."
-#: git-rebase.sh:465
+#: git-rebase.sh:468
#, sh-format
msgid "invalid upstream $upstream_name"
-msgstr "неправилна оÑнова за Ñравнение „$upstream_name“"
+msgstr "неправилна оÑнова за Ñравнение „${upstream_name}“"
-#: git-rebase.sh:489
+#: git-rebase.sh:492
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-"указателÑÑ‚ „$onto_name“ може да Ñочи към повече от една оÑнова за "
+"указателÑÑ‚ „${onto_name}“ може да Ñочи към повече от една оÑнова за "
"пребазирането"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:495 git-rebase.sh:499
#, sh-format
msgid "$onto_name: there is no merge base"
-msgstr "указателÑÑ‚ „$onto_name“ не Ñочи към никаква оÑнова за пребазирането"
+msgstr "указателÑÑ‚ „${onto_name}“ не Ñочи към никаква оÑнова за пребазирането"
-#: git-rebase.sh:501
+#: git-rebase.sh:504
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
-msgstr "УказателÑÑ‚ „$onto_name“ не Ñочи към подаване"
+msgstr "УказателÑÑ‚ „${onto_name}“ не Ñочи към подаване"
-#: git-rebase.sh:524
+#: git-rebase.sh:527
#, sh-format
msgid "fatal: no such branch: $branch_name"
-msgstr "фатална грешка: не ÑъщеÑтвува клон „$branch_name“"
+msgstr "ФÐТÐЛÐРГРЕШКÐ: не ÑъщеÑтвува клон „${branch_name}“"
-#: git-rebase.sh:557
+#: git-rebase.sh:560
msgid "Cannot autostash"
msgstr "Ðе може да Ñе Ñкатае автоматично"
-#: git-rebase.sh:562
+#: git-rebase.sh:565
#, sh-format
msgid "Created autostash: $stash_abbrev"
-msgstr "Ðвтоматично Ñкатано: „$stash_abbrev“"
+msgstr "Ðвтоматично Ñкатано: „${stash_abbrev}“"
-#: git-rebase.sh:566
+#: git-rebase.sh:569
msgid "Please commit or stash them."
msgstr "Промените Ñ‚Ñ€Ñбва или да Ñе подадат, или да Ñе ÑкатаÑÑ‚."
-#: git-rebase.sh:586
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date."
-msgstr "ТекущиÑÑ‚ клон „$branch_name“ е напълно актуален."
+msgstr "ТекущиÑÑ‚ клон „${branch_name}“ е напълно актуален."
-#: git-rebase.sh:590
+#: git-rebase.sh:593
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-"ТекущиÑÑ‚ клон „$branch_name“ е напълно актуален. Пребазирането е "
+"ТекущиÑÑ‚ клон „${branch_name}“ е напълно актуален. Пребазирането е "
"принудително."
-#: git-rebase.sh:601
+#: git-rebase.sh:604
#, sh-format
msgid "Changes from $mb to $onto:"
-msgstr "Промените от „$mb“ към „$onto“:"
+msgstr "Промените от „${mb}“ към „${onto}“:"
-#: git-rebase.sh:610
+#: git-rebase.sh:613
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Първо, указателÑÑ‚ „HEAD“ започва да Ñочи към базата, върху коÑто пребазирате…"
-#: git-rebase.sh:620
+#: git-rebase.sh:623
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "Тривиално Ñливане на „$branch_name“ върху „$onto_name“."
+msgstr "Тривиално Ñливане на „${branch_name}“ върху „${onto_name}“."
-# FIXME - should 'clear' not take parameters in principle?
#: git-stash.sh:51
msgid "git stash clear with parameters is unimplemented"
msgstr "Командата „git stash clear“ не поддържа аргументи"
@@ -11517,7 +12085,6 @@ msgstr "СъÑтоÑнието на работното дърво не може
msgid "No changes selected"
msgstr "Ðе Ñа избрани никакви промени"
-# FIXME can't happen??? може, може
#: git-stash.sh:144
msgid "Cannot remove temporary index (can't happen)"
msgstr "ВременниÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде изтрит"
@@ -11526,11 +12093,11 @@ msgstr "ВременниÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде изтри
msgid "Cannot record working tree state"
msgstr "СъÑтоÑнието на работното дърво не може да бъде запазено"
-#: git-stash.sh:191
+#: git-stash.sh:189
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
-"УказателÑÑ‚ „$ref_stash“ не може да бъде обновен да Ñочи към „$w_commit“"
+"УказателÑÑ‚ „${ref_stash}“ не може да бъде обновен да Ñочи към „${w_commit}“"
#. TRANSLATORS: $option is an invalid option, like
#. `--blah-blah'. The 7 spaces at the beginning of the
@@ -11542,144 +12109,129 @@ msgstr ""
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:241
+#: git-stash.sh:239
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
msgstr ""
-"грешка: командата „git stash save“ не поддържа Ð¾Ð¿Ñ†Ð¸Ñ â€ž$option“\n"
-" За да зададете Ñъобщение, изпълнете „git stash save -- '$option'“"
+"грешка: командата „git stash save“ не поддържа Ð¾Ð¿Ñ†Ð¸Ñ â€ž${option}“\n"
+" За да зададете Ñъобщение, изпълнете „git stash save -- '${option}'“"
-#: git-stash.sh:262
+#: git-stash.sh:260
msgid "No local changes to save"
msgstr "ÐÑма никакви локални промени за Ñкатаване"
-#: git-stash.sh:266
+#: git-stash.sh:264
msgid "Cannot initialize stash"
msgstr "Скатаването не може да Ñтартира"
-#: git-stash.sh:270
+#: git-stash.sh:268
msgid "Cannot save the current status"
msgstr "Текущото ÑÑŠÑтоÑние не може да бъде запазено"
-#: git-stash.sh:288
+#: git-stash.sh:286
msgid "Cannot remove worktree changes"
msgstr "Промените в работното дърво не могат да бъдат занулени"
-#: git-stash.sh:389
+#: git-stash.sh:405
#, sh-format
msgid "unknown option: $opt"
-msgstr "непозната опциÑ: $opt"
+msgstr "непозната опциÑ: ${opt}"
-#: git-stash.sh:399
+#: git-stash.sh:415
msgid "No stash found."
msgstr "Ðе е открито нищо Ñкатано."
-#: git-stash.sh:406
+#: git-stash.sh:422
#, sh-format
msgid "Too many revisions specified: $REV"
-msgstr "Указани Ñа прекалено много верÑии: „$REV“"
+msgstr "Указани Ñа прекалено много верÑии: „${REV}“"
-#: git-stash.sh:412
+#: git-stash.sh:428
#, sh-format
msgid "$reference is not a valid reference"
-msgstr "УказателÑÑ‚ „$reference“ е грешен"
+msgstr "УказателÑÑ‚ „${reference}“ е грешен"
-#: git-stash.sh:440
+#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
-msgstr "„$args“ не е подаване, приличащо на нещо Ñкатано"
+msgstr "„${args}“ не е подаване, приличащо на нещо Ñкатано"
-#: git-stash.sh:451
+#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
-msgstr "„$args“ не е указател към нещо Ñкатано"
+msgstr "„${args}“ не е указател към нещо Ñкатано"
-#: git-stash.sh:459
+#: git-stash.sh:475
msgid "unable to refresh index"
msgstr "индекÑÑŠÑ‚ не може да бъде обновен"
-#: git-stash.sh:463
+#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
msgstr "По време на Ñливане не може да приложите нещо Ñкатано"
-#: git-stash.sh:471
+#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
msgstr ""
"Ð’ индекÑа има конфликти. Пробвайте да изпълните командата без опциÑта „--"
"index“."
-#: git-stash.sh:473
+#: git-stash.sh:489
msgid "Could not save index tree"
msgstr "Дървото Ñочено от индекÑа не може да бъде запазено"
-#: git-stash.sh:507
+#: git-stash.sh:523
msgid "Cannot unstage modified files"
msgstr "Променените файлове не могат да бъдат извадени от индекÑа"
-#: git-stash.sh:522
+#: git-stash.sh:538
msgid "Index was not unstashed."
msgstr "ИндекÑÑŠÑ‚ не е Ñкатан."
-#: git-stash.sh:545
+#: git-stash.sh:561
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Изтрито е Ñкатаното „${REV}“ ($s)"
-#: git-stash.sh:546
+#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "Скатаното „${REV}“ не може да бъде изтрито"
-#: git-stash.sh:554
+#: git-stash.sh:570
msgid "No branch name specified"
msgstr "Ðе е указано име на клон"
-#: git-stash.sh:626
+#: git-stash.sh:642
msgid "(To restore them type \"git stash apply\")"
msgstr "(За да ги възÑтановите, изпълнете командата „git stash apply“)"
-#: git-submodule.sh:95
+#: git-submodule.sh:104
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
-msgstr "не може да Ñе махне компонент от адреÑа „$remoteurl“"
-
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr "Във файла „.gitmodules“ липÑва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ð¿ÑŠÑ‚Ñ â€ž$sm_path“"
+msgstr "не може да Ñе махне компонент от адреÑа „${remoteurl}“"
-#: git-submodule.sh:287
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr "ÐеуÑпешно клониране на адреÑа „$url“ в Ð¿ÑŠÑ‚Ñ â€ž$sm_path“ като подмодул"
-
-#: git-submodule.sh:296
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr "ДиректориÑта в Git „$a“ е чаÑÑ‚ от Ð¿ÑŠÑ‚Ñ Ð½Ð° подмодула „$b“ или обратно"
-
-#: git-submodule.sh:406
+#: git-submodule.sh:281
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"ОтноÑителен път може да Ñе ползва Ñамо от оÑновната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° работното "
"дърво"
# FIXME - what is this regex?
-#: git-submodule.sh:416
+#: git-submodule.sh:291
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-"Ð°Ð´Ñ€ÐµÑ Ð½Ð° хранилище: „$repo“ Ñ‚Ñ€Ñбва или да е абÑолютен, или да започва Ñ â€ž./“ "
-"или „../“"
+"Ð°Ð´Ñ€ÐµÑ Ð½Ð° хранилище: „${repo}“ Ñ‚Ñ€Ñбва или да е абÑолютен, или да започва Ñ "
+"„./“ или „../“"
-#: git-submodule.sh:433
+#: git-submodule.sh:308
#, sh-format
msgid "'$sm_path' already exists in the index"
-msgstr "„$sm_path“ вече ÑъщеÑтвува в индекÑа"
+msgstr "„${sm_path}“ вече ÑъщеÑтвува в индекÑа"
-#: git-submodule.sh:437
+#: git-submodule.sh:312
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11687,27 +12239,27 @@ msgid ""
"Use -f if you really want to add it."
msgstr ""
"СледниÑÑ‚ път Ñе игнорира поради нÑкой от файловете „.gitignore“:\n"
-"$sm_path\n"
+"${sm_path}\n"
"Използвайте опциÑта „-f“, ако за да го добавите наиÑтина."
-#: git-submodule.sh:455
+#: git-submodule.sh:330
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "ДобавÑне на ÑъщеÑтвуващото хранилище в „$sm_path“ към индекÑа"
+msgstr "ДобавÑне на ÑъщеÑтвуващото хранилище в „${sm_path}“ към индекÑа"
-#: git-submodule.sh:457
+#: git-submodule.sh:332
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "„$sm_path“ ÑъщеÑтвува, а не е хранилище на Git"
+msgstr "„${sm_path}“ ÑъщеÑтвува, а не е хранилище на Git"
-#: git-submodule.sh:465
+#: git-submodule.sh:340
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-"Открита е локална Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° Git — „$sm_name“, коÑто Ñочи към "
+"Открита е локална Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° Git — „${sm_name}“, коÑто Ñочи към "
"отдалечените хранилища:"
-#: git-submodule.sh:467
+#: git-submodule.sh:342
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
@@ -11715,7 +12267,7 @@ msgstr ""
"Ðко иÑкате да преизползвате тази локална Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° Git вмеÑто да отново "
"да клонирате:"
-#: git-submodule.sh:469
+#: git-submodule.sh:344
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
@@ -11723,7 +12275,7 @@ msgstr ""
"използвайте опциÑта „--force“. Ðко локалната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ Ñочи към "
"правилното отдалечено хранилище"
-#: git-submodule.sh:470
+#: git-submodule.sh:345
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
@@ -11733,75 +12285,77 @@ msgstr ""
"аргумент на опциÑта „--name“."
# FIXME активиране - какво вÑъщноÑÑ‚ Ñтава
-#: git-submodule.sh:472
+#: git-submodule.sh:347
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Ðктивиране на локалното хранилище за подмодула „$sm_name“ наново."
+msgstr "Ðктивиране на локалното хранилище за подмодула „${sm_name}“ наново."
-#: git-submodule.sh:484
+#: git-submodule.sh:359
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Подмодулът „$sm_path“ не може да бъде изтеглен"
+msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен"
-#: git-submodule.sh:489
+#: git-submodule.sh:364
#, sh-format
msgid "Failed to add submodule '$sm_path'"
-msgstr "ÐеуÑпешно добавÑне на подмодула „$sm_path“"
+msgstr "ÐеуÑпешно добавÑне на подмодула „${sm_path}“"
-#: git-submodule.sh:498
+#: git-submodule.sh:373
#, sh-format
msgid "Failed to register submodule '$sm_path'"
-msgstr "ÐеуÑпешно региÑтриране на подмодула „$sm_path“"
+msgstr "ÐеуÑпешно региÑтриране на подмодула „${sm_path}“"
-#: git-submodule.sh:542
+#: git-submodule.sh:417
#, sh-format
msgid "Entering '$prefix$displaypath'"
-msgstr "Влизане в „$prefix$displaypath“"
+msgstr "Влизане в „${prefix}${displaypath}“"
-#: git-submodule.sh:562
+#: git-submodule.sh:437
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr ""
-"Спиране при „$prefix$displaypath“ — изходниÑÑ‚ код от Ñкрипта бе различен от "
-"0."
+"Спиране при „${prefix}${displaypath}“ — изходниÑÑ‚ код от Ñкрипта бе различен "
+"от 0."
-#: git-submodule.sh:608
+#: git-submodule.sh:483
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr ""
-"Във файла „.gitmodules“ не е открит Ð°Ð´Ñ€ÐµÑ Ð·Ð° Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „$displaypath“"
+"Във файла „.gitmodules“ не е открит Ð°Ð´Ñ€ÐµÑ Ð·Ð° Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул "
+"„${displaypath}“"
-#: git-submodule.sh:617
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "ÐеуÑпешно региÑтриране на Ð°Ð´Ñ€ÐµÑ Ð·Ð° Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „$displaypath“"
+msgstr "ÐеуÑпешно региÑтриране на Ð°Ð´Ñ€ÐµÑ Ð·Ð° Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${displaypath}“"
-#: git-submodule.sh:619
+#: git-submodule.sh:494
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr ""
-"РегиÑтриран е подмодул „$name“, Ñочещ към Ð°Ð´Ñ€ÐµÑ â€ž$url“, за Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул "
-"„$displaypath“"
+"РегиÑтриран е подмодул „${name}“, Ñочещ към Ð°Ð´Ñ€ÐµÑ â€ž${url}“, за Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ "
+"подмодул „${displaypath}“"
-#: git-submodule.sh:636
+#: git-submodule.sh:511
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr ""
"ÐеуÑпешно региÑтриране на режима на обновÑване за Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул "
-"„$displaypath“"
+"„${displaypath}“"
-#: git-submodule.sh:674
+#: git-submodule.sh:549
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr "Използвайте „.“, за да премахнете вÑички подмодули"
-#: git-submodule.sh:691
+#: git-submodule.sh:566
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
-"ПътÑÑ‚ към подмодул „$displaypath“ в работното дърво Ñъдържа Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€ž.git“"
+"ПътÑÑ‚ към подмодул „${displaypath}“ в работното дърво Ñъдържа Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€ž."
+"git“"
-#: git-submodule.sh:692
+#: git-submodule.sh:567
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -11809,153 +12363,156 @@ msgstr ""
"(използвайте командата „rm -rf“, за да го изтриете заедно Ñ Ñ†Ñлата му "
"иÑториÑ)"
-#: git-submodule.sh:698
+#: git-submodule.sh:573
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr ""
-"ПътÑÑ‚ към подмодул „$displaypath“ в работното дърво Ñъдържа локални промени. "
-"Можете да ги пренебрегнете и отмените Ñ Ð¾Ð¿Ñ†Ð¸Ñта „-f“"
+"ПътÑÑ‚ към подмодул „${displaypath}“ в работното дърво Ñъдържа локални "
+"промени. Можете да ги пренебрегнете и отмените Ñ Ð¾Ð¿Ñ†Ð¸Ñта „-f“"
-#: git-submodule.sh:701
+#: git-submodule.sh:576
#, sh-format
msgid "Cleared directory '$displaypath'"
-msgstr "ДиректориÑта „$displaypath“ е изчиÑтена"
+msgstr "ДиректориÑта „${displaypath}“ е изчиÑтена"
-#: git-submodule.sh:702
+#: git-submodule.sh:577
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
-"ДиректориÑта към работното дърво на подмодула „$displaypath“ не може да бъде "
-"изтрита"
+"ДиректориÑта към работното дърво на подмодула „${displaypath}“ не може да "
+"бъде изтрита"
-#: git-submodule.sh:705
+#: git-submodule.sh:580
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
-"Празната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° подмодула „$displaypath“ не може да бъде Ñъздадена"
+"Празната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° подмодула „${displaypath}“ не може да бъде Ñъздадена"
-#: git-submodule.sh:714
+#: git-submodule.sh:589
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-"Премахната е региÑтрациÑта на подмодул „$name“, Ñочещ към Ð°Ð´Ñ€ÐµÑ â€ž$url“, за "
-"Ð¿ÑŠÑ‚Ñ â€ž$displaypath“"
+"Премахната е региÑтрациÑта на подмодул „${name}“, Ñочещ към Ð°Ð´Ñ€ÐµÑ â€ž${url}“, "
+"за Ð¿ÑŠÑ‚Ñ â€ž${displaypath}“"
-#: git-submodule.sh:830
+#: git-submodule.sh:705
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
-"ПътÑÑ‚ към подмодул „$displaypath“ не е инициализиран.\n"
+"ПътÑÑ‚ към подмодул „${displaypath}“ не е инициализиран.\n"
"Пробвайте Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „update --init“."
-#: git-submodule.sh:843
+#: git-submodule.sh:718
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "Текущата верÑÐ¸Ñ Ð·Ð° подмодула в „$displaypath“ липÑва"
+msgstr "Текущата верÑÐ¸Ñ Ð·Ð° подмодула в „${displaypath}“ липÑва"
-#: git-submodule.sh:852
+#: git-submodule.sh:727
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "ÐеуÑпешно доÑтавÑне в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „$sm_path“"
+msgstr "ÐеуÑпешно доÑтавÑне в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${sm_path}“"
-#: git-submodule.sh:876
+#: git-submodule.sh:751
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "ÐеуÑпешно доÑтавÑне в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „$displaypath“"
+msgstr "ÐеуÑпешно доÑтавÑне в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${displaypath}“"
-#: git-submodule.sh:890
+#: git-submodule.sh:765
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-"ÐеуÑпешно изтеглÑне на верÑÐ¸Ñ â€ž$sha1“ в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „$displaypath“'"
+"ÐеуÑпешно изтеглÑне на верÑÐ¸Ñ â€ž${sha1}“ в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${displaypath}“'"
-#: git-submodule.sh:891
+#: git-submodule.sh:766
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Път към подмодул „$displaypath“: изтеглена е верÑÐ¸Ñ â€ž$sha1“"
+msgstr "Път към подмодул „${displaypath}“: изтеглена е верÑÐ¸Ñ â€ž${sha1}“"
-#: git-submodule.sh:895
+#: git-submodule.sh:770
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-"ÐеуÑпешно пребазиране на верÑÐ¸Ñ â€ž$sha1“ в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „$displaypath“"
+"ÐеуÑпешно пребазиране на верÑÐ¸Ñ â€ž${sha1}“ в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул "
+"„${displaypath}“"
-#: git-submodule.sh:896
+#: git-submodule.sh:771
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Път към подмодул „$displaypath“: пребазиране върху верÑÐ¸Ñ â€ž$sha1“"
+msgstr "Път към подмодул „${displaypath}“: пребазиране върху верÑÐ¸Ñ â€ž${sha1}“"
-#: git-submodule.sh:901
+#: git-submodule.sh:776
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "ÐеуÑпешно Ñливане на верÑÐ¸Ñ â€ž$sha1“ в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „$displaypath“"
+msgstr ""
+"ÐеуÑпешно Ñливане на верÑÐ¸Ñ â€ž${sha1}“ в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${displaypath}“"
-#: git-submodule.sh:902
+#: git-submodule.sh:777
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Път към подмодул „$displaypath“: Ñливане Ñ Ð²ÐµÑ€ÑÐ¸Ñ â€ž$sha1“"
+msgstr "Път към подмодул „${displaypath}“: Ñливане Ñ Ð²ÐµÑ€ÑÐ¸Ñ â€ž${sha1}“"
-# FIXME spaces
-#: git-submodule.sh:907
+#: git-submodule.sh:782
#, sh-format
msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
msgstr ""
-"ÐеуÑпешно изпълнение на командата „$command $sha1“ в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул "
-"„$prefix$sm_path“"
+"ÐеуÑпешно изпълнение на командата „${command} ${sha1}“ в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул "
+"„${prefix}${sm_path}“"
-#: git-submodule.sh:908
+#: git-submodule.sh:783
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Път към подмодул „$prefix$sm_path“: „$command $sha1“"
+msgstr "Път към подмодул „${prefix}${sm_path}“: „${command} ${sha1}“"
-#: git-submodule.sh:938
+#: git-submodule.sh:813
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-"ÐеуÑпешна обработка на поддиректориите в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „$displaypath“"
+"ÐеуÑпешна обработка на поддиректориите в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${displaypath}“"
-# FIXME message
-#: git-submodule.sh:1046
+#: git-submodule.sh:921
msgid "The --cached option cannot be used with the --files option"
msgstr "Опциите „--cached“ и „--files“ Ñа неÑъвмеÑтими"
-#: git-submodule.sh:1098
+#: git-submodule.sh:973
#, sh-format
msgid "unexpected mode $mod_dst"
-msgstr "неочакван режим „$mod_dst“"
+msgstr "неочакван режим „${mod_dst}“"
-#: git-submodule.sh:1118
+#: git-submodule.sh:993
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " ПРЕДУПРЕЖДЕÐИЕ: „$display_name“ не Ñъдържа подаването „$sha1_src“"
+msgstr ""
+" ПРЕДУПРЕЖДЕÐИЕ: „${display_name}“ не Ñъдържа подаването „${sha1_src}“"
-#: git-submodule.sh:1121
+#: git-submodule.sh:996
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " ПРЕДУПРЕЖДЕÐИЕ: „$display_name“ не Ñъдържа подаването „$sha1_dst“"
+msgstr ""
+" ПРЕДУПРЕЖДЕÐИЕ: „${display_name}“ не Ñъдържа подаването „${sha1_dst}“"
-#: git-submodule.sh:1124
+#: git-submodule.sh:999
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-" ПРЕДУПРЕЖДЕÐИЕ: „$display_name“ не Ñъдържа никое от подаваниÑта "
-"„$sha1_src“ и „$sha1_dst“"
+" ПРЕДУПРЕЖДЕÐИЕ: „${display_name}“ не Ñъдържа никое от подаваниÑта "
+"„${sha1_src}“ и „${sha1_dst}“"
-#: git-submodule.sh:1149
+#: git-submodule.sh:1024
msgid "blob"
msgstr "обект BLOB"
-#: git-submodule.sh:1267
+#: git-submodule.sh:1142
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "ÐеуÑпешна обработка на поддиректориите в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „$sm_path“"
+msgstr ""
+"ÐеуÑпешна обработка на поддиректориите в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${sm_path}“"
-#: git-submodule.sh:1331
+#: git-submodule.sh:1206
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "Синхронизиране на адреÑа за Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „$displaypath“"
+msgstr "Синхронизиране на адреÑа за Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${displaypath}“"
diff --git a/po/ca.po b/po/ca.po
index c92a18c..d364141 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-09-15 06:45+0800\n"
-"PO-Revision-Date: 2015-09-14 21:05-0600\n"
+"POT-Creation-Date: 2015-12-22 22:50+0800\n"
+"PO-Revision-Date: 2015-12-27 21:42-0700\n"
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.6\n"
#: advice.c:55
#, c-format
@@ -32,12 +32,12 @@ msgstr ""
"'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n"
"resolució i feu una comissió."
-#: advice.c:101 builtin/merge.c:1227
+#: advice.c:101 builtin/merge.c:1225
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
#: advice.c:103
-msgid "Please, commit your changes before you can merge."
+msgid "Please, commit your changes before merging."
msgstr "Si us plau, cometeu els vostres canvis abans de fusionar."
#: advice.c:104
@@ -63,78 +63,78 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
-#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "L'especificació de camí '%s' no ha coincidit amb cap fitxer"
-#: archive.c:428
+#: archive.c:429
msgid "fmt"
msgstr "format"
-#: archive.c:428
+#: archive.c:429
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:429 builtin/log.c:1229
+#: archive.c:430 builtin/log.c:1229
msgid "prefix"
msgstr "prefix"
-#: archive.c:430
+#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
-#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516 builtin/blame.c:2517
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 builtin/blame.c:2536
#: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:712 builtin/hash-object.c:99 builtin/ls-files.c:446
+#: builtin/grep.c:707 builtin/hash-object.c:99 builtin/ls-files.c:446
#: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "fitxer"
-#: archive.c:432 builtin/archive.c:89
+#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "escriu l'arxiu a aquest fitxer"
-#: archive.c:434
+#: archive.c:435
msgid "read .gitattributes in working directory"
msgstr "llegeix .gitattributes en el directori de treball"
-#: archive.c:435
+#: archive.c:436
msgid "report archived files on stderr"
msgstr "informa de fitxers arxivats en stderr"
-#: archive.c:436
+#: archive.c:437
msgid "store only"
msgstr "només emmagatzema"
-#: archive.c:437
+#: archive.c:438
msgid "compress faster"
-msgstr "comprimeix més ràpid"
+msgstr "comprimeix més ràpidament"
-#: archive.c:445
+#: archive.c:446
msgid "compress better"
msgstr "comprimeix millor"
-#: archive.c:448
+#: archive.c:449
msgid "list supported archive formats"
msgstr "allista els formats d'arxiu admesos"
-#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr "dipòsit"
-#: archive.c:451 builtin/archive.c:91
+#: archive.c:452 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
-#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr "ordre"
-#: archive.c:453 builtin/archive.c:93
+#: archive.c:454 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
-msgstr "camí a l'ordre git-upload-archive remot"
+msgstr "camí a l'ordre git-upload-archive remota"
#: attr.c:265
msgid ""
@@ -144,90 +144,90 @@ msgstr ""
"Els patrons negatius s'ignoren en els atributs de git\n"
"Useu '\\!' per exclamació capdavantera literal."
-#: branch.c:60
+#: branch.c:61
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "No establint la branca %s com a la seva pròpia font."
-#: branch.c:83
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
"La branca %s està configurada per a seguir la branca remota %s de %s per "
"rebasar."
-#: branch.c:84
+#: branch.c:85
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "La branca %s està configurada per a seguir la branca remota %s de %s."
-#: branch.c:88
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr ""
"La branca %s està configurada per a seguir la branca local %s per rebasar."
-#: branch.c:89
+#: branch.c:90
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "La branca %s està configurada per a seguir la branca local %s."
-#: branch.c:94
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr ""
"La branca %s està configurada per a seguir la referència remota %s per "
"rebasar."
-#: branch.c:95
+#: branch.c:96
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "La branca %s està configurada per a seguir la referència remota %s."
-#: branch.c:99
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
"La branca %s està configurada per a seguir la referència local %s per "
"rebasar."
-#: branch.c:100
+#: branch.c:101
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "La branca %s està configurada per a seguir la referència local %s."
-#: branch.c:133
+#: branch.c:134
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "No seguint: informació ambigua per a la referència %s"
-#: branch.c:162
+#: branch.c:163
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' no és un nom de branca vàlid."
-#: branch.c:167
+#: branch.c:168
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Una branca amb nom '%s' ja existeix."
-#: branch.c:175
+#: branch.c:176
msgid "Cannot force update the current branch."
msgstr "No es pot actualitzar la branca actual a la força."
-#: branch.c:195
+#: branch.c:196
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"No es pot configurar la informació de seguiment; el punt inicial '%s' no és "
"una branca."
-#: branch.c:197
+#: branch.c:198
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branca font demanada '%s' no existeix"
-#: branch.c:199
+#: branch.c:200
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -248,22 +248,22 @@ msgstr ""
"\"git push -u\" per a establir la configuració font\n"
"mentre pugeu."
-#: branch.c:243
+#: branch.c:244
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "No és un nom d'objecte vàlid: '%s'."
-#: branch.c:263
+#: branch.c:264
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objecte ambigu: '%s'."
-#: branch.c:268
+#: branch.c:269
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "No és un punt de ramificació vàlid: '%s'."
-#: branch.c:399
+#: branch.c:322
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ja s'ha agafat a '%s'"
@@ -278,7 +278,7 @@ msgstr "'%s' no sembla un fitxer de farcell v2"
msgid "unrecognized header: %s%s (%d)"
msgstr "capçalera no reconeguda: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:765
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr "no s'ha pogut obrir '%s'"
@@ -287,9 +287,9 @@ msgstr "no s'ha pogut obrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
-#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708
-#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
-#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
@@ -329,7 +329,7 @@ msgstr "El rev-list s'ha mort"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "les opcions de la llista de revisions exclouen la referència '%s'"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
@@ -347,13 +347,13 @@ msgstr "no es pot crear '%s'"
msgid "index-pack died"
msgstr "L'index-pack s'ha mort"
-#: color.c:260
+#: color.c:275
#, c-format
msgid "invalid color value: %.*s"
msgstr "valor de color no vàlid: %.*s"
-#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
-#: builtin/am.c:2128
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
@@ -511,23 +511,23 @@ msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'"
msgid "Performing inexact rename detection"
msgstr "Realitzant detecció inexacta de canvis de nom"
-#: diff.c:116
+#: diff.c:115
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " S'ha fallat en analitzar el percentatge limitant de dirstat '%s'\n"
-#: diff.c:121
+#: diff.c:120
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paràmetre de dirstat desconegut '%s'\n"
-#: diff.c:216
+#: diff.c:215
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valor desconegut de la variable de configuració de 'diff.submodule': '%s'"
-#: diff.c:268
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -536,16 +536,16 @@ msgstr ""
"Errors trobats en la variable de configuració 'diff.dirstat':\n"
"%s"
-#: diff.c:2998
+#: diff.c:3000
#, c-format
msgid "external diff died, stopping at %s"
msgstr "El diff external s'ha mort, aturant a %s"
-#: diff.c:3394
+#: diff.c:3396
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
-#: diff.c:3557
+#: diff.c:3559
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -554,16 +554,16 @@ msgstr ""
"S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:3571
+#: diff.c:3573
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: %s"
-#: dir.c:1853
+#: dir.c:1915
msgid "failed to get kernel name and information"
msgstr "s'ha fallat en obtenir el nombre i la informació del nucli"
-#: dir.c:1936
+#: dir.c:1998
msgid "Untracked cache is disabled on this system."
msgstr "La memòria cau no seguida està deshabilitada en aquest sistema."
@@ -615,7 +615,7 @@ msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
#: help.c:246
msgid "These are common Git commands used in various situations:"
-msgstr "Aquests són ordres del Git comunament usats en diverses situacions:"
+msgstr "Aquestes són ordres del Git comunament usades en diverses situacions:"
#: help.c:311
#, c-format
@@ -623,7 +623,7 @@ msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-"'%s' sembla una ordre git, però no hem pogut\n"
+"'%s' sembla una ordre de git, però no hem pogut\n"
"executar-la. Pot ser que git-%s estigui estropejat?"
#: help.c:368
@@ -672,8 +672,8 @@ msgstr "%s: %s - %s"
msgid "failed to read the cache"
msgstr "s'ha fallat en llegir la memòria cau"
-#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:715
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
msgid "unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
@@ -691,64 +691,64 @@ msgstr "addinfo_cache ha fallat per al camí '%s'"
msgid "error building trees"
msgstr "error en construir arbres"
-#: merge-recursive.c:687
+#: merge-recursive.c:686
#, c-format
msgid "failed to create path '%s'%s"
msgstr "s'ha fallat en crear el camí '%s' %s"
-#: merge-recursive.c:698
+#: merge-recursive.c:697
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Eliminant %s per a fer espai per al subdirectori\n"
-#: merge-recursive.c:712 merge-recursive.c:733
+#: merge-recursive.c:711 merge-recursive.c:732
msgid ": perhaps a D/F conflict?"
msgstr ": potser un conflicte D/F?"
-#: merge-recursive.c:723
+#: merge-recursive.c:722
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "refusant perdre el fitxer no seguit a '%s'"
-#: merge-recursive.c:763
+#: merge-recursive.c:762
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no es pot llegir l'objecte %s '%s'"
-#: merge-recursive.c:765
+#: merge-recursive.c:764
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob esperat per a %s '%s'"
-#: merge-recursive.c:788 builtin/clone.c:364
+#: merge-recursive.c:787 builtin/clone.c:369
#, c-format
msgid "failed to open '%s'"
msgstr "s'ha fallat en obrir '%s'"
-#: merge-recursive.c:796
+#: merge-recursive.c:795
#, c-format
msgid "failed to symlink '%s'"
msgstr "s'ha fallat en fer l'enllaç simbòlic '%s'"
-#: merge-recursive.c:799
+#: merge-recursive.c:798
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "no se sap què fer amb %06o %s '%s'"
-#: merge-recursive.c:937
+#: merge-recursive.c:936
msgid "Failed to execute internal merge"
msgstr "S'ha fallat en executar la fusió interna"
-#: merge-recursive.c:941
+#: merge-recursive.c:940
#, c-format
msgid "Unable to add %s to database"
msgstr "no s'ha pogut afegir %s a la base de dades"
-#: merge-recursive.c:957
+#: merge-recursive.c:956
msgid "unsupported object type in the tree"
msgstr "tipus d'objecte no compatible en l'arbre"
-#: merge-recursive.c:1032 merge-recursive.c:1046
+#: merge-recursive.c:1031 merge-recursive.c:1045
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -757,7 +757,7 @@ msgstr ""
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre."
-#: merge-recursive.c:1038 merge-recursive.c:1051
+#: merge-recursive.c:1037 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -766,20 +766,20 @@ msgstr ""
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre a %s."
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "rename"
msgstr "canvia de nom"
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "renamed"
msgstr "canviat de nom"
-#: merge-recursive.c:1148
+#: merge-recursive.c:1147
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s és un directori en %s; afegint com a %s en lloc"
-#: merge-recursive.c:1170
+#: merge-recursive.c:1169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -788,147 +788,147 @@ msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la "
"branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1174
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
-#: merge-recursive.c:1229
+#: merge-recursive.c:1228
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
"nom %s->%s en %s"
-#: merge-recursive.c:1259
+#: merge-recursive.c:1258
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Canviant el nom de %s a %s i %s a %s en lloc d'això"
-#: merge-recursive.c:1458
+#: merge-recursive.c:1457
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en "
"%s"
-#: merge-recursive.c:1468
+#: merge-recursive.c:1467
#, c-format
msgid "Adding merged %s"
msgstr "Afegint %s fusionat"
-#: merge-recursive.c:1473 merge-recursive.c:1671
+#: merge-recursive.c:1472 merge-recursive.c:1674
#, c-format
msgid "Adding as %s instead"
msgstr "Afegint com a %s en lloc d'això"
-#: merge-recursive.c:1524
+#: merge-recursive.c:1523
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
-#: merge-recursive.c:1527
+#: merge-recursive.c:1526
#, c-format
msgid "object %s is not a blob"
msgstr "L'objecte %s no és un blob"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modify"
msgstr "modifica"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modified"
msgstr "modificat"
-#: merge-recursive.c:1585
+#: merge-recursive.c:1588
msgid "content"
msgstr "contingut"
-#: merge-recursive.c:1592
+#: merge-recursive.c:1595
msgid "add/add"
msgstr "afegiment/afegiment"
-#: merge-recursive.c:1626
+#: merge-recursive.c:1629
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s saltat (el fusionat és igual a l'existent)"
-#: merge-recursive.c:1640
+#: merge-recursive.c:1643
#, c-format
msgid "Auto-merging %s"
msgstr "Autofusionant %s"
-#: merge-recursive.c:1644 git-submodule.sh:1150
+#: merge-recursive.c:1647 git-submodule.sh:1025
msgid "submodule"
msgstr "submòdul"
-#: merge-recursive.c:1645
+#: merge-recursive.c:1648
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1734
#, c-format
msgid "Removing %s"
msgstr "Eliminant %s"
-#: merge-recursive.c:1756
+#: merge-recursive.c:1759
msgid "file/directory"
msgstr "fitxer/directori"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1765
msgid "directory/file"
msgstr "directori/fitxer"
-#: merge-recursive.c:1767
+#: merge-recursive.c:1770
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. Afegint %s com a %s"
-#: merge-recursive.c:1777
+#: merge-recursive.c:1780
#, c-format
msgid "Adding %s"
msgstr "Afegint %s"
-#: merge-recursive.c:1794
+#: merge-recursive.c:1797
msgid "Fatal merge failure, shouldn't happen."
msgstr "Fallat de fusió fatal; això no ha de passar."
-#: merge-recursive.c:1813
+#: merge-recursive.c:1816
msgid "Already up-to-date!"
msgstr "Ja al dia!"
-#: merge-recursive.c:1822
+#: merge-recursive.c:1825
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "la fusió dels arbres %s i %s ha fallat"
-#: merge-recursive.c:1852
+#: merge-recursive.c:1855
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Camí no processat??? %s"
-#: merge-recursive.c:1900
+#: merge-recursive.c:1903
msgid "Merging:"
msgstr "Fusionant:"
-#: merge-recursive.c:1913
+#: merge-recursive.c:1916
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "s'ha trobat %u avantpassat:"
msgstr[1] "s'han trobat %u avantpassats:"
-#: merge-recursive.c:1950
+#: merge-recursive.c:1953
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
-#: merge-recursive.c:2007
+#: merge-recursive.c:2010
#, c-format
msgid "Could not parse object '%s'"
msgstr "No s'ha pogut analitzar l'objecte '%s'"
-#: merge-recursive.c:2018 builtin/merge.c:645
+#: merge-recursive.c:2021 builtin/merge.c:645
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
@@ -958,31 +958,41 @@ msgstr "Valor dolent de %s: '%s'"
msgid "unable to parse object: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: parse-options.c:563
+#: parse-options.c:570
msgid "..."
msgstr "..."
-#: parse-options.c:581
+#: parse-options.c:588
#, c-format
msgid "usage: %s"
msgstr "ús: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:585
+#: parse-options.c:592
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:588
+#: parse-options.c:595
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:622
+#: parse-options.c:629
msgid "-NUM"
msgstr "-NUM"
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nom d'objecte mal format '%s'"
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "No s'ha pogut fer %s escrivible pel grup"
+
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
@@ -1054,11 +1064,11 @@ msgstr ""
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
-#: progress.c:236
+#: progress.c:235
msgid "done"
msgstr "fet"
-#: read-cache.c:1296
+#: read-cache.c:1281
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -1067,7 +1077,7 @@ msgstr ""
"index.version establert, però el valor no és vàlid.\n"
"Usant la versió %i"
-#: read-cache.c:1306
+#: read-cache.c:1291
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1076,119 +1086,164 @@ msgstr ""
"GIT_INDEX_VERSION establert, però el valor no és vàlid.\n"
"Usant la versió %i"
-#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
#: builtin/merge.c:983
#, c-format
msgid "Could not open '%s' for writing"
msgstr "No s'ha pogut obrir '%s' per a escriptura"
-#: refs.c:3001
+#: refs/files-backend.c:2359
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no s'ha pogut suprimir la referència %s: %s"
-#: refs.c:3004
+#: refs/files-backend.c:2362
#, c-format
msgid "could not delete references: %s"
msgstr "no s'ha pogut suprimir les referències: %s"
-#: refs.c:3013
+#: refs/files-backend.c:2371
#, c-format
msgid "could not remove reference %s"
msgstr "no s'ha pogut eliminar la referència %s"
-#: ref-filter.c:660
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "valor positiu esperat contents:lines=%s"
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "format esperat: %%(color:<color>)"
+
+#: ref-filter.c:835
msgid "unable to parse format"
msgstr "no s'ha pogut analitzar el format"
-#: remote.c:792
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "format esperat: %%(align:<amplada>,<posició>)"
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr "format impropi introduït align:%s"
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "amplada positiva esperada amb l'àtom %%(align)"
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "objecte mal format a '%s'"
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: manca l'àtom %%(end)"
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr "nom d'objecte %s mal format"
+
+#: remote.c:756
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "No es pot obtenir ambdós %s i %s a %s"
-#: remote.c:796
+#: remote.c:760
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s generalment segueix %s, no %s"
-#: remote.c:800
+#: remote.c:764
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s segueix ambdós %s i %s"
-#: remote.c:808
+#: remote.c:772
msgid "Internal error"
msgstr "Error intern"
-#: remote.c:1723 remote.c:1766
+#: remote.c:1687 remote.c:1730
msgid "HEAD does not point to a branch"
msgstr "HEAD no assenyala cap branca"
-#: remote.c:1732
+#: remote.c:1696
#, c-format
msgid "no such branch: '%s'"
msgstr "no hi ha tal branca: '%s'"
-#: remote.c:1735
+#: remote.c:1699
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "cap font configurada per a la branca '%s'"
-#: remote.c:1741
+#: remote.c:1705
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "La branca font '%s' no s'emmagatzema com a branca amb seguiment remot"
-#: remote.c:1756
+#: remote.c:1720
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"el destí de pujada '%s' en el remot '%s' no té cap branca seguidora local"
-#: remote.c:1771
+#: remote.c:1735
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branca '%s' no té cap remot al qual pujar"
-#: remote.c:1782
+#: remote.c:1746
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "les especificacions de referència de '%s' no inclouen '%s'"
-#: remote.c:1795
+#: remote.c:1759
msgid "push has no destination (push.default is 'nothing')"
msgstr "push no té destí (push.default és 'nothing')"
-#: remote.c:1817
+#: remote.c:1781
msgid "cannot resolve 'simple' push to a single destination"
msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
-#: remote.c:2124
+#: remote.c:2083
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "La vostra branca està basada en '%s', però la font no hi és.\n"
-#: remote.c:2128
+#: remote.c:2087
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n"
-#: remote.c:2131
+#: remote.c:2090
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "La vostra branca està al dia amb '%s'.\n"
-#: remote.c:2135
+#: remote.c:2094
#, 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] "La vostra branca està davant de '%s' per %d comissió.\n"
msgstr[1] "La vostra branca està davant de '%s' per %d comissions.\n"
-#: remote.c:2141
+#: remote.c:2100
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n"
-#: remote.c:2144
+#: remote.c:2103
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1200,11 +1255,11 @@ msgstr[1] ""
"La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se "
"ràpidament.\n"
-#: remote.c:2152
+#: remote.c:2111
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n"
-#: remote.c:2155
+#: remote.c:2114
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1219,28 +1274,28 @@ msgstr[1] ""
"La vostra branca i '%s' s'han divergit,\n"
"i tenen %d i %d comissions distintes cada una, respectivament.\n"
-#: remote.c:2165
+#: remote.c:2124
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"
-#: revision.c:2198
+#: revision.c:2193
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla trencada"
-#: revision.c:2201
+#: revision.c:2196
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "la vostra branca actual '%s' encara no té cap comissió"
-#: revision.c:2395
+#: revision.c:2390
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent és incompatible amb --bisect"
-#: run-command.c:83
+#: run-command.c:90
msgid "open /dev/null failed"
msgstr "s'ha fallat en obrir /dev/null"
-#: run-command.c:85
+#: run-command.c:92
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) ha fallat"
@@ -1459,7 +1514,7 @@ msgstr "no es pot resoldre HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "no es pot avortar des d'una branca que encara ha de nàixer"
-#: sequencer.c:887 builtin/apply.c:4291
+#: sequencer.c:887 builtin/apply.c:4287
#, c-format
msgid "cannot open %s: %s"
msgstr "no es pot obrir %s: %s"
@@ -1501,12 +1556,12 @@ msgstr "No es pot revertir com a comissió inicial"
msgid "Can't cherry-pick into empty head"
msgstr "No es pot recollir cireres en un cap buit"
-#: setup.c:243
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "s'ha fallat en llegir %s"
-#: sha1_name.c:453
+#: sha1_name.c:463
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1555,7 +1610,7 @@ msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
msgid "staging updated .gitmodules failed"
msgstr "L'allistament del .gitmodules actualitzat ha fallat"
-#: submodule.c:1045
+#: submodule.c:1040
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "No s'ha pogut establir core.worktree en %s"
@@ -1566,7 +1621,7 @@ msgstr "No s'ha pogut establir core.worktree en %s"
msgid "unknown value '%s' for key '%s'"
msgstr "valor desconegut '%s' per a la clau '%s'"
-#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
#, c-format
msgid "more than one %s"
msgstr "més d'un %s"
@@ -1633,8 +1688,8 @@ msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura"
msgid "could not open '%s' for writing"
msgstr "no s'ha pogut obrir '%s' per a escriptura"
-#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
-#: builtin/merge.c:1076 builtin/pull.c:380
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
#, c-format
msgid "could not open '%s' for reading"
msgstr "no s'ha pogut obrir '%s' per a lectura"
@@ -1649,30 +1704,21 @@ msgstr "no s'ha pogut accedir a '%s': %s"
msgid "unable to access '%s'"
msgstr "no s'ha pogut accedir a '%s'"
-#: wrapper.c:611
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr "no s'ha pogut trobar l'usuari actual en el fitxer passwd: %s"
-
-#: wrapper.c:612
-msgid "no such user"
-msgstr "no hi ha tal usuari"
-
-#: wrapper.c:620
+#: wrapper.c:608
msgid "unable to get current working directory"
msgstr "no s'ha pogut obtenir el directori de treball actual"
-#: wrapper.c:631
+#: wrapper.c:635
#, c-format
msgid "could not open %s for writing"
msgstr "no s'ha pogut obrir '%s' per a escriptura"
-#: wrapper.c:642 builtin/am.c:424
+#: wrapper.c:646 builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "no s'ha pogut escriure a %s"
-#: wrapper.c:648
+#: wrapper.c:652
#, c-format
msgid "could not close %s"
msgstr "no s'ha pogut tancar %s"
@@ -1879,8 +1925,8 @@ msgstr "No s'ha fet cap ordre."
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Últim ordre fet (%d ordre fet):"
-msgstr[1] "Últims ordres fets (%d ordres fets):"
+msgstr[0] "Última ordre fet (%d ordre feta):"
+msgstr[1] "Últimes ordres fetes (%d ordres fetes):"
#: wt-status.c:1119
#, c-format
@@ -2018,27 +2064,27 @@ msgstr "Actualment esteu bisecant."
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (useu \"git bisect reset\" per a tornar a la branca original)"
-#: wt-status.c:1437
+#: wt-status.c:1438
msgid "On branch "
msgstr "En la branca "
-#: wt-status.c:1445
+#: wt-status.c:1444
msgid "interactive rebase in progress; onto "
msgstr "rebasament interactiu en progrés; sobre "
-#: wt-status.c:1447
+#: wt-status.c:1446
msgid "rebase in progress; onto "
msgstr "rebasament en progrés; sobre "
-#: wt-status.c:1452
+#: wt-status.c:1451
msgid "HEAD detached at "
msgstr "HEAD separat a "
-#: wt-status.c:1454
+#: wt-status.c:1453
msgid "HEAD detached from "
msgstr "HEAD separat de "
-#: wt-status.c:1457
+#: wt-status.c:1456
msgid "Not currently on any branch."
msgstr "Actualment no en cap branca."
@@ -2127,23 +2173,23 @@ msgstr ""
msgid "nothing to commit, working directory clean\n"
msgstr "no hi ha res a cometre, directori de treball net\n"
-#: wt-status.c:1644
-msgid "HEAD (no branch)"
-msgstr "HEAD (sense branca)"
-
-#: wt-status.c:1650
+#: wt-status.c:1642
msgid "Initial commit on "
msgstr "Comissió inicial en "
-#: wt-status.c:1677
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
+msgstr "HEAD (sense branca)"
+
+#: wt-status.c:1675
msgid "gone"
msgstr "no hi és"
-#: wt-status.c:1679 wt-status.c:1687
+#: wt-status.c:1677 wt-status.c:1685
msgid "behind "
msgstr "darrere "
-#: compat/precompose_utf8.c:55 builtin/clone.c:403
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
#, c-format
msgid "failed to unlink '%s'"
msgstr "s'ha fallat en desenllaçar '%s'"
@@ -2157,7 +2203,7 @@ msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
-#: builtin/add.c:70 builtin/commit.c:277
+#: builtin/add.c:70 builtin/commit.c:278
msgid "updating files failed"
msgstr "s'ha fallat en actualitzar els fitxers"
@@ -2170,7 +2216,7 @@ msgstr "elimina '%s'\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis no allistats després d'actualitzar l'índex:"
-#: builtin/add.c:194 builtin/rev-parse.c:799
+#: builtin/add.c:194 builtin/rev-parse.c:796
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
@@ -2206,15 +2252,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
-#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
-#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "marxa en sec"
-#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
-#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
-#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "sigues detallat"
@@ -2222,7 +2268,7 @@ msgstr "sigues detallat"
msgid "interactive picking"
msgstr "recull interactiu"
-#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
@@ -2281,148 +2327,149 @@ msgstr "-A i -u són mutualment incompatibles"
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run"
-#: builtin/add.c:358
+#: builtin/add.c:352
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Res especificat, res afegit.\n"
-#: builtin/add.c:359
+#: builtin/add.c:353
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Potser volíeu dir 'git add .'?\n"
-#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
-#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
-#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: builtin/am.c:41
+#: builtin/am.c:42
#, c-format
msgid "could not stat %s"
msgstr "no s'ha pogut fer stat a '%s'"
-#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737 builtin/merge.c:1079
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
#, c-format
msgid "could not read '%s'"
msgstr "no s'ha pogut llegir '%s'"
-#: builtin/am.c:444
+#: builtin/am.c:445
msgid "could not parse author script"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: builtin/am.c:521
+#: builtin/am.c:522
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "s'ha suprimit '%s' per el ganxo applypatch-msg"
-#: builtin/am.c:562 builtin/notes.c:300
+#: builtin/am.c:563 builtin/notes.c:300
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línia d'entrada mal formada: '%s'."
-#: builtin/am.c:599 builtin/notes.c:315
+#: builtin/am.c:600 builtin/notes.c:315
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "S'ha fallat en copiar les notes de '%s' a '%s'"
-#: builtin/am.c:625
+#: builtin/am.c:626
msgid "fseek failed"
msgstr "fseek ha fallat"
-#: builtin/am.c:786 builtin/am.c:874
+#: builtin/am.c:787 builtin/am.c:875
#, c-format
msgid "could not open '%s' for reading: %s"
msgstr "no s'ha pogut obrir '%s' per a lectura: %s"
-#: builtin/am.c:793
+#: builtin/am.c:794
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "no s'ha pogut obrir '%s' per a escriptura: %s"
-#: builtin/am.c:802
+#: builtin/am.c:803
#, c-format
msgid "could not parse patch '%s'"
msgstr "no s'ha pogut analitzar el pedaç '%s'"
-#: builtin/am.c:867
+#: builtin/am.c:868
msgid "Only one StGIT patch series can be applied at once"
msgstr "només una sèrie de pedaços StGIT es pot aplicar a la vegada"
-#: builtin/am.c:915
+#: builtin/am.c:916
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
-#: builtin/am.c:918 builtin/am.c:926
+#: builtin/am.c:919 builtin/am.c:927
msgid "invalid Date line"
msgstr "línia Date no vàlida"
-#: builtin/am.c:923
+#: builtin/am.c:924
msgid "invalid timezone offset"
msgstr "desplaçament de zona de temps no vàlid"
-#: builtin/am.c:1010
+#: builtin/am.c:1011
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/am.c:1015 builtin/clone.c:368
+#: builtin/am.c:1016 builtin/clone.c:373
#, c-format
msgid "failed to create directory '%s'"
msgstr "s'ha fallat en crear el directori '%s'"
-#: builtin/am.c:1019
+#: builtin/am.c:1020
msgid "Failed to split patches."
msgstr "S'ha fallat en dividir els pedaços."
-#: builtin/am.c:1151 builtin/commit.c:362
+#: builtin/am.c:1152 builtin/commit.c:363
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
-#: builtin/am.c:1202
+#: builtin/am.c:1203
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"."
-#: builtin/am.c:1203
+#: builtin/am.c:1204
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si preferiu saltar aquest pedaç, executeu \"%s --skip\" en lloc."
-#: builtin/am.c:1204
+#: builtin/am.c:1205
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort"
"\"."
-#: builtin/am.c:1339
+#: builtin/am.c:1343
msgid "Patch is empty. Was it split wrong?"
msgstr "El pedaç és buit. S'ha dividit malament?"
-#: builtin/am.c:1413 builtin/log.c:1345
+#: builtin/am.c:1417 builtin/log.c:1347
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
-#: builtin/am.c:1440
+#: builtin/am.c:1444
#, c-format
msgid "unable to parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: builtin/am.c:1614
+#: builtin/am.c:1646
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
"vies."
-#: builtin/am.c:1616
+#: builtin/am.c:1648
msgid "Using index info to reconstruct a base tree..."
msgstr "Usant la informació d'índex per a reconstruir un arbre base..."
-#: builtin/am.c:1635
+#: builtin/am.c:1667
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2430,38 +2477,38 @@ msgstr ""
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
-#: builtin/am.c:1641
+#: builtin/am.c:1673
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retrocedint a apedaçar la base i fusionar de 3 vies..."
-#: builtin/am.c:1666
+#: builtin/am.c:1688
msgid "Failed to merge in the changes."
msgstr "S'ha fallat en fusionar els canvis."
-#: builtin/am.c:1691 builtin/merge.c:632
+#: builtin/am.c:1712 builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
-#: builtin/am.c:1698
+#: builtin/am.c:1719
msgid "applying to an empty history"
msgstr "aplicant a una història buida"
-#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
#: builtin/merge.c:854
msgid "failed to write commit object"
msgstr "s'ha fallat en escriure l'objecte de comissió"
-#: builtin/am.c:1743 builtin/am.c:1747
+#: builtin/am.c:1764 builtin/am.c:1768
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
-#: builtin/am.c:1763
+#: builtin/am.c:1784
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"no es pot ser interactiu sense que stdin sigui connectat a un terminal."
-#: builtin/am.c:1768
+#: builtin/am.c:1789
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
@@ -2469,37 +2516,37 @@ msgstr "El cos de la comissió és:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1778
+#: builtin/am.c:1799
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls "
"tots: "
-#: builtin/am.c:1828
+#: builtin/am.c:1849
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Ãndex brut: no es pot aplicar pedaços (bruts: %s)"
-#: builtin/am.c:1863 builtin/am.c:1934
+#: builtin/am.c:1884 builtin/am.c:1955
#, c-format
msgid "Applying: %.*s"
msgstr "Aplicant: %.*s"
-#: builtin/am.c:1879
+#: builtin/am.c:1900
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/am.c:1887
+#: builtin/am.c:1908
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/am.c:1893
+#: builtin/am.c:1914
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La còpia del pedaç que ha fallat es troba en: %s"
-#: builtin/am.c:1937
+#: builtin/am.c:1958
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2509,7 +2556,7 @@ msgstr ""
"Si no hi ha res a allistar, probablement alguna altra cosa\n"
"ja ha introduït els mateixos canvis; potser voleu ometre aquest pedaç."
-#: builtin/am.c:1944
+#: builtin/am.c:1965
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2517,17 +2564,17 @@ msgstr ""
"Encara teniu camins sense fusionar en el vostre índex.\n"
"Heu oblidat d'usar 'git add'?"
-#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "No s'ha pogut analitzar l'objecte '%s'."
-#: builtin/am.c:2104
+#: builtin/am.c:2125
msgid "failed to clean index"
msgstr "s'ha fallat en netejar l'índex"
-#: builtin/am.c:2138
+#: builtin/am.c:2159
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2535,152 +2582,154 @@ msgstr ""
"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
"No rebobinant a ORIG_HEAD"
-#: builtin/am.c:2199
+#: builtin/am.c:2220
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor no vàlid per a --patch-format: %s"
-#: builtin/am.c:2221
-msgid "git am [options] [(<mbox>|<Maildir>)...]"
-msgstr "git am [opcions] [(<bústia>|<directori-de-correu>)...]"
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+msgstr "git am [<opcions>] [(<bústia>|<directori-de-correu>)...]"
-#: builtin/am.c:2222
-msgid "git am [options] (--continue | --skip | --abort)"
-msgstr "git am [opcions] (--continue | --skip | --abort)"
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/am.c:2228
+#: builtin/am.c:2260
msgid "run interactively"
msgstr "executa interactivament"
-#: builtin/am.c:2230
+#: builtin/am.c:2262
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
-#: builtin/am.c:2232
+#: builtin/am.c:2264
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "calla"
-#: builtin/am.c:2235
+#: builtin/am.c:2267
msgid "add a Signed-off-by line to the commit message"
msgstr "afegeix una línia Signed-off-by al missatge de comissió"
-#: builtin/am.c:2238
+#: builtin/am.c:2270
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
-#: builtin/am.c:2240
+#: builtin/am.c:2272
msgid "pass -k flag to git-mailinfo"
msgstr "passa la bandera -k al git-mailinfo"
-#: builtin/am.c:2242
+#: builtin/am.c:2274
msgid "pass -b flag to git-mailinfo"
msgstr "passa la bandera -b al git-mailinfo"
-#: builtin/am.c:2244
+#: builtin/am.c:2276
msgid "pass -m flag to git-mailinfo"
msgstr "passa la bandera -m al git-mailinfo"
-#: builtin/am.c:2246
+#: builtin/am.c:2278
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passa la bandera --keep-cr al git-mailsplit pel format mbox"
-#: builtin/am.c:2249
+#: builtin/am.c:2281
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr"
-#: builtin/am.c:2252
+#: builtin/am.c:2284
msgid "strip everything before a scissors line"
msgstr "despulla tot abans d'una línia de tissores"
-#: builtin/am.c:2253 builtin/apply.c:4563
+#: builtin/am.c:2285 builtin/apply.c:4554
msgid "action"
msgstr "acció"
-#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2281
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
msgid "pass it through git-apply"
msgstr "passa-ho a través del git-apply"
-#: builtin/am.c:2262 builtin/apply.c:4587
+#: builtin/am.c:2294 builtin/apply.c:4578
msgid "root"
msgstr "arrel"
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525
-#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
-#: builtin/pull.c:167
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
msgid "path"
msgstr "camí"
-#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
-#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
-#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
-#: parse-options.h:134 parse-options.h:243
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2274 builtin/apply.c:4531
+#: builtin/am.c:2306 builtin/apply.c:4522
msgid "num"
msgstr "número"
-#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
msgid "format"
msgstr "format"
-#: builtin/am.c:2278
+#: builtin/am.c:2310
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
-#: builtin/am.c:2284
+#: builtin/am.c:2316
msgid "override error message when patch failure occurs"
msgstr ""
"passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar"
-#: builtin/am.c:2286
+#: builtin/am.c:2318
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/am.c:2289
+#: builtin/am.c:2321
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
-#: builtin/am.c:2292
+#: builtin/am.c:2324
msgid "skip the current patch"
msgstr "salta el pedaç actual"
-#: builtin/am.c:2295
+#: builtin/am.c:2327
msgid "restore the original branch and abort the patching operation."
msgstr "restaura la branca original i avorta l'operació d'apedaçament."
-#: builtin/am.c:2299
+#: builtin/am.c:2331
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
-#: builtin/am.c:2301
+#: builtin/am.c:2333
msgid "use current timestamp for author date"
msgstr "usa el marc de temps actual per la data d'autor"
-#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225
-#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "ID de clau"
-#: builtin/am.c:2304
+#: builtin/am.c:2336
msgid "GPG-sign commits"
msgstr "firma les comissions amb GPG"
-#: builtin/am.c:2307
+#: builtin/am.c:2339
msgid "(internal use for git-rebase)"
msgstr "(ús intern per al git-rebase)"
-#: builtin/am.c:2322
+#: builtin/am.c:2354
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -2688,18 +2737,18 @@ msgstr ""
"Fa molt que l'opció -b/--binary no ha fet res, i\n"
"s'eliminarà. Si us plau, no l'useu més."
-#: builtin/am.c:2329
+#: builtin/am.c:2361
msgid "failed to read the index"
msgstr "s'ha fallat en llegir l'índex"
-#: builtin/am.c:2344
+#: builtin/am.c:2376
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"un directori de rebasament anterior %s encara existeix però s'ha donat una "
"bústia."
-#: builtin/am.c:2368
+#: builtin/am.c:2400
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2708,7 +2757,7 @@ msgstr ""
"Directori %s extraviat trobat.\n"
"Useu \"git am --abort\" per a eliminar-lo."
-#: builtin/am.c:2374
+#: builtin/am.c:2406
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Operació de resolució no en curs; no reprenem."
@@ -2716,65 +2765,65 @@ msgstr "Operació de resolució no en curs; no reprenem."
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opcions>] [<pedaç>...]"
-#: builtin/apply.c:112
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "opció d'espai en blanc '%s' no reconeguda"
-#: builtin/apply.c:127
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda"
-#: builtin/apply.c:822
+#: builtin/apply.c:818
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "No es pot preparar l'expressió regular de marca de temps %s"
-#: builtin/apply.c:831
+#: builtin/apply.c:827
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec ha retornat %d per l'entrada: %s"
-#: builtin/apply.c:912
+#: builtin/apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"
-#: builtin/apply.c:944
+#: builtin/apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"
-#: builtin/apply.c:948
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"
-#: builtin/apply.c:949
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"
-#: builtin/apply.c:956
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d"
-#: builtin/apply.c:1419
+#: builtin/apply.c:1415
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recompte: línia inesperada: %.*s"
-#: builtin/apply.c:1476
+#: builtin/apply.c:1472
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
-#: builtin/apply.c:1493
+#: builtin/apply.c:1489
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2789,77 +2838,77 @@ msgstr[1] ""
"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
"%d components de nom de camí inicial (línia %d)"
-#: builtin/apply.c:1659
+#: builtin/apply.c:1655
msgid "new file depends on old contents"
msgstr "el fitxer nou depèn dels continguts antics"
-#: builtin/apply.c:1661
+#: builtin/apply.c:1657
msgid "deleted file still has contents"
msgstr "el fitxer suprimit encara té continguts"
-#: builtin/apply.c:1687
+#: builtin/apply.c:1683
#, c-format
msgid "corrupt patch at line %d"
msgstr "el pedaç és malmès a la línia %d"
-#: builtin/apply.c:1723
+#: builtin/apply.c:1719
#, c-format
msgid "new file %s depends on old contents"
msgstr "el fitxer nou %s depèn dels continguts antics"
-#: builtin/apply.c:1725
+#: builtin/apply.c:1721
#, c-format
msgid "deleted file %s still has contents"
msgstr "el fitxer suprimit %s encara té continguts"
-#: builtin/apply.c:1728
+#: builtin/apply.c:1724
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** avís: el fitxer %s queda buit però no se suprimeix"
-#: builtin/apply.c:1874
+#: builtin/apply.c:1870
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "pedaç binari malmès a la línia %d: %.*s"
-#: builtin/apply.c:1903
+#: builtin/apply.c:1899
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "pedaç binari no reconegut a la línia %d"
-#: builtin/apply.c:2054
+#: builtin/apply.c:2050
#, c-format
msgid "patch with only garbage at line %d"
msgstr "pedaç amb només escombraries a la línia %d"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2140
#, c-format
msgid "unable to read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: builtin/apply.c:2148
+#: builtin/apply.c:2144
#, c-format
msgid "unable to open or read %s"
msgstr "no s'ha pogut obrir o llegir %s"
-#: builtin/apply.c:2781
+#: builtin/apply.c:2777
#, c-format
msgid "invalid start of line: '%c'"
msgstr "inici de línia no vàlid: '%c'"
-#: builtin/apply.c:2900
+#: builtin/apply.c:2896
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament %d línia)."
msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament %d línies)."
-#: builtin/apply.c:2912
+#: builtin/apply.c:2908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"
-#: builtin/apply.c:2918
+#: builtin/apply.c:2914
#, c-format
msgid ""
"while searching for:\n"
@@ -2868,326 +2917,326 @@ msgstr ""
"tot cercant:\n"
"%.*s"
-#: builtin/apply.c:2938
+#: builtin/apply.c:2934
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "manquen les dades de pedaç binari de '%s'"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3035
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el pedaç binari no s'aplica a '%s'"
-#: builtin/apply.c:3045
+#: builtin/apply.c:3041
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"
-#: builtin/apply.c:3066
+#: builtin/apply.c:3062
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el pedaç ha fallat: %s:%ld"
-#: builtin/apply.c:3190
+#: builtin/apply.c:3186
#, c-format
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
-#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
#, c-format
msgid "read of %s failed"
msgstr "la lectura de %s ha fallat"
-#: builtin/apply.c:3243
+#: builtin/apply.c:3239
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "llegint de '%s' més enllà d'un enllaç simbòlic"
-#: builtin/apply.c:3271 builtin/apply.c:3493
+#: builtin/apply.c:3267 builtin/apply.c:3489
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
-#: builtin/apply.c:3352 builtin/apply.c:3507
+#: builtin/apply.c:3348 builtin/apply.c:3503
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existeix en l'índex"
-#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3361 builtin/apply.c:3515
+#: builtin/apply.c:3357 builtin/apply.c:3511
#, c-format
msgid "%s: does not match index"
msgstr "%s: no coincideix amb l'índex"
-#: builtin/apply.c:3463
+#: builtin/apply.c:3459
msgid "removal patch leaves file contents"
msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
-#: builtin/apply.c:3532
+#: builtin/apply.c:3528
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipus erroni"
-#: builtin/apply.c:3534
+#: builtin/apply.c:3530
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s és del tipus %o, s'esperava %o"
-#: builtin/apply.c:3693 builtin/apply.c:3695
+#: builtin/apply.c:3689 builtin/apply.c:3691
#, c-format
msgid "invalid path '%s'"
msgstr "camí no vàlid: %s"
-#: builtin/apply.c:3750
+#: builtin/apply.c:3746
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ja existeix en l'índex"
-#: builtin/apply.c:3753
+#: builtin/apply.c:3749
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ja existeix en el directori de treball"
-#: builtin/apply.c:3773
+#: builtin/apply.c:3769
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"
-#: builtin/apply.c:3778
+#: builtin/apply.c:3774
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3794
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic"
-#: builtin/apply.c:3802
+#: builtin/apply.c:3798
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el pedaç no s'aplica"
-#: builtin/apply.c:3816
+#: builtin/apply.c:3812
#, c-format
msgid "Checking patch %s..."
msgstr "Comprovant el pedaç %s..."
-#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry ha fallat per al camí '%s'"
-#: builtin/apply.c:4052
+#: builtin/apply.c:4048
#, c-format
msgid "unable to remove %s from index"
msgstr "no s'ha pogut eliminar %s de l'índex"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4077
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "pedaç malmès per al submòdul %s"
-#: builtin/apply.c:4085
+#: builtin/apply.c:4081
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'"
-#: builtin/apply.c:4090
+#: builtin/apply.c:4086
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
"%s"
-#: builtin/apply.c:4093 builtin/apply.c:4201
+#: builtin/apply.c:4089 builtin/apply.c:4197
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no s'ha pogut afegir una entrada de cau per a %s"
-#: builtin/apply.c:4126
+#: builtin/apply.c:4122
#, c-format
msgid "closing file '%s'"
msgstr "tancant el fitxer '%s'"
-#: builtin/apply.c:4175
+#: builtin/apply.c:4171
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no s'ha pogut escriure el fitxer '%s' mode %o"
-#: builtin/apply.c:4262
+#: builtin/apply.c:4258
#, c-format
msgid "Applied patch %s cleanly."
msgstr "El pedaç %s s'ha aplicat netament."
-#: builtin/apply.c:4270
+#: builtin/apply.c:4266
msgid "internal error"
msgstr "error intern"
-#: builtin/apply.c:4273
+#: builtin/apply.c:4269
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Aplicant el pedaç %%s amb %d rebuig"
msgstr[1] "Aplicant el pedaç %%s amb %d rebuitjos"
-#: builtin/apply.c:4283
+#: builtin/apply.c:4279
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncant el nom del fitxer .rej a %.*s.rej"
-#: builtin/apply.c:4304
+#: builtin/apply.c:4300
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "El tros #%d s'ha aplicat netament."
-#: builtin/apply.c:4307
+#: builtin/apply.c:4303
#, c-format
msgid "Rejected hunk #%d."
msgstr "S'ha rebutjat el tros #%d."
-#: builtin/apply.c:4397
+#: builtin/apply.c:4393
msgid "unrecognized input"
msgstr "entrada no reconeguda"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4404
msgid "unable to read index file"
msgstr "no es pot llegir el fitxer d'índex"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4517
msgid "don't apply changes matching the given path"
msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-#: builtin/apply.c:4529
+#: builtin/apply.c:4520
msgid "apply changes matching the given path"
msgstr "aplica els canvis que coincideixin amb el camí donat"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4523
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"elimina <nombre> barres obliqües inicials dels camins de diferència "
"tradicionals"
-#: builtin/apply.c:4535
+#: builtin/apply.c:4526
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
-#: builtin/apply.c:4537
+#: builtin/apply.c:4528
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
-#: builtin/apply.c:4541
+#: builtin/apply.c:4532
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4534
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4536
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4538
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: builtin/apply.c:4549
+#: builtin/apply.c:4540
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: builtin/apply.c:4551
+#: builtin/apply.c:4542
msgid "accept a patch that touches outside the working area"
msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-#: builtin/apply.c:4553
+#: builtin/apply.c:4544
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: builtin/apply.c:4555
+#: builtin/apply.c:4546
msgid "attempt three-way merge if a patch does not apply"
msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
-#: builtin/apply.c:4557
+#: builtin/apply.c:4548
msgid "build a temporary index based on embedded index information"
msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
-#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr "els camins se separen amb el caràcter NUL"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4553
msgid "ensure at least <n> lines of context match"
msgstr "assegura't que almenys <n> línies de context coincideixin"
-#: builtin/apply.c:4564
+#: builtin/apply.c:4555
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"detecta les línies noves o modificades que tinguin errors d'espai en blanc"
-#: builtin/apply.c:4567 builtin/apply.c:4570
+#: builtin/apply.c:4558 builtin/apply.c:4561
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc en cercar context"
-#: builtin/apply.c:4573
+#: builtin/apply.c:4564
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
-#: builtin/apply.c:4575
+#: builtin/apply.c:4566
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
-#: builtin/apply.c:4577
+#: builtin/apply.c:4568
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.reg coresspondents"
-#: builtin/apply.c:4579
+#: builtin/apply.c:4570
msgid "allow overlapping hunks"
msgstr "permet trossos encavalcants"
-#: builtin/apply.c:4582
+#: builtin/apply.c:4573
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
-#: builtin/apply.c:4585
+#: builtin/apply.c:4576
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos"
-#: builtin/apply.c:4588
+#: builtin/apply.c:4579
msgid "prepend <root> to all filenames"
msgstr "anteposa <arrel> a tots els noms de fitxer"
-#: builtin/apply.c:4610
+#: builtin/apply.c:4601
msgid "--3way outside a repository"
msgstr "--3way fora d'un dipòsit"
-#: builtin/apply.c:4618
+#: builtin/apply.c:4609
msgid "--index outside a repository"
msgstr "--index fora d'un dipòsit"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4612
msgid "--cached outside a repository"
msgstr "--cached fora d'un dipòsit"
-#: builtin/apply.c:4640
+#: builtin/apply.c:4631
#, c-format
msgid "can't open patch '%s'"
msgstr "no es pot obrir el pedaç '%s'"
-#: builtin/apply.c:4654
+#: builtin/apply.c:4645
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d error d'espai en blanc omès"
msgstr[1] "%d errors d'espai en blanc omesos"
-#: builtin/apply.c:4660 builtin/apply.c:4670
+#: builtin/apply.c:4651 builtin/apply.c:4661
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3249,101 +3298,101 @@ msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)"
-#: builtin/blame.c:2500
+#: builtin/blame.c:2519
msgid "Show blame entries as we find them, incrementally"
msgstr "Mostra les entrades de culpa mentre les trobem, incrementalment"
-#: builtin/blame.c:2501
+#: builtin/blame.c:2520
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
"desactivat)"
-#: builtin/blame.c:2502
+#: builtin/blame.c:2521
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
-#: builtin/blame.c:2503
+#: builtin/blame.c:2522
msgid "Show work cost statistics"
msgstr "Mostra les estadístiques de preu de treball"
-#: builtin/blame.c:2504
+#: builtin/blame.c:2523
msgid "Show output score for blame entries"
msgstr "Mostra la puntuació de sortida de les entrades de culpa"
-#: builtin/blame.c:2505
+#: builtin/blame.c:2524
msgid "Show original filename (Default: auto)"
msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
-#: builtin/blame.c:2506
+#: builtin/blame.c:2525
msgid "Show original linenumber (Default: off)"
msgstr "Mostra el número de línia original (Per defecte: desactivat)"
-#: builtin/blame.c:2507
+#: builtin/blame.c:2526
msgid "Show in a format designed for machine consumption"
msgstr "Presenta en un format dissenyat per consumpció per màquina"
-#: builtin/blame.c:2508
+#: builtin/blame.c:2527
msgid "Show porcelain format with per-line commit information"
msgstr "Mostra el format de porcellana amb informació de comissió per línia"
-#: builtin/blame.c:2509
+#: builtin/blame.c:2528
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
-#: builtin/blame.c:2510
+#: builtin/blame.c:2529
msgid "Show raw timestamp (Default: off)"
msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
-#: builtin/blame.c:2511
+#: builtin/blame.c:2530
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
-#: builtin/blame.c:2512
+#: builtin/blame.c:2531
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"
-#: builtin/blame.c:2513
+#: builtin/blame.c:2532
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per "
"defecte: desactivat)"
-#: builtin/blame.c:2514
+#: builtin/blame.c:2533
msgid "Ignore whitespace differences"
msgstr "Ignora les diferències d'espai en blanc"
-#: builtin/blame.c:2515
+#: builtin/blame.c:2534
msgid "Spend extra cycles to find better match"
msgstr "Gasta cicles extres per a trobar una coincidència millor"
-#: builtin/blame.c:2516
+#: builtin/blame.c:2535
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
-#: builtin/blame.c:2517
+#: builtin/blame.c:2536
msgid "Use <file>'s contents as the final image"
msgstr "Usa els continguts de <fitxer> com a la imatge final"
-#: builtin/blame.c:2518 builtin/blame.c:2519
+#: builtin/blame.c:2537 builtin/blame.c:2538
msgid "score"
msgstr "puntuació"
-#: builtin/blame.c:2518
+#: builtin/blame.c:2537
msgid "Find line copies within and across files"
msgstr "Troba còpies de línia dins i a través dels fitxers"
-#: builtin/blame.c:2519
+#: builtin/blame.c:2538
msgid "Find line movements within and across files"
msgstr "Troba moviments de línia dins i a través dels fitxers"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "Process only line range n,m, counting from 1"
msgstr "Processa només el rang de línies n,m, comptant des d'1"
@@ -3353,27 +3402,31 @@ msgstr "Processa només el rang de línies n,m, comptant des d'1"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2601
+#: builtin/blame.c:2620
msgid "4 years, 11 months ago"
msgstr "fa 4 anys i 11 mesos"
-#: builtin/branch.c:24
+#: builtin/branch.c:25
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..."
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>"
-#: builtin/branch.c:150
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:142
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3383,7 +3436,7 @@ msgstr ""
" '%s', però encara no s'ha fusionat\n"
" a HEAD."
-#: builtin/branch.c:154
+#: builtin/branch.c:146
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3393,12 +3446,12 @@ msgstr ""
" fusionat a '%s', encara que està\n"
" fusionada a HEAD."
-#: builtin/branch.c:168
+#: builtin/branch.c:160
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'"
-#: builtin/branch.c:172
+#: builtin/branch.c:164
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3407,348 +3460,340 @@ msgstr ""
"La branca '%s' no està totalment fusionada.\n"
"Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
-#: builtin/branch.c:185
+#: builtin/branch.c:177
msgid "Update of config-file failed"
msgstr "L'actualització del fitxer de configuració ha fallat"
-#: builtin/branch.c:213
+#: builtin/branch.c:205
msgid "cannot use -a with -d"
msgstr "no es pot usar -a amb -d"
-#: builtin/branch.c:219
+#: builtin/branch.c:211
msgid "Couldn't look up commit object for HEAD"
msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
-#: builtin/branch.c:227
+#: builtin/branch.c:219
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "No es pot suprimir la branca '%s', en la qual sou actualment."
-#: builtin/branch.c:243
+#: builtin/branch.c:235
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "no s'ha trobat la branca amb seguiment remot '%s'."
-#: builtin/branch.c:244
+#: builtin/branch.c:236
#, c-format
msgid "branch '%s' not found."
msgstr "no s'ha trobat la branca '%s'."
-#: builtin/branch.c:259
+#: builtin/branch.c:251
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Error en suprimir la branca amb seguiment remot '%s'"
-#: builtin/branch.c:260
+#: builtin/branch.c:252
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Error en suprimir la branca '%s'"
-#: builtin/branch.c:267
+#: builtin/branch.c:259
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n"
-#: builtin/branch.c:268
+#: builtin/branch.c:260
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "S'ha suprimit la branca %s (era %s).\n"
-#: builtin/branch.c:369
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr "la branca '%s' no assenyala cap comissió"
-
-#: builtin/branch.c:452
+#: builtin/branch.c:303
#, c-format
msgid "[%s: gone]"
msgstr "[%s: no hi és]"
-#: builtin/branch.c:457
+#: builtin/branch.c:308
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:462
+#: builtin/branch.c:313
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: darrere per %d]"
-#: builtin/branch.c:464
+#: builtin/branch.c:315
#, c-format
msgid "[behind %d]"
msgstr "[darrere de %d]"
-#: builtin/branch.c:468
+#: builtin/branch.c:319
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: davant per %d]"
-#: builtin/branch.c:470
+#: builtin/branch.c:321
#, c-format
msgid "[ahead %d]"
msgstr "[davant de %d]"
-#: builtin/branch.c:473
+#: builtin/branch.c:324
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: davant per %d, darrere per %d]"
-#: builtin/branch.c:476
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[davant %d, darrere %d]"
-#: builtin/branch.c:489
+#: builtin/branch.c:340
msgid " **** invalid ref ****"
msgstr " **** referència no vàlida ****"
-#: builtin/branch.c:580
+#: builtin/branch.c:366
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(cap branca, rebasant %s)"
-#: builtin/branch.c:583
+#: builtin/branch.c:369
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(cap branca, bisecció començada en %s)"
-#: builtin/branch.c:589
+#: builtin/branch.c:375
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD separat a %s)"
-#: builtin/branch.c:592
+#: builtin/branch.c:378
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD separat de %s)"
-#: builtin/branch.c:596
+#: builtin/branch.c:382
msgid "(no branch)"
msgstr "(cap branca)"
-#: builtin/branch.c:643
-#, c-format
-msgid "object '%s' does not point to a commit"
-msgstr "l'objecte '%s' no assenyala cap comissió"
-
-#: builtin/branch.c:691
-msgid "some refs could not be read"
-msgstr "no s'han pogut llegir algunes referències"
-
-#: builtin/branch.c:704
+#: builtin/branch.c:524
msgid "cannot rename the current branch while not on any."
msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap."
-#: builtin/branch.c:714
+#: builtin/branch.c:534
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branca no vàlid: '%s'"
-#: builtin/branch.c:729
+#: builtin/branch.c:549
msgid "Branch rename failed"
msgstr "El canvi de nom de branca ha fallat"
-#: builtin/branch.c:733
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "S'ha canviat el nom de la branca malanomenada '%s'"
-#: builtin/branch.c:737
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!"
-#: builtin/branch.c:744
+#: builtin/branch.c:564
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branca està canviada de nom, però l'actualització del fitxer de "
"configuració ha fallat"
-#: builtin/branch.c:759
-#, c-format
-msgid "malformed object name %s"
-msgstr "nom d'objecte %s mal format"
-
-#: builtin/branch.c:781
+#: builtin/branch.c:587
#, c-format
msgid "could not write branch description template: %s"
msgstr "no s'ha pogut escriure la plantilla de descripció de branca: %s"
-#: builtin/branch.c:811
+#: builtin/branch.c:616
msgid "Generic options"
msgstr "Opcions genèriques"
-#: builtin/branch.c:813
+#: builtin/branch.c:618
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font"
-#: builtin/branch.c:814
+#: builtin/branch.c:619
msgid "suppress informational messages"
msgstr "omet els missatges informatius"
-#: builtin/branch.c:815
+#: builtin/branch.c:620
msgid "set up tracking mode (see git-pull(1))"
msgstr "configura el mode de seguiment (vegeu git-pull(1))"
-#: builtin/branch.c:817
+#: builtin/branch.c:622
msgid "change upstream info"
msgstr "canvia la informació de font"
-#: builtin/branch.c:821
+#: builtin/branch.c:626
msgid "use colored output"
msgstr "usa sortida colorada"
-#: builtin/branch.c:822
+#: builtin/branch.c:627
msgid "act on remote-tracking branches"
msgstr "actua en branques amb seguiment remot"
-#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
-#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
-#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
-#: builtin/tag.c:624
-msgid "commit"
-msgstr "comissió"
-
-#: builtin/branch.c:826 builtin/branch.c:832
+#: builtin/branch.c:629 builtin/branch.c:630
msgid "print only branches that contain the commit"
msgstr "imprimeix només les branques que continguin la comissió"
-#: builtin/branch.c:838
+#: builtin/branch.c:633
msgid "Specific git-branch actions:"
msgstr "Accions de git-branch específiques:"
-#: builtin/branch.c:839
+#: builtin/branch.c:634
msgid "list both remote-tracking and local branches"
msgstr "llista les branques amb seguiment remot i les locals"
-#: builtin/branch.c:841
+#: builtin/branch.c:636
msgid "delete fully merged branch"
msgstr "suprimeix la branca si està completament fusionada"
-#: builtin/branch.c:842
+#: builtin/branch.c:637
msgid "delete branch (even if not merged)"
msgstr "suprimeix la branca (encara que no estigui fusionada)"
-#: builtin/branch.c:843
+#: builtin/branch.c:638
msgid "move/rename a branch and its reflog"
msgstr "mou/canvia de nom una branca i el seu registre de referència"
-#: builtin/branch.c:844
+#: builtin/branch.c:639
msgid "move/rename a branch, even if target exists"
msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
-#: builtin/branch.c:845
+#: builtin/branch.c:640
msgid "list branch names"
msgstr "llista els noms de branca"
-#: builtin/branch.c:846
+#: builtin/branch.c:641
msgid "create the branch's reflog"
msgstr "crea el registre de referència de la branca"
-#: builtin/branch.c:848
+#: builtin/branch.c:643
msgid "edit the description for the branch"
msgstr "edita la descripció de la branca"
-#: builtin/branch.c:849
+#: builtin/branch.c:644
msgid "force creation, move/rename, deletion"
msgstr "força creació, moviment/canvi de nom, supressió"
-#: builtin/branch.c:852
-msgid "print only not merged branches"
-msgstr "imprimeix només les branques sense fusionar"
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
+msgstr "imprimeix només les branques que s'han fusionat"
-#: builtin/branch.c:858
-msgid "print only merged branches"
-msgstr "imprimeix només les branques fusionades"
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
+msgstr "imprimeix només les branques que no s'han fusionat"
-#: builtin/branch.c:862
+#: builtin/branch.c:647
msgid "list branches in columns"
msgstr "llista les branques en columnes"
-#: builtin/branch.c:875
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr "clau"
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr "nom del camp en el qual ordenar"
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr "objecte"
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr "imprimeix només les branques de l'objecte"
+
+#: builtin/branch.c:670
msgid "Failed to resolve HEAD as a valid ref."
msgstr "S'ha fallat en resoldre HEAD com a referència vàlida."
-#: builtin/branch.c:879 builtin/clone.c:690
+#: builtin/branch.c:674 builtin/clone.c:697
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
-#: builtin/branch.c:901
+#: builtin/branch.c:694
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose són incompatibles"
-#: builtin/branch.c:912 builtin/branch.c:951
+#: builtin/branch.c:705 builtin/branch.c:747
msgid "branch name required"
msgstr "cal el nom de branca"
-#: builtin/branch.c:927
+#: builtin/branch.c:723
msgid "Cannot give description to detached HEAD"
msgstr "No es pot donar descripció a un HEAD separat"
-#: builtin/branch.c:932
+#: builtin/branch.c:728
msgid "cannot edit description of more than one branch"
msgstr "no es pot editar la descripció de més d'una branca"
-#: builtin/branch.c:939
+#: builtin/branch.c:735
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Encara no hi ha comissió en la branca '%s'."
-#: builtin/branch.c:942
+#: builtin/branch.c:738
#, c-format
msgid "No branch named '%s'."
msgstr "No hi ha branca amb nom '%s'."
-#: builtin/branch.c:957
+#: builtin/branch.c:753
msgid "too many branches for a rename operation"
msgstr "hi ha massa branques per a una operació de canvi de nom"
-#: builtin/branch.c:962
+#: builtin/branch.c:758
msgid "too many branches to set new upstream"
msgstr "hi ha massa branques per a establir una nova font"
-#: builtin/branch.c:966
+#: builtin/branch.c:762
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
-#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
#, c-format
msgid "no such branch '%s'"
msgstr "no hi ha tal branca '%s'"
-#: builtin/branch.c:973
+#: builtin/branch.c:769
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branca '%s' no existeix"
-#: builtin/branch.c:985
+#: builtin/branch.c:781
msgid "too many branches to unset upstream"
msgstr "hi ha massa branques per a desestablir la font"
-#: builtin/branch.c:989
+#: builtin/branch.c:785
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca."
-#: builtin/branch.c:995
+#: builtin/branch.c:791
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branca '%s' no té informació de font"
-#: builtin/branch.c:1009
+#: builtin/branch.c:805
msgid "it does not make sense to create 'HEAD' manually"
msgstr "no té sentit crear 'HEAD' manualment"
-#: builtin/branch.c:1015
+#: builtin/branch.c:811
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"
-#: builtin/branch.c:1018
+#: builtin/branch.c:814
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3757,7 +3802,7 @@ msgstr ""
"La bandera --set-upstream està desaprovada i s'eliminarà. Considereu usar --"
"track o --set-upstream-to\n"
-#: builtin/branch.c:1035
+#: builtin/branch.c:831
#, c-format
msgid ""
"\n"
@@ -3768,12 +3813,12 @@ msgstr ""
"Si volíeu fer '%s' seguir '%s', feu això:\n"
"\n"
-#: builtin/branch.c:1036
+#: builtin/branch.c:832
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1037
+#: builtin/branch.c:833
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3800,12 +3845,8 @@ msgstr ""
"<tipus>|--textconv) <objecte>"
#: builtin/cat-file.c:429
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
-"objects>"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <llista-"
-"d'objectes>"
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
#: builtin/cat-file.c:466
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -3862,9 +3903,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..."
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
-msgstr ""
-"git check-attr --stdin [-z] [-a | --all | <atribut>...] < <llista-de-camins>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <atribut>...]"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@ -3882,7 +3922,7 @@ msgstr "llegeix els noms de fitxer d'stdin"
msgid "terminate input and output records by a NUL character"
msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "omet el reportatge de progrés"
@@ -3968,6 +4008,8 @@ msgid "write the content to temporary files"
msgstr "escriu el contingut a fitxers temporals"
#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
msgid "string"
msgstr "cadena"
@@ -3987,106 +4029,106 @@ msgstr "git checkout [<opcions>] <branca>"
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
-#: builtin/checkout.c:133 builtin/checkout.c:166
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
msgid "path '%s' does not have our version"
msgstr "el camí '%s' no té la versió nostra"
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have their version"
msgstr "el camí '%s' no té la versió seva"
-#: builtin/checkout.c:151
+#: builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "el camí '%s' no té totes les versions necessàries"
-#: builtin/checkout.c:195
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "el camí '%s' no té les versions necessàries"
-#: builtin/checkout.c:212
+#: builtin/checkout.c:213
#, c-format
msgid "path '%s': cannot merge"
msgstr "camí '%s': no es pot fusionar"
-#: builtin/checkout.c:229
+#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "no s'ha pogut afegir el resultat de fusió per a '%s'"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' no es pot usar amb actualització de camins"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:263 builtin/checkout.c:266
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' no es pot usar amb %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:269
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"No es pot actualitzar els camins i canviar a la branca '%s' a la vegada."
-#: builtin/checkout.c:279 builtin/checkout.c:473
+#: builtin/checkout.c:280 builtin/checkout.c:474
msgid "corrupt index file"
msgstr "fitxer d'índex malmès"
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr "el camí '%s' està sense fusionar"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:496
msgid "you need to resolve your current index first"
msgstr "heu de resoldre el vostre índex actual primer"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:623
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No es pot fer reflog per a '%s': %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:661
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:667
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la branca '%s'\n"
-#: builtin/checkout.c:670
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Ja en '%s'\n"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "S'ha agafat i restablert la branca '%s'\n"
-#: builtin/checkout.c:676 builtin/checkout.c:1065
+#: builtin/checkout.c:677 builtin/checkout.c:1066
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "S'ha agafat la branca nova '%s'\n"
-#: builtin/checkout.c:678
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "S'ha agafat la branca '%s'\n"
-#: builtin/checkout.c:730
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4109,7 +4151,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:755
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4136,144 +4178,150 @@ msgstr[1] ""
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:791
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:822 builtin/checkout.c:1060
+#: builtin/checkout.c:823 builtin/checkout.c:1061
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de nàixer"
-#: builtin/checkout.c:967
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "només una referència esperada, %d donades."
-#: builtin/checkout.c:1006 builtin/worktree.c:210
+#: builtin/checkout.c:1007 builtin/worktree.c:213
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
-#: builtin/checkout.c:1035
+#: builtin/checkout.c:1036
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
-#: builtin/checkout.c:1074
+#: builtin/checkout.c:1075
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
-#: builtin/checkout.c:1077 builtin/checkout.c:1081
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no es pot usar amb canvi de branca"
-#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no es pot usar amb '%s'"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1102
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No es pot canviar la branca a la no comissió '%s'"
-#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
-#: builtin/worktree.c:319
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
msgid "branch"
msgstr "branca"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1136
msgid "create and checkout a new branch"
msgstr "crea i agafa una branca nova"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1138
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una branca"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1139
msgid "create reflog for new branch"
msgstr "crea un registre de referència per a la branca nova"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1140
msgid "detach the HEAD at named commit"
msgstr "separa el HEAD a la comissió anomenada"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1141
msgid "set upstream info for new branch"
msgstr "estableix la informació de font de la branca nova"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new-branch"
msgstr "branca-nova"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new unparented branch"
msgstr "branca òrfena nova"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
msgid "checkout our version for unmerged files"
msgstr "agafa la versió nostra dels fitxers sense fusionar"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1146
msgid "checkout their version for unmerged files"
msgstr "agafa la versió seva dels fitxers sense fusionar"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1148
msgid "force checkout (throw away local modifications)"
msgstr "agafa a la força (descarta qualsevulla modificació local)"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1149
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la branca nova"
-#: builtin/checkout.c:1149 builtin/merge.c:227
+#: builtin/checkout.c:1150 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
-#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
+#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
msgid "style"
msgstr "estil"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1152
msgid "conflict style (merge or diff3)"
msgstr "estil de conflicte (fusió o diff3)"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1155
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de camí només a entrades disperses"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1157
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "dubta 'git checkout <cap-branca-així>'"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1159
msgid "do not check if another worktree is holding the given ref"
msgstr "no comprovis si altre arbre de treball té la referència donada"
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr "força l'informe de progrés"
+
+#: builtin/checkout.c:1191
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B i --orphan són mutualment exclusius"
-#: builtin/checkout.c:1198
+#: builtin/checkout.c:1208
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1213
msgid "Missing branch name; try -b"
msgstr "Manca el nom de branca; proveu -b"
-#: builtin/checkout.c:1239
+#: builtin/checkout.c:1249
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1256
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4282,12 +4330,12 @@ msgstr ""
"No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n"
"Volíeu agafar '%s', la qual no es pot resoldre com a comissió?"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1261
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no accepta un paràmetre de camí '%s'"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1265
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4326,7 +4374,7 @@ msgstr "Saltaria el dipòsit %s\n"
msgid "failed to remove %s"
msgstr "s'ha fallat en eliminar %s"
-#: builtin/clean.c:317
+#: builtin/clean.c:315
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -4338,7 +4386,7 @@ msgstr ""
"foo - selecciona un ítem basat en un prefix únic\n"
" - (buit) no seleccionis res"
-#: builtin/clean.c:321
+#: builtin/clean.c:319
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -4358,36 +4406,36 @@ msgstr ""
"* - tria tots els ítems\n"
" - (buit) finalitza la selecció"
-#: builtin/clean.c:537
+#: builtin/clean.c:535
#, c-format
msgid "Huh (%s)?"
msgstr "Perdó (%s)?"
-#: builtin/clean.c:679
+#: builtin/clean.c:677
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduïu els patrons a ignorar>> "
-#: builtin/clean.c:716
+#: builtin/clean.c:714
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "AVÃS: No es pot trobar ítems que coincideixin amb: %s"
-#: builtin/clean.c:737
+#: builtin/clean.c:735
msgid "Select items to delete"
msgstr "Selecciona els ítems a suprimir"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:778
+#: builtin/clean.c:776
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Voleu eliminar %s [y/N]? "
-#: builtin/clean.c:803
+#: builtin/clean.c:801
msgid "Bye."
msgstr "Adéu."
-#: builtin/clean.c:811
+#: builtin/clean.c:809
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -4405,62 +4453,62 @@ msgstr ""
"help - aquesta pantalla\n"
"? - ajuda de selecció de l'avís"
-#: builtin/clean.c:838
+#: builtin/clean.c:836
msgid "*** Commands ***"
msgstr "*** Ordres ***"
-#: builtin/clean.c:839
+#: builtin/clean.c:837
msgid "What now"
msgstr "I ara què"
-#: builtin/clean.c:847
+#: builtin/clean.c:845
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Eliminaria l'ítem següent:"
msgstr[1] "Eliminaria els ítems següents:"
-#: builtin/clean.c:864
+#: builtin/clean.c:862
msgid "No more files to clean, exiting."
msgstr "No hi ha més fitxers a netejar; sortint."
-#: builtin/clean.c:895
+#: builtin/clean.c:893
msgid "do not print names of files removed"
msgstr "no imprimeixis els noms dels fitxers eliminats"
-#: builtin/clean.c:897
+#: builtin/clean.c:895
msgid "force"
msgstr "força"
-#: builtin/clean.c:898
+#: builtin/clean.c:896
msgid "interactive cleaning"
msgstr "neteja interactiva"
-#: builtin/clean.c:900
+#: builtin/clean.c:898
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
msgid "pattern"
msgstr "patró"
-#: builtin/clean.c:902
+#: builtin/clean.c:900
msgid "add <pattern> to ignore rules"
msgstr "afegiu <patró> per a ignorar les regles"
-#: builtin/clean.c:903
+#: builtin/clean.c:901
msgid "remove ignored files, too"
msgstr "elimina els fitxers ignorats, també"
-#: builtin/clean.c:905
+#: builtin/clean.c:903
msgid "remove only ignored files"
msgstr "elimina només els fitxers ignorats"
-#: builtin/clean.c:923
+#: builtin/clean.c:921
msgid "-x and -X cannot be used together"
msgstr "-x i -X no es poden usar junts"
-#: builtin/clean.c:927
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -4468,7 +4516,7 @@ msgstr ""
"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'ha donat; "
"refusant netejar"
-#: builtin/clean.c:930
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -4480,16 +4528,11 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
-#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
-#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
-msgid "force progress reporting"
-msgstr "força l'informe de progrés"
-
#: builtin/clone.c:59
msgid "don't create a checkout"
-msgstr "no facis cap agafada"
+msgstr "no facis cap agafament"
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
msgid "create a bare repository"
msgstr "crea un dipòsit nu"
@@ -4513,15 +4556,15 @@ msgstr "configura com a dipòsit compartit"
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
-#: builtin/clone.c:75 builtin/init-db.c:501
+#: builtin/clone.c:75 builtin/init-db.c:466
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:76 builtin/init-db.c:502
+#: builtin/clone.c:76 builtin/init-db.c:467
msgid "directory from which templates will be used"
msgstr "directori del qual les plantilles s'usaran"
-#: builtin/clone.c:78
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
msgid "reference repository"
msgstr "dipòsit de referència"
@@ -4545,7 +4588,7 @@ msgstr "agafa <branca> en lloc del HEAD del remot"
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659 builtin/pull.c:186
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186
msgid "depth"
msgstr "profunditat"
@@ -4557,11 +4600,11 @@ msgstr "crea un clon superficial de tal profunditat"
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
-#: builtin/clone.c:91 builtin/init-db.c:510
+#: builtin/clone.c:91 builtin/init-db.c:475
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:92 builtin/init-db.c:511
+#: builtin/clone.c:92 builtin/init-db.c:476
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
@@ -4573,178 +4616,181 @@ msgstr "clau=valor"
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del dipòsit nou"
-#: builtin/clone.c:298
+#: builtin/clone.c:300
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat."
+
+#: builtin/clone.c:302
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "el dipòsit de referència '%s' no és un dipòsit local."
-#: builtin/clone.c:302
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "el dipòsit de referència '%s' és superficial"
-#: builtin/clone.c:305
+#: builtin/clone.c:310
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "el dipòsit de referència '%s' és empeltat"
-#: builtin/clone.c:370 builtin/diff.c:84
+#: builtin/clone.c:375 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "s'ha fallat en fer stat a '%s'"
-#: builtin/clone.c:372
+#: builtin/clone.c:377
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:386
+#: builtin/clone.c:391
#, c-format
msgid "failed to stat %s\n"
msgstr "s'ha fallat en fer stat a '%s'\n"
-#: builtin/clone.c:408
+#: builtin/clone.c:413
#, c-format
msgid "failed to create link '%s'"
msgstr "s'ha fallat en crear l'enllaç '%s'"
-#: builtin/clone.c:412
+#: builtin/clone.c:417
#, c-format
msgid "failed to copy file to '%s'"
msgstr "s'ha fallat en copiar el fitxer a '%s'"
-#: builtin/clone.c:435 builtin/clone.c:619
+#: builtin/clone.c:442 builtin/clone.c:626
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:447
+#: builtin/clone.c:454
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-"La clonació ha tingut èxit, però l'agafada ha fallat.\n"
-"Podeu inspeccionar què s'ha agafat amb 'git status' i\n"
-"tornar a intentar l'agafada amb 'git checkout -f HEAD'\n"
+"La clonació ha tingut èxit, però l'agafament ha\n"
+"fallat. Podeu inspeccionar què s'ha agafat amb\n"
+"'git status' i tornar a intentar l'agafament amb\n"
+"'git checkout -f HEAD'\n"
-#: builtin/clone.c:524
+#: builtin/clone.c:531
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No s'ha pogut trobar la branca remota %s per a clonar."
-#: builtin/clone.c:614
+#: builtin/clone.c:621
#, c-format
msgid "Checking connectivity... "
msgstr "Provant connectivitat... "
-#: builtin/clone.c:617
+#: builtin/clone.c:624
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: builtin/clone.c:681
+#: builtin/clone.c:688
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"el HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
"agafar.\n"
-#: builtin/clone.c:712
+#: builtin/clone.c:719
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:799
+#: builtin/clone.c:808
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:801
+#: builtin/clone.c:810
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:831
+#: builtin/clone.c:842
msgid "Too many arguments."
msgstr "Hi ha massa paràmetres."
-#: builtin/clone.c:835
+#: builtin/clone.c:846
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un dipòsit per a clonar."
-#: builtin/clone.c:846
+#: builtin/clone.c:857
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:849
+#: builtin/clone.c:860
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:862
+#: builtin/clone.c:873
#, c-format
msgid "repository '%s' does not exist"
msgstr "el dipòsit '%s' no existeix"
-#: builtin/clone.c:868 builtin/fetch.c:1168
+#: builtin/clone.c:879 builtin/fetch.c:1166
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és nombre positiu"
-#: builtin/clone.c:878
+#: builtin/clone.c:889
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "el camí destí '%s' ja existeix i no és un directori buit."
-#: builtin/clone.c:888
+#: builtin/clone.c:899
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball '%s' ja existeix."
-#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
-#: builtin/worktree.c:245
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no s'ha pogut crear els directoris inicials de '%s'"
-#: builtin/clone.c:906
+#: builtin/clone.c:917
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'"
-#: builtin/clone.c:924
+#: builtin/clone.c:935
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonant al dipòsit nu '%s'...\n"
-#: builtin/clone.c:926
+#: builtin/clone.c:937
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonant a '%s'...\n"
-#: builtin/clone.c:951
-msgid "--dissociate given, but there is no --reference"
-msgstr "s'ha donat --dissociate, però no hi ha --reference"
-
-#: builtin/clone.c:968
+#: builtin/clone.c:975
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:971
+#: builtin/clone.c:978
msgid "source repository is shallow, ignoring --local"
msgstr "el dipòsit font és superficial, ignorant --local"
-#: builtin/clone.c:976
+#: builtin/clone.c:983
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:980
+#: builtin/clone.c:987
#, c-format
msgid "Don't know how to clone %s"
msgstr "No se sap com clonar %s"
-#: builtin/clone.c:1029 builtin/clone.c:1037
+#: builtin/clone.c:1036 builtin/clone.c:1044
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branca remota %s no es troba en la font %s"
-#: builtin/clone.c:1040
+#: builtin/clone.c:1047
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un dipòsit buit."
@@ -4780,15 +4826,15 @@ msgstr "Espai d'encoixinada entre columnes"
msgid "--command must be the first argument"
msgstr "--command ha de ser el primer paràmetre"
-#: builtin/commit.c:37
+#: builtin/commit.c:38
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4815,7 +4861,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:60
+#: builtin/commit.c:61
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4841,7 +4887,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
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"
@@ -4851,7 +4897,7 @@ msgstr ""
"deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n"
"podeu eliminar la comissió per complet amb \"git reset HEAD^\".\n"
-#: builtin/commit.c:77
+#: builtin/commit.c:78
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4866,11 +4912,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:84
+#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
msgstr "D'altra manera, si us plau, useu 'git reset'\n"
-#: builtin/commit.c:87
+#: builtin/commit.c:88
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4886,66 +4932,66 @@ msgstr ""
"Llavors \"git cherry-pick --continue\" reprendrà recollint\n"
"com a cireres les comissions restants.\n"
-#: builtin/commit.c:304
+#: builtin/commit.c:305
msgid "failed to unpack HEAD tree object"
msgstr "s'ha fallat en desempaquetar l'objecte d'arbre HEAD"
-#: builtin/commit.c:345
+#: builtin/commit.c:346
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
-#: builtin/commit.c:351
+#: builtin/commit.c:352
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:364
+#: builtin/commit.c:365
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
-#: builtin/commit.c:366
+#: builtin/commit.c:367
msgid "Failed to update main cache tree"
msgstr "S'ha fallat en actualitzar l'arbre principal de memòria cau"
-#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr "no s'ha pogut escriure el fitxer new_index"
-#: builtin/commit.c:444
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
-#: builtin/commit.c:446
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no es pot fer una comissió parcial durant un recull de cireres."
-#: builtin/commit.c:455
+#: builtin/commit.c:456
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:474
+#: builtin/commit.c:475
msgid "unable to write temporary index file"
msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
-#: builtin/commit.c:579
+#: builtin/commit.c:580
#, c-format
msgid "commit '%s' lacks author header"
msgstr "a la comissió '%s' li manca la capçalera d'autor"
-#: builtin/commit.c:581
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "la comissió '%s' té una línia d'autor mal formada"
-#: builtin/commit.c:600
+#: builtin/commit.c:601
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:608
+#: builtin/commit.c:609
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
-#: builtin/commit.c:652
+#: builtin/commit.c:653
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -4953,38 +4999,38 @@ msgstr ""
"no es pot seleccionar un caràcter de comentari que\n"
"no sigui usat en el missatge de comissió actual"
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: builtin/commit.c:701 builtin/shortlog.c:273
+#: builtin/commit.c:702 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(llegint el missatge de registre des de l'entrada estàndard)\n"
-#: builtin/commit.c:703
+#: builtin/commit.c:704
msgid "could not read log from standard input"
msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard"
-#: builtin/commit.c:707
+#: builtin/commit.c:708
#, c-format
msgid "could not read log file '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre '%s'"
-#: builtin/commit.c:729
+#: builtin/commit.c:730
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
-#: builtin/commit.c:733
+#: builtin/commit.c:734
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogut llegir SQUASH_MSG"
-#: builtin/commit.c:784
+#: builtin/commit.c:785
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
-#: builtin/commit.c:802
+#: builtin/commit.c:803
#, c-format
msgid ""
"\n"
@@ -4999,7 +5045,7 @@ msgstr ""
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:807
+#: builtin/commit.c:808
#, c-format
msgid ""
"\n"
@@ -5014,7 +5060,7 @@ msgstr ""
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5024,7 +5070,7 @@ msgstr ""
"S'ignoraran les línies començant amb '%c', i un missatge de\n"
"comissió buit avorta la comissió.\n"
-#: builtin/commit.c:827
+#: builtin/commit.c:828
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5035,148 +5081,149 @@ msgstr ""
"Es retindran les línies començants amb '%c'; podeu eliminar-les per vós\n"
"mateix si voleu. Un missatge buit avorta la comissió.\n"
-#: builtin/commit.c:847
+#: builtin/commit.c:848
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:855
+#: builtin/commit.c:856
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:862
+#: builtin/commit.c:863
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:937
+#: builtin/commit.c:938
msgid "Error building trees"
msgstr "Error en construir arbres"
-#: builtin/commit.c:952 builtin/tag.c:495
+#: builtin/commit.c:953 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Si us plau, proveïu el missatge per usar o l'opció -m o l'opció -F.\n"
-#: builtin/commit.c:1054
+#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n"
"cap autor existent"
-#: builtin/commit.c:1069 builtin/commit.c:1309
+#: builtin/commit.c:1070 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fitxers no seguits no vàlid '%s'"
-#: builtin/commit.c:1106
+#: builtin/commit.c:1107
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
-#: builtin/commit.c:1136
+#: builtin/commit.c:1137
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambdós --reset-author i --author no té sentit"
-#: builtin/commit.c:1145
+#: builtin/commit.c:1146
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1150
+#: builtin/commit.c:1151
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Esteu enmig d'un recull de cireres -- no es pot esmenar."
-#: builtin/commit.c:1153
+#: builtin/commit.c:1154
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les opcions --squash i --fixup no es poden usar juntes"
-#: builtin/commit.c:1163
+#: builtin/commit.c:1164
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Només un de -c/-C/-F/--fixup es pot usar."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup."
-#: builtin/commit.c:1173
+#: builtin/commit.c:1174
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author només es pot usar amb -C, -c o --amend."
-#: builtin/commit.c:1190
+#: builtin/commit.c:1191
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar."
-#: builtin/commit.c:1192
+#: builtin/commit.c:1193
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense camí."
-#: builtin/commit.c:1194
+#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
msgstr "Intel·ligent... esmenant l'últim amb índex brut."
-#: builtin/commit.c:1196
+#: builtin/commit.c:1197
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"S'han especificat camins explícits sense -i o -o; presumint camins --only..."
-#: builtin/commit.c:1208 builtin/tag.c:730
+#: builtin/commit.c:1209 builtin/tag.c:475
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de neteja no vàlid %s"
-#: builtin/commit.c:1213
+#: builtin/commit.c:1214
msgid "Paths with -a does not make sense."
msgstr "-a no té sentit amb camins."
-#: builtin/commit.c:1323 builtin/commit.c:1602
+#: builtin/commit.c:1324 builtin/commit.c:1605
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1325 builtin/commit.c:1604
+#: builtin/commit.c:1326 builtin/commit.c:1607
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
+#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
-#: builtin/commit.c:1330 builtin/commit.c:1608
+#: builtin/commit.c:1331 builtin/commit.c:1611
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
-#: builtin/commit.c:1333 builtin/commit.c:1611
+#: builtin/commit.c:1334 builtin/commit.c:1614
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
-#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:604
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1336 builtin/commit.c:1614
+#: builtin/commit.c:1337 builtin/commit.c:1617
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "
"defecte: all)"
-#: builtin/commit.c:1339
+#: builtin/commit.c:1340
msgid "show ignored files"
msgstr "mostra els fitxers ignorats"
-#: builtin/commit.c:1340 parse-options.h:155
+#: builtin/commit.c:1341 parse-options.h:155
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1341
+#: builtin/commit.c:1342
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5184,197 +5231,202 @@ msgstr ""
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1344
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1429
+#: builtin/commit.c:1430
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1432
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1477
msgid "detached HEAD"
msgstr "HEAD separat"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1480
msgid " (root-commit)"
msgstr " (comissió d'arrel)"
-#: builtin/commit.c:1572
+#: builtin/commit.c:1575
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1576
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1578
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1576 builtin/tag.c:602
+#: builtin/commit.c:1579 builtin/tag.c:351
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1578 builtin/gc.c:268
+#: builtin/commit.c:1581 builtin/gc.c:326
msgid "date"
msgstr "data"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1581
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
-#: builtin/notes.c:555 builtin/tag.c:600
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
msgid "message"
msgstr "missatge"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1582
msgid "commit message"
msgstr "missatge de comissió"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr "comissió"
+
+#: builtin/commit.c:1583
msgid "reuse and edit message from specified commit"
msgstr "reusa i edita el missatge de la comissió especificada"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1584
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1585
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usa el missatge formatat d'aixafada automàtica per a arreglar la comissió "
"especificada"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1586
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usa el missatge formatat d'aixafada automàtica per a aixafar la comissió "
"especificada"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1587
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"
-#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1589
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1590
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1591
msgid "default"
msgstr "per defecte"
-#: builtin/commit.c:1588 builtin/tag.c:605
+#: builtin/commit.c:1591 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "com despullar els espais i #comentaris del missatge"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1592
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
-#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "firma la comissió amb GPG"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1597
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1598
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1599
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1600
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1601
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1602
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1603
msgid "bypass pre-commit hook"
msgstr "evita el ganxo de precomissió"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1604
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1615
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1616
msgid "bypass post-rewrite hook"
msgstr "evita el ganxo de postreescriure"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1621
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1623
msgid "ok to record a change with an empty message"
msgstr "està bé registrar un canvi amb missatge buit"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: builtin/commit.c:1695
+#: builtin/commit.c:1698
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
-#: builtin/commit.c:1702
+#: builtin/commit.c:1705
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1721
+#: builtin/commit.c:1724
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: builtin/commit.c:1732
+#: builtin/commit.c:1735
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avortant la comissió; no heu editat el missatge.\n"
-#: builtin/commit.c:1737
+#: builtin/commit.c:1740
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avortant la comissió a causa d'un missatge de comissió buit.\n"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1788
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5514,11 +5566,11 @@ msgstr "mostra només els noms de variable"
msgid "respect include directives on lookup"
msgstr "respecta les directives d'inclusió en cercar"
-#: builtin/config.c:311
+#: builtin/config.c:303
msgid "unable to parse default color value"
msgstr "no s'ha pogut analitzar el valor de color per defecte"
-#: builtin/config.c:449
+#: builtin/config.c:441
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5533,16 +5585,16 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:583
+#: builtin/config.c:575
#, c-format
msgid "cannot create configuration file %s"
msgstr "no es pot crear el fitxer de configuració '%s'"
-#: builtin/count-objects.c:55
+#: builtin/count-objects.c:77
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:65
+#: builtin/count-objects.c:87
msgid "print sizes in human readable format"
msgstr "imprimeix les mides en un format llegible pels humans"
@@ -5662,7 +5714,7 @@ msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
msgid "only consider tags matching <pattern>"
msgstr "només considera les etiquetes que coincideixen amb <patró>"
-#: builtin/describe.c:410 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:314
msgid "show abbreviated commit object as fallback"
msgstr "mostra l'objecte de comissió abreviat com a retrocediment"
@@ -5881,7 +5933,7 @@ msgstr "[al dia]"
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (no es pot obtenir en la branca actual)"
-#: builtin/fetch.c:478 builtin/fetch.c:564
+#: builtin/fetch.c:478 builtin/fetch.c:566
msgid "[rejected]"
msgstr "[rebutjat]"
@@ -5905,40 +5957,40 @@ msgstr "[branca nova]"
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "unable to update local ref"
msgstr "no s'ha pogut actualitzar la referència local"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:566
+#: builtin/fetch.c:568
msgid "(non-fast-forward)"
msgstr "(sense avanç ràpid)"
-#: builtin/fetch.c:600 builtin/fetch.c:842
+#: builtin/fetch.c:602 builtin/fetch.c:843
#, c-format
msgid "cannot open %s: %s\n"
msgstr "no es pot obrir %s: %s\n"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:611
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
-#: builtin/fetch.c:627
+#: builtin/fetch.c:629
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
-#: builtin/fetch.c:715 builtin/fetch.c:807
+#: builtin/fetch.c:716 builtin/fetch.c:808
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:726
+#: builtin/fetch.c:727
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -5948,55 +6000,55 @@ msgstr ""
" intenteu executar 'git remote prune %s' per a eliminar\n"
" qualsevulla branca antiga o conflictiva"
-#: builtin/fetch.c:778
+#: builtin/fetch.c:779
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:811
+#: builtin/fetch.c:812
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:812 builtin/remote.c:1034
+#: builtin/fetch.c:813 builtin/remote.c:1040
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:832
+#: builtin/fetch.c:833
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refusant obtenir en la branca actual %s d'un dipòsit no nu"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s"
-#: builtin/fetch.c:854
+#: builtin/fetch.c:855
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "S'ignora l'opció \"%s\" per a %s\n"
-#: builtin/fetch.c:910
+#: builtin/fetch.c:911
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "No se sap com obtenir de %s"
-#: builtin/fetch.c:1071
+#: builtin/fetch.c:1072
#, c-format
msgid "Fetching %s\n"
msgstr "Obtenint %s\n"
-#: builtin/fetch.c:1073 builtin/remote.c:90
+#: builtin/fetch.c:1074 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "No s'ha pogut obtenir %s"
-#: builtin/fetch.c:1091
+#: builtin/fetch.c:1092
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6004,32 +6056,32 @@ msgstr ""
"Cap dipòsit remot especificat. Si us plau, especifiqueu o un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
-#: builtin/fetch.c:1114
+#: builtin/fetch.c:1115
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
-#: builtin/fetch.c:1156
+#: builtin/fetch.c:1157
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1159
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un dipòsit complet no té sentit"
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1179
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un paràmetre de dipòsit"
-#: builtin/fetch.c:1183
+#: builtin/fetch.c:1181
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1192
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No hi ha tal remot ni tal grup remot: %s"
-#: builtin/fetch.c:1202
+#: builtin/fetch.c:1200
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Obtenir un grup i especificar referències no té sentit"
@@ -6039,23 +6091,23 @@ msgid ""
msgstr ""
"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:667
msgid "populate log with at most <n> entries from shortlog"
msgstr "emplena el registre amb <n> entrades del registre curt com a màxim"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:670
msgid "alias for --log (deprecated)"
msgstr "àlies per --log (desaprovat)"
-#: builtin/fmt-merge-msg.c:676
+#: builtin/fmt-merge-msg.c:673
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:674
msgid "use <text> as start of message"
msgstr "usa <text> com a inici de missatge"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:675
msgid "file to read from"
msgstr "fitxer del qual llegir"
@@ -6063,97 +6115,117 @@ msgstr "fitxer del qual llegir"
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<opcions>] [<patró>]"
-#: builtin/for-each-ref.c:24
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <objecte>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<objecte>]]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr "git for-each-ref [--contains [<objecte>]]"
+
+#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr ""
"posa els marcadors de posició entre cometes de forma adequada per a "
"intèrprets d'ordres"
-#: builtin/for-each-ref.c:26
+#: builtin/for-each-ref.c:29
msgid "quote placeholders suitably for perl"
msgstr "posa els marcadors de posició entre cometes adequades per al perl"
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for python"
msgstr "posa els marcadors de posició entre cometes adequades per al python"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for Tcl"
msgstr "posa els marcadors de posició entre cometes adequades per al Tcl"
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:36
msgid "show only <n> matched refs"
msgstr "mostra només <n> referències coincidents"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
msgid "format to use for the output"
msgstr "format a usar en la sortida"
-#: builtin/for-each-ref.c:35
-msgid "key"
-msgstr "clau"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
+msgstr "imprimeix només les referències que assenyalin l'objecte donat"
-#: builtin/for-each-ref.c:36
-msgid "field name to sort on"
-msgstr "nom de camp en el qual ordenar"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr "imprimeix només les referències que s'han fusionat"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr "imprimeix només les referències que no s'han fusionat"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr "imprimeix només les referències que continguin la comissió"
-#: builtin/fsck.c:163 builtin/prune.c:137
+#: builtin/fsck.c:156 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "Comprovant connectivitat"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:486
msgid "Checking object directories"
msgstr "Comprovant els directoris d'objecte"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:553
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcions>] [<objecte>...]"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:559
msgid "show unreachable objects"
msgstr "mostra els objectes inabastables"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:560
msgid "show dangling objects"
msgstr "mostra els objectes penjants"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:561
msgid "report tags"
msgstr "informa de les etiquetes"
-#: builtin/fsck.c:640
+#: builtin/fsck.c:562
msgid "report root nodes"
msgstr "informa dels nodes d'arrel"
-#: builtin/fsck.c:641
+#: builtin/fsck.c:563
msgid "make index objects head nodes"
msgstr "fes els objectes d'índex nodes de cap"
-#: builtin/fsck.c:642
+#: builtin/fsck.c:564
msgid "make reflogs head nodes (default)"
msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
-#: builtin/fsck.c:643
+#: builtin/fsck.c:565
msgid "also consider packs and alternate objects"
msgstr "també considera els paquets i els objectes alternatius"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:566
msgid "check only connectivity"
msgstr "comprova només la connectivitat"
-#: builtin/fsck.c:645
+#: builtin/fsck.c:567
msgid "enable more strict checking"
msgstr "habilita la comprovació més estricta"
-#: builtin/fsck.c:647
+#: builtin/fsck.c:569
msgid "write dangling objects in .git/lost-found"
msgstr "escriu objectes penjants a .git/lost-found"
-#: builtin/fsck.c:648 builtin/prune.c:107
+#: builtin/fsck.c:570 builtin/prune.c:107
msgid "show progress"
msgstr "mostra el progrés"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:631
msgid "Checking objects"
msgstr "Comprovant els objectes"
@@ -6161,56 +6233,71 @@ msgstr "Comprovant els objectes"
msgid "git gc [<options>]"
msgstr "git gc [<opcions>]"
-#: builtin/gc.c:55
+#: builtin/gc.c:72
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s no vàlid: %s"
-#: builtin/gc.c:100
+#: builtin/gc.c:139
#, c-format
msgid "insanely long object directory %.*s"
msgstr "directori d'objectes increïblement llarg %.*s"
-#: builtin/gc.c:269
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"L'última execució de gc ha informat d'ho següent. Si us plau, corregiu\n"
+"la causa primordial i elimineu %s.\n"
+"No es realitzarà la neteja automàtica fins que s'elimini el fitxer.\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:327
msgid "prune unreferenced objects"
msgstr "poda objectes sense referència"
-#: builtin/gc.c:271
+#: builtin/gc.c:329
msgid "be more thorough (increased runtime)"
msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
-#: builtin/gc.c:272
+#: builtin/gc.c:330
msgid "enable auto-gc mode"
msgstr "habilita el mode de recollida d'escombraries automàtica"
-#: builtin/gc.c:273
+#: builtin/gc.c:331
msgid "force running gc even if there may be another gc running"
msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"
-#: builtin/gc.c:315
+#: builtin/gc.c:373
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Empaquetant automàticament el dipòsit en el fons per rendiment òptim.\n"
-#: builtin/gc.c:317
+#: builtin/gc.c:375
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Empaquetant automàticament el dipòsit per rendiment òptim.\n"
-#: builtin/gc.c:318
+#: builtin/gc.c:376
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vegeu \"git help gc\" per neteja manual.\n"
-#: builtin/gc.c:336
+#: builtin/gc.c:397
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"gc ja està executant en la màquina '%s' pid %<PRIuMAX> (useu --force si no)"
-#: builtin/gc.c:364
+#: builtin/gc.c:441
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -6246,203 +6333,199 @@ msgstr "l'opció `%c' espera un valor numèric"
msgid "cannot open '%s'"
msgstr "no es pot obrir '%s'"
-#: builtin/grep.c:638
+#: builtin/grep.c:633
msgid "search in index instead of in the work tree"
msgstr "cerca en l'índex en lloc de l'arbre de treball"
-#: builtin/grep.c:640
+#: builtin/grep.c:635
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:642
+#: builtin/grep.c:637
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:644
+#: builtin/grep.c:639
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
-#: builtin/grep.c:647
+#: builtin/grep.c:642
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:649
+#: builtin/grep.c:644
msgid "case insensitive matching"
msgstr "coincidència insensible a majúscula i minúscula"
-#: builtin/grep.c:651
+#: builtin/grep.c:646
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:653
+#: builtin/grep.c:648
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:655
+#: builtin/grep.c:650
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:658
+#: builtin/grep.c:653
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:660
+#: builtin/grep.c:655
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:664
+#: builtin/grep.c:659
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX esteses"
-#: builtin/grep.c:667
+#: builtin/grep.c:662
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:670
+#: builtin/grep.c:665
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:673
+#: builtin/grep.c:668
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:676
+#: builtin/grep.c:671
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:677
+#: builtin/grep.c:672
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:678
+#: builtin/grep.c:673
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:680
+#: builtin/grep.c:675
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:682
+#: builtin/grep.c:677
msgid "show only filenames instead of matching lines"
msgstr "mostra només els noms de fitxer en lloc de les línies coincidents"
-#: builtin/grep.c:684
+#: builtin/grep.c:679
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:687
+#: builtin/grep.c:682
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:689
+#: builtin/grep.c:684
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:691
+#: builtin/grep.c:686
msgid "show the number of matches instead of matching lines"
msgstr "mostra el nombre de coincidències en lloc de les línies coincidents"
-#: builtin/grep.c:692
+#: builtin/grep.c:687
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:694
+#: builtin/grep.c:689
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:696
+#: builtin/grep.c:691
msgid "show filename only once above matches from same file"
msgstr ""
"mostra el nom de fitxer només una vegada a dalt de les coincidències del "
"mateix fitxer"
-#: builtin/grep.c:699
+#: builtin/grep.c:694
msgid "show <n> context lines before and after matches"
msgstr "mostra <n> línies de context abans i després d'una coincidència"
-#: builtin/grep.c:702
+#: builtin/grep.c:697
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:704
+#: builtin/grep.c:699
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:705
+#: builtin/grep.c:700
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
-#: builtin/grep.c:708
+#: builtin/grep.c:703
msgid "show a line with the function name before matches"
msgstr "mostra una línia amb el nom de funció abans de les coincidències"
-#: builtin/grep.c:710
+#: builtin/grep.c:705
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:713
+#: builtin/grep.c:708
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:715
+#: builtin/grep.c:710
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:717
+#: builtin/grep.c:712
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:729
+#: builtin/grep.c:724
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:731
+#: builtin/grep.c:726
msgid "show only matches from files that match all patterns"
msgstr ""
"mostra només les coincidències dels fitxers que coincideixin amb tots els "
"patrons"
-#: builtin/grep.c:733
+#: builtin/grep.c:728
msgid "show parse tree for grep expression"
msgstr "mostra l'arbre d'anàlisis de l'expressió de grep"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:740
+#: builtin/grep.c:735
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:741 builtin/show-ref.c:189
-msgid "show usage"
-msgstr "mostra l'ús"
-
-#: builtin/grep.c:808
+#: builtin/grep.c:793
msgid "no pattern given."
msgstr "cap patró donat."
-#: builtin/grep.c:866
+#: builtin/grep.c:851
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager només funciona en l'arbre de treball"
-#: builtin/grep.c:892
+#: builtin/grep.c:877
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached o --untracked no es pot usar amb --no-index."
-#: builtin/grep.c:897
+#: builtin/grep.c:882
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index o --untracked no es pot usar amb revisions."
-#: builtin/grep.c:900
+#: builtin/grep.c:885
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits."
-#: builtin/grep.c:908
+#: builtin/grep.c:893
msgid "both --cached and trees are given."
msgstr "s'han donat ambdós --caches i arbres."
@@ -6455,10 +6538,10 @@ msgstr ""
"[--] <fitxer>..."
#: builtin/hash-object.c:81
-msgid "git hash-object --stdin-paths < <list-of-paths>"
-msgstr "git hash-object --stdin-paths < <llista-de-camins>"
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:92 builtin/tag.c:614
+#: builtin/hash-object.c:92
msgid "type"
msgstr "tipus"
@@ -6531,12 +6614,12 @@ msgstr "S'ha fallat en analitzar la versió d'emacsclient."
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versió d'emacsclient '%d' és massa vella (< 22)."
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
msgid "failed to exec '%s': %s"
msgstr "s'ha fallat en executar '%s': %s"
-#: builtin/help.c:215
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -6545,7 +6628,7 @@ msgstr ""
"'%s': camí a un visualitzador de manuals no compatible.\n"
"Si us plau, considereu usar 'man.<eina>.cmd' en lloc d'això."
-#: builtin/help.c:227
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -6554,61 +6637,61 @@ msgstr ""
"'%s': ordre per a un visualitzador de manuals compatible.\n"
"Si us plau, considereu usar 'man.<eina>.path' en lloc d'això."
-#: builtin/help.c:354
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': visualitzador de manuals desconegut"
-#: builtin/help.c:371
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
-#: builtin/help.c:379
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
-#: builtin/help.c:428
+#: builtin/help.c:411
msgid "Defining attributes per path"
msgstr "La definició d'atributs per camí"
-#: builtin/help.c:429
+#: builtin/help.c:412
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git quotidià amb més o menys 20 ordres"
-#: builtin/help.c:430
+#: builtin/help.c:413
msgid "A Git glossary"
msgstr "Un glossari de Git"
-#: builtin/help.c:431
+#: builtin/help.c:414
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
-#: builtin/help.c:432
+#: builtin/help.c:415
msgid "Defining submodule properties"
msgstr "La definició de les propietats de submòduls"
-#: builtin/help.c:433
+#: builtin/help.c:416
msgid "Specifying revisions and ranges for Git"
msgstr "L'especificació de revisions i rangs per al Git"
-#: builtin/help.c:434
+#: builtin/help.c:417
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nou)"
-#: builtin/help.c:435
+#: builtin/help.c:418
msgid "An overview of recommended workflows with Git"
msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
-#: builtin/help.c:447
+#: builtin/help.c:430
msgid "The common Git guides are:\n"
msgstr "Les guies de Git comunes són:\n"
-#: builtin/help.c:468 builtin/help.c:485
+#: builtin/help.c:451 builtin/help.c:468
#, c-format
msgid "usage: %s%s"
msgstr "ús: %s%s"
-#: builtin/help.c:501
+#: builtin/help.c:484
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' és un àlies de `%s'"
@@ -6901,87 +6984,62 @@ msgstr "el nom de fitxer de paquet '%s' no acaba amb '.pack'"
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
-#: builtin/init-db.c:36
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "No s'ha pogut fer %s escrivible pel grup"
-
-#: builtin/init-db.c:63
-#, c-format
-msgid "insanely long template name %s"
-msgstr "nom de plantilla increïblement llarg %s"
-
-#: builtin/init-db.c:68
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "no es pot fer stat en '%s'"
-#: builtin/init-db.c:74
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "no es pot fer stat en la plantilla '%s'"
-#: builtin/init-db.c:81
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "no es pot fer opendir en el directori '%s'"
-#: builtin/init-db.c:98
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr "no es pot fer readlink en '%s'"
-#: builtin/init-db.c:100
-#, c-format
-msgid "insanely long symlink %s"
-msgstr "enllaç simbòlic increïblement llarg %s"
-
-#: builtin/init-db.c:103
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "no es pot fer symlink en '%s' '%s'"
-#: builtin/init-db.c:107
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "no es pot copiar '%s' a '%s'"
-#: builtin/init-db.c:111
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr "ignorant la plantilla %s"
-#: builtin/init-db.c:137
-#, c-format
-msgid "insanely long template path %s"
-msgstr "camí de plantilla increïblement llarg %s"
-
-#: builtin/init-db.c:145
+#: builtin/init-db.c:118
#, c-format
msgid "templates not found %s"
msgstr "no s'han trobat les plantilles %s"
-#: builtin/init-db.c:158
+#: builtin/init-db.c:131
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr "no copiant plantilles d'una versió de format errònia %d de '%s'"
-#: builtin/init-db.c:212
-#, c-format
-msgid "insane git directory %s"
-msgstr "directori de git boig %s"
-
-#: builtin/init-db.c:344 builtin/init-db.c:347
+#: builtin/init-db.c:309 builtin/init-db.c:312
#, c-format
msgid "%s already exists"
msgstr "%s ja existeix"
-#: builtin/init-db.c:375
+#: builtin/init-db.c:340
#, c-format
msgid "unable to handle file type %d"
msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
-#: builtin/init-db.c:378
+#: builtin/init-db.c:343
#, c-format
msgid "unable to move %s to %s"
msgstr "no s'ha pogut moure %s a %s"
@@ -6989,24 +7047,24 @@ msgstr "no s'ha pogut moure %s a %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:434
+#: builtin/init-db.c:399
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s dipòsit de Git%s a %s%s\n"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Reinitialized existing"
msgstr "S'ha reinicialitzat un existent"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Initialized empty"
msgstr "S'ha inicialitzat un buit"
-#: builtin/init-db.c:436
+#: builtin/init-db.c:401
msgid " shared"
msgstr " compartit"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:448
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7014,25 +7072,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
"shared[=<permisos>]] [<directori>]"
-#: builtin/init-db.c:506
+#: builtin/init-db.c:471
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:507
+#: builtin/init-db.c:472
msgid "specify that the git repository is to be shared amongst several users"
msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris"
-#: builtin/init-db.c:541 builtin/init-db.c:546
+#: builtin/init-db.c:506 builtin/init-db.c:511
#, c-format
msgid "cannot mkdir %s"
msgstr "no es pot mkdir %s"
-#: builtin/init-db.c:550
+#: builtin/init-db.c:515
#, c-format
msgid "cannot chdir to %s"
msgstr "no es pot chdir a %s"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:536
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7041,7 +7099,7 @@ msgstr ""
"no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
"dir=<directori>)"
-#: builtin/init-db.c:599
+#: builtin/init-db.c:564
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No es pot accedir a l'arbre de treball '%s'"
@@ -7127,33 +7185,33 @@ msgstr "format.headers sense valor"
msgid "name of output directory is too long"
msgstr "el nom del directori de sortida és massa llarg"
-#: builtin/log.c:814
+#: builtin/log.c:813
#, c-format
msgid "Cannot open patch file %s"
msgstr "No es pot obrir el fitxer de pedaç %s"
-#: builtin/log.c:828
+#: builtin/log.c:827
msgid "Need exactly one range."
msgstr "Cal exactament un rang."
-#: builtin/log.c:838
+#: builtin/log.c:837
msgid "Not a range."
msgstr "No és un rang."
-#: builtin/log.c:944
+#: builtin/log.c:943
msgid "Cover letter needs email format"
msgstr "La carta de presentació necessita el format de correu electrònic"
-#: builtin/log.c:1023
+#: builtin/log.c:1022
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1051
+#: builtin/log.c:1050
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1096
+#: builtin/log.c:1095
msgid "Two output directories?"
msgstr "Dos directoris de sortida?"
@@ -7210,130 +7268,134 @@ msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr "emet un hash de tots zeros en la capçalera From"
+
+#: builtin/log.c:1243
msgid "don't include a patch matching a commit upstream"
msgstr "no incloguis pedaços que coincideixin amb comissions a la font"
-#: builtin/log.c:1243
+#: builtin/log.c:1245
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
-#: builtin/log.c:1245
+#: builtin/log.c:1247
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1246
+#: builtin/log.c:1248
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1247
+#: builtin/log.c:1249
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1248 builtin/log.c:1250
+#: builtin/log.c:1250 builtin/log.c:1252
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1248
+#: builtin/log.c:1250
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1250
+#: builtin/log.c:1252
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1252
+#: builtin/log.c:1254
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1253
+#: builtin/log.c:1255
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
-#: builtin/log.c:1255
+#: builtin/log.c:1257
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1256
+#: builtin/log.c:1258
msgid "make first mail a reply to <message-id>"
msgstr "fes del primer missatge una resposta a <ID de missatge>"
-#: builtin/log.c:1257 builtin/log.c:1260
+#: builtin/log.c:1259 builtin/log.c:1262
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1258
+#: builtin/log.c:1260
msgid "attach the patch"
msgstr "ajunta el pedaç"
-#: builtin/log.c:1261
+#: builtin/log.c:1263
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1265
+#: builtin/log.c:1267
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1267
+#: builtin/log.c:1269
msgid "signature"
msgstr "firma"
-#: builtin/log.c:1268
+#: builtin/log.c:1270
msgid "add a signature"
msgstr "afegeix una firma"
-#: builtin/log.c:1270
+#: builtin/log.c:1272
msgid "add a signature from a file"
msgstr "afegeix una firma des d'un fitxer"
-#: builtin/log.c:1271
+#: builtin/log.c:1273
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1360
+#: builtin/log.c:1362
msgid "-n and -k are mutually exclusive."
msgstr "-n i -k són mutualment exclusius."
-#: builtin/log.c:1362
+#: builtin/log.c:1364
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix i -k són mutualment exclusius."
-#: builtin/log.c:1370
+#: builtin/log.c:1372
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1372
+#: builtin/log.c:1374
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1374
+#: builtin/log.c:1376
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1397
+#: builtin/log.c:1401
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
-#: builtin/log.c:1399
+#: builtin/log.c:1403
#, c-format
msgid "Could not create directory '%s'"
msgstr "No s'ha pogut crear el directori '%s'"
-#: builtin/log.c:1496
+#: builtin/log.c:1500
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de firma '%s'"
-#: builtin/log.c:1559
+#: builtin/log.c:1563
msgid "Failed to create output files"
msgstr "S'ha fallat en crear els fitxers de sortida"
-#: builtin/log.c:1607
+#: builtin/log.c:1611
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:1661
+#: builtin/log.c:1665
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7341,7 +7403,7 @@ msgstr ""
"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "
"<font> manualment.\n"
-#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
+#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr "Comissió desconeguda %s"
@@ -7444,35 +7506,35 @@ msgstr "mostra les dades de depuració"
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<opcions>] <arbre> [<camí>...]"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "mostra només els arbres"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "recursa als subarbres"
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "mostra els arbres en recursar"
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "acaba les entrades amb un octet NUL"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "mida de l'objecte d'inclusió"
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "llista només els noms de fitxer"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "usa els noms de camí complets"
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"llista l'arbre sencer; no només el directori actual (implica --full-name)"
@@ -7708,16 +7770,16 @@ msgstr "No hi ha cap font per defecte definida per a la branca actual."
msgid "No remote-tracking branch for %s from %s"
msgstr "No hi ha cap branca amb seguiment remot per a %s de %s"
-#: builtin/merge.c:1081
+#: builtin/merge.c:1079
#, c-format
msgid "could not close '%s'"
msgstr "no s'ha pogut tancar '%s'"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1206
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
-#: builtin/merge.c:1224
+#: builtin/merge.c:1222
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7725,7 +7787,7 @@ msgstr ""
"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
"Si us plau, cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1231
+#: builtin/merge.c:1229
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7733,54 +7795,54 @@ msgstr ""
"No heu conclòs el vostre recull de cireres (CHERRY_PICK_HEAD existeix).\n"
"Si us plau, cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1234
+#: builtin/merge.c:1232
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"No heu conclòs el vostre recull de cireres (CHERRY_PICK_HEAD existeix)."
-#: builtin/merge.c:1243
+#: builtin/merge.c:1241
msgid "You cannot combine --squash with --no-ff."
msgstr "No podeu combinar --squash amb --no-ff."
-#: builtin/merge.c:1251
+#: builtin/merge.c:1249
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"No hi ha una comissió especificada i merge.defaultToUpstream no està "
"establert."
-#: builtin/merge.c:1268
+#: builtin/merge.c:1266
msgid "Squash commit into empty head not supported yet"
msgstr "Aixafar una comissió a un cap buit encara no es permet"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1268
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Una comissió no d'avanç ràpid no té sentit a un cap buit"
-#: builtin/merge.c:1276
+#: builtin/merge.c:1274
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - no és una cosa que puguem fusionar"
-#: builtin/merge.c:1278
+#: builtin/merge.c:1276
msgid "Can merge only exactly one commit into empty head"
msgstr "Es pot fusionar no més d'exactament una comissió a un cap buit"
-#: builtin/merge.c:1333
+#: builtin/merge.c:1331
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La comissió %s té una firma GPG no fiable, suposadament de %s."
-#: builtin/merge.c:1336
+#: builtin/merge.c:1334
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La comissió %s té una firma GPG dolenta suposadament de %s."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La comissió %s no té firma GPG."
-#: builtin/merge.c:1342
+#: builtin/merge.c:1340
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La comissió %s té una firma GPG bona de %s\n"
@@ -7790,46 +7852,46 @@ msgstr "La comissió %s té una firma GPG bona de %s\n"
msgid "Updating %s..%s\n"
msgstr "Actualitzant %s..%s\n"
-#: builtin/merge.c:1462
+#: builtin/merge.c:1460
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Intentant una fusió molt trivial en l'índex...\n"
-#: builtin/merge.c:1469
+#: builtin/merge.c:1467
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1501
+#: builtin/merge.c:1499
msgid "Not possible to fast-forward, aborting."
msgstr "No és possible avançar ràpidament, avortant."
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rebobinant l'arbre a la pristina...\n"
-#: builtin/merge.c:1528
+#: builtin/merge.c:1526
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Intentant l'estratègia de fusió %s...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1592
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-#: builtin/merge.c:1596
+#: builtin/merge.c:1594
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1603
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Usant el %s per a preparar la resolució a mà.\n"
-#: builtin/merge.c:1617
+#: builtin/merge.c:1615
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8022,48 +8084,48 @@ msgstr "%s, origen=%s, destí=%s"
msgid "Renaming %s to %s\n"
msgstr "Canviant el nom de %s a %s\n"
-#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "el canvi del nom de '%s' ha fallat"
-#: builtin/name-rev.c:255
+#: builtin/name-rev.c:251
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opcions>] <comissió>..."
-#: builtin/name-rev.c:256
+#: builtin/name-rev.c:252
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opcions>] --all"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:253
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opcions>] --stdin"
-#: builtin/name-rev.c:309
+#: builtin/name-rev.c:305
msgid "print only names (no SHA-1)"
msgstr "imprimeix només els noms (sense SHA-1)"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:306
msgid "only use tags to name the commits"
msgstr "només usa les etiquetes per a anomenar les comissions"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:308
msgid "only use refs matching <pattern>"
msgstr "només usa les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:310
msgid "list all commits reachable from all refs"
msgstr "llista totes les comissions abastables de totes les referències"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:311
msgid "read from stdin"
msgstr "llegeix d'stdin"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:312
msgid "allow to print `undefined` names (default)"
msgstr "permet imprimir els noms `undefined` (per defecte)"
-#: builtin/name-rev.c:322
+#: builtin/name-rev.c:318
msgid "dereference tags in the input (internal use)"
msgstr "dereferencia les etiquetes en l'entrada (ús intern)"
@@ -8194,7 +8256,7 @@ msgstr "no s'ha pogut llegir la sortida de 'show'"
msgid "failed to finish 'show' for object '%s'"
msgstr "s'ha fallat en finalitzar 'show' per a l'objecte '%s'"
-#: builtin/notes.c:174 builtin/tag.c:477
+#: builtin/notes.c:174 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "no s'ha pogut crear el fitxer '%s'"
@@ -8214,12 +8276,12 @@ msgstr "no s'ha pogut escriure l'objecte de nota"
msgid "The note contents have been left in %s"
msgstr "Els continguts de la nota s'han deixat en %s"
-#: builtin/notes.c:232 builtin/tag.c:695
+#: builtin/notes.c:232 builtin/tag.c:440
#, c-format
msgid "cannot read '%s'"
msgstr "no es pot llegir '%s'"
-#: builtin/notes.c:234 builtin/tag.c:698
+#: builtin/notes.c:234 builtin/tag.c:443
#, c-format
msgid "could not open or read '%s'"
msgstr "no s'ha pogut obrir o llegir '%s'"
@@ -8227,7 +8289,7 @@ msgstr "no s'ha pogut obrir o llegir '%s'"
#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
-#: builtin/notes.c:877 builtin/tag.c:711
+#: builtin/notes.c:877 builtin/tag.c:456
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "S'ha fallat en resoldre '%s' com a referència vàlida."
@@ -8261,11 +8323,6 @@ msgstr "anota els continguts com a cadena"
msgid "note contents in a file"
msgstr "anota els continguts en un fitxer"
-#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
-#: builtin/notes.c:564 builtin/tag.c:630
-msgid "object"
-msgstr "objecte"
-
#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr "reusa i edita l'objecte de nota especificat"
@@ -8334,7 +8391,7 @@ 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 ""
-"S'han desaprovat les opcions -m/-F/-c/-C en favor del subordre 'edit'.\n"
+"S'han desaprovat les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n"
"Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n"
#: builtin/notes.c:764
@@ -8395,10 +8452,10 @@ msgstr "referència de notes"
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1012 builtin/remote.c:1588
+#: builtin/notes.c:1012 builtin/remote.c:1647
#, c-format
msgid "Unknown subcommand: %s"
-msgstr "Subordre desconegut: %s"
+msgstr "Subordre desconeguda: %s"
#: builtin/pack-objects.c:28
msgid ""
@@ -8616,20 +8673,24 @@ msgstr "Eliminant objectes duplicats"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<cap>...]"
-#: builtin/prune.c:105 builtin/worktree.c:121
+#: builtin/prune.c:105 builtin/worktree.c:124
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
-#: builtin/prune.c:106 builtin/worktree.c:122
+#: builtin/prune.c:106 builtin/worktree.c:125
msgid "report pruned objects"
msgstr "informa d'objectes podats"
-#: builtin/prune.c:109 builtin/worktree.c:124
+#: builtin/prune.c:109 builtin/worktree.c:127
msgid "expire objects older than <time>"
msgstr "fes caducar els objectes més vells que <hora>"
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "no es pot podar en un dipòsit d'objectes precioses"
+
#: builtin/pull.c:69
-msgid "git pull [options] [<repository> [<refspec>...]]"
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [opcions] [<dipòsit> [<especificació-de-referència>...]]"
#: builtin/pull.c:113
@@ -8682,8 +8743,7 @@ msgstr ""
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-"No hi ha candidats per a fusionar entre les referències que acabeu de "
-"obtenir."
+"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
#: builtin/pull.c:439
msgid ""
@@ -8702,7 +8762,7 @@ msgid ""
msgstr ""
"Heu demanat baixar del remot '%s', però no heu especificat cap branca.\n"
"Perquè aquest no és el remot configurat per defecte per a la vostra\n"
-"branca actual, heu de especificar una branca en la línia d'ordres."
+"branca actual, heu d'especificar una branca en la línia d'ordres."
#: builtin/pull.c:447
msgid "You are not currently on a branch."
@@ -8786,19 +8846,19 @@ msgstr "No es pot fusionar múltiples branques a un cap buit."
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot rebasar sobre múltiples branques."
-#: builtin/push.c:15
+#: builtin/push.c:16
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
-#: builtin/push.c:86
+#: builtin/push.c:88
msgid "tag shorthand without <tag>"
msgstr "abreviatura d'etiqueta sense <tag>"
-#: builtin/push.c:96
+#: builtin/push.c:98
msgid "--delete only accepts plain target ref names"
msgstr "--delete només accepta noms de referència de destí senzills"
-#: builtin/push.c:140
+#: builtin/push.c:142
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -8807,7 +8867,7 @@ msgstr ""
"Per a triar qualsevulla opció permanentment, vegeu push.default a 'git help "
"config'."
-#: builtin/push.c:143
+#: builtin/push.c:145
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -8832,7 +8892,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:158
+#: builtin/push.c:160
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -8847,7 +8907,7 @@ msgstr ""
"\n"
" git push %s HEAD:<nom-de-branca-remota>\n"
-#: builtin/push.c:172
+#: builtin/push.c:174
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -8860,12 +8920,12 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:180
+#: builtin/push.c:182
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "La branca actual %s té múltiples branques fonts, refusant pujar."
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -8876,7 +8936,7 @@ msgstr ""
"branca actual '%s', sense dir-me què pujar per a actualitzar\n"
"quina branca remota."
-#: builtin/push.c:206
+#: builtin/push.c:208
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -8923,14 +8983,14 @@ msgstr ""
"'current' en lloc de 'simple' si a vegades useu versions més antigues\n"
"del Git)"
-#: builtin/push.c:273
+#: builtin/push.c:275
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"No heu especificat cap especificació de referència a pujar, i push.default "
"és \"nothing\"."
-#: builtin/push.c:280
+#: builtin/push.c:282
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -8942,7 +9002,7 @@ msgstr ""
"els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
-#: builtin/push.c:286
+#: builtin/push.c:288
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -8955,7 +9015,7 @@ msgstr ""
"abans de pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
-#: builtin/push.c:292
+#: builtin/push.c:294
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -8970,12 +9030,12 @@ msgstr ""
"pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
-#: builtin/push.c:299
+#: builtin/push.c:301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot."
-#: builtin/push.c:302
+#: builtin/push.c:304
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -8986,22 +9046,22 @@ msgstr ""
"fer que assenyali un objecte no de comissió, sense usar l'opció\n"
"'--force'.\n"
-#: builtin/push.c:361
+#: builtin/push.c:363
#, c-format
msgid "Pushing to %s\n"
msgstr "Pujant a %s\n"
-#: builtin/push.c:365
+#: builtin/push.c:367
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "s'ha fallat en pujar algunes referències a '%s'"
-#: builtin/push.c:395
+#: builtin/push.c:397
#, c-format
msgid "bad repository '%s'"
msgstr "dipòsit dolent '%s'"
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9023,100 +9083,104 @@ msgstr ""
"\n"
" git push <nom>\n"
-#: builtin/push.c:411
+#: builtin/push.c:413
msgid "--all and --tags are incompatible"
msgstr "--all i --tags són incompatibles"
-#: builtin/push.c:412
+#: builtin/push.c:414
msgid "--all can't be combined with refspecs"
msgstr "--all no es pot combinar amb especificacions de referència"
-#: builtin/push.c:417
+#: builtin/push.c:419
msgid "--mirror and --tags are incompatible"
msgstr "--mirror i --tags són incompatibles"
-#: builtin/push.c:418
+#: builtin/push.c:420
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror no es pot combinar amb especificacions de referència"
-#: builtin/push.c:423
+#: builtin/push.c:425
msgid "--all and --mirror are incompatible"
msgstr "--all i --mirror són incompatibles"
-#: builtin/push.c:539
+#: builtin/push.c:537
msgid "repository"
msgstr "dipòsit"
-#: builtin/push.c:540 builtin/send-pack.c:161
+#: builtin/push.c:538 builtin/send-pack.c:161
msgid "push all refs"
msgstr "puja totes les referències"
-#: builtin/push.c:541 builtin/send-pack.c:163
+#: builtin/push.c:539 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "reflecteix totes les referències"
-#: builtin/push.c:543
+#: builtin/push.c:541
msgid "delete refs"
msgstr "suprimeix les referències"
-#: builtin/push.c:544
+#: builtin/push.c:542
msgid "push tags (can't be used with --all or --mirror)"
msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)"
-#: builtin/push.c:547 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:164
msgid "force updates"
msgstr "força les actualitzacions"
-#: builtin/push.c:549 builtin/send-pack.c:175
+#: builtin/push.c:547 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "nom-de-referència>:<esperat"
-#: builtin/push.c:550 builtin/send-pack.c:176
+#: builtin/push.c:548 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "requereix que el valor antic de la referència sigui d'aquest valor"
-#: builtin/push.c:553
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr "comprova|sota demanda|no"
+
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr "controla la pujada recursiva dels submòduls"
-#: builtin/push.c:555 builtin/send-pack.c:169
+#: builtin/push.c:553 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "usa el paquet prim"
-#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
+#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "programa que rep els paquets"
-#: builtin/push.c:558
+#: builtin/push.c:556
msgid "set upstream for git pull/status"
msgstr "estableix la font per a git pull/status"
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "prune locally removed refs"
msgstr "poda les referències eliminades localment"
-#: builtin/push.c:563
+#: builtin/push.c:561
msgid "bypass pre-push hook"
msgstr "evita el ganxo de prepujada"
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "push missing but relevant tags"
msgstr "puja les etiquetes absents però rellevants"
-#: builtin/push.c:567 builtin/send-pack.c:166
+#: builtin/push.c:565 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "firma la pujada amb GPG"
-#: builtin/push.c:569 builtin/send-pack.c:170
+#: builtin/push.c:567 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "demana una transacció atòmica al costat remot"
-#: builtin/push.c:579
+#: builtin/push.c:577
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete és incompatible amb --all, --mirror i --tags"
-#: builtin/push.c:581
+#: builtin/push.c:579
msgid "--delete doesn't make sense without any refs"
msgstr "--delete no té sentit sense referències"
@@ -9194,12 +9258,12 @@ msgstr "salta l'aplicació del filtre d'agafament dispers"
msgid "debug unpack-trees"
msgstr "depura unpack-trees"
-#: builtin/reflog.c:432
+#: builtin/reflog.c:428
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' per a '%s' no és una marca de temps vàlida"
-#: builtin/reflog.c:549 builtin/reflog.c:554
+#: builtin/reflog.c:545 builtin/reflog.c:550
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' no és una marca de temps vàlida"
@@ -9216,15 +9280,15 @@ msgstr ""
"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <nom> <url>"
-#: builtin/remote.c:14 builtin/remote.c:33
+#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
msgstr "git remote rename <antic> <nou>"
-#: builtin/remote.c:15 builtin/remote.c:38
+#: builtin/remote.c:15 builtin/remote.c:39
msgid "git remote remove <name>"
msgstr "git remote remove <nom>"
-#: builtin/remote.c:16 builtin/remote.c:43
+#: builtin/remote.c:16 builtin/remote.c:44
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)"
@@ -9246,48 +9310,52 @@ msgstr ""
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <nom> <branca>..."
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <nom>"
+
+#: builtin/remote.c:22 builtin/remote.c:75
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <nom> <url-nou> [<url-antic>]"
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <nom> <url-nou>"
-#: builtin/remote.c:23 builtin/remote.c:71
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <nom> <url>"
-#: builtin/remote.c:28
+#: builtin/remote.c:29
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<opcions>] <nom> <url>"
-#: builtin/remote.c:48
+#: builtin/remote.c:49
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <nom> <branca>..."
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <nom> <branca>..."
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<opcions>] <nom>"
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<opcions>] <nom>"
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<opcions>] [<grup> | <remot>]..."
-#: builtin/remote.c:88
+#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
msgstr "Actualitzant %s"
-#: builtin/remote.c:120
+#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -9296,98 +9364,98 @@ msgstr ""
"\t plau, useu --mirror=fetch o\n"
"\t --mirror=push en lloc d'això"
-#: builtin/remote.c:137
+#: builtin/remote.c:143
#, c-format
msgid "unknown mirror argument: %s"
msgstr "paràmetre de reflexió desconegut: %s"
-#: builtin/remote.c:153
+#: builtin/remote.c:159
msgid "fetch the remote branches"
msgstr "obtén les branques remotes"
-#: builtin/remote.c:155
+#: builtin/remote.c:161
msgid "import all tags and associated objects when fetching"
msgstr "en obtenir, importa totes les etiquetes i tots els objectes"
-#: builtin/remote.c:158
+#: builtin/remote.c:164
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "o no obtinguis cap etiqueta (--no-tags)"
-#: builtin/remote.c:160
+#: builtin/remote.c:166
msgid "branch(es) to track"
msgstr "branques a seguir"
-#: builtin/remote.c:161
+#: builtin/remote.c:167
msgid "master branch"
msgstr "branca mestra"
-#: builtin/remote.c:162
+#: builtin/remote.c:168
msgid "push|fetch"
msgstr "push|fetch"
-#: builtin/remote.c:163
+#: builtin/remote.c:169
msgid "set up remote as a mirror to push to or fetch from"
msgstr "estableix el remot com a mirall al qual pujar o del qual obtenir"
-#: builtin/remote.c:175
+#: builtin/remote.c:181
msgid "specifying a master branch makes no sense with --mirror"
msgstr "especificar una branca mestra no té sentit amb --mirror"
-#: builtin/remote.c:177
+#: builtin/remote.c:183
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"especificar les branques a seguir té sentit només amb miralls d'obtenció"
-#: builtin/remote.c:187 builtin/remote.c:637
+#: builtin/remote.c:193 builtin/remote.c:643
#, c-format
msgid "remote %s already exists."
msgstr "el remot %s ja existeix."
-#: builtin/remote.c:191 builtin/remote.c:641
+#: builtin/remote.c:197 builtin/remote.c:647
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' no és un nom de remot vàlid"
-#: builtin/remote.c:235
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "No s'ha pogut configurar la mestra '%s'"
-#: builtin/remote.c:335
+#: builtin/remote.c:341
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
"No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s"
-#: builtin/remote.c:436 builtin/remote.c:444
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr "(coincident)"
-#: builtin/remote.c:448
+#: builtin/remote.c:454
msgid "(delete)"
msgstr "(suprimir)"
-#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "No s'ha pogut annexar '%s' a '%s'"
-#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
#, c-format
msgid "No such remote: %s"
msgstr "No hi ha tal remot: %s"
-#: builtin/remote.c:647
+#: builtin/remote.c:653
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "No s'ha pogut canviar el nom de la secció de configuració '%s' a '%s'"
-#: builtin/remote.c:653 builtin/remote.c:821
+#: builtin/remote.c:659 builtin/remote.c:827
#, c-format
msgid "Could not remove config section '%s'"
msgstr "No s'ha pogut eliminar la secció de configuració '%s'"
-#: builtin/remote.c:668
+#: builtin/remote.c:674
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9398,27 +9466,27 @@ msgstr ""
"\t%s\n"
"\tSi us plau, actualitzeu la configuració manualment si és necessari."
-#: builtin/remote.c:674
+#: builtin/remote.c:680
#, c-format
msgid "Could not append '%s'"
msgstr "No s'ha pogut annexar '%s'"
-#: builtin/remote.c:685
+#: builtin/remote.c:691
#, c-format
msgid "Could not set '%s'"
msgstr "No s'ha pogut establir '%s'"
-#: builtin/remote.c:707
+#: builtin/remote.c:713
#, c-format
msgid "deleting '%s' failed"
msgstr "la supressió de '%s' ha fallat"
-#: builtin/remote.c:741
+#: builtin/remote.c:747
#, c-format
msgid "creating '%s' failed"
msgstr "la creació de '%s' ha fallat"
-#: builtin/remote.c:807
+#: builtin/remote.c:813
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9433,267 +9501,280 @@ msgstr[1] ""
"eliminat;\n"
"per a suprimir-les, useu:"
-#: builtin/remote.c:922
+#: builtin/remote.c:928
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
-#: builtin/remote.c:925
+#: builtin/remote.c:931
msgid " tracked"
msgstr " seguit"
-#: builtin/remote.c:927
+#: builtin/remote.c:933
msgid " stale (use 'git remote prune' to remove)"
msgstr " estancat (useu 'git remote prune' per a eliminar)"
-#: builtin/remote.c:929
+#: builtin/remote.c:935
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:970
+#: builtin/remote.c:976
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge no vàlid; no es pot rebasar sobre > 1 branca"
-#: builtin/remote.c:977
+#: builtin/remote.c:983
#, c-format
msgid "rebases onto remote %s"
msgstr "es rebasa sobre el remot %s"
-#: builtin/remote.c:980
+#: builtin/remote.c:986
#, c-format
msgid " merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:981
+#: builtin/remote.c:987
msgid " and with remote"
msgstr " i amb el remot"
-#: builtin/remote.c:983
+#: builtin/remote.c:989
#, c-format
msgid "merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:984
+#: builtin/remote.c:990
msgid " and with remote"
msgstr " i amb el remot"
-#: builtin/remote.c:1030
+#: builtin/remote.c:1036
msgid "create"
msgstr "crea"
-#: builtin/remote.c:1033
+#: builtin/remote.c:1039
msgid "delete"
msgstr "suprimeix"
-#: builtin/remote.c:1037
+#: builtin/remote.c:1043
msgid "up to date"
msgstr "al dia"
-#: builtin/remote.c:1040
+#: builtin/remote.c:1046
msgid "fast-forwardable"
msgstr "avanç ràpid possible"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1049
msgid "local out of date"
msgstr "local no actualitzat"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força a %-*s (%s)"
-#: builtin/remote.c:1053
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s puja a %-*s (%s)"
-#: builtin/remote.c:1057
+#: builtin/remote.c:1063
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força a %s"
-#: builtin/remote.c:1060
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s puja a %s"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
msgid "do not query remotes"
msgstr "no consultis els remots"
-#: builtin/remote.c:1155
+#: builtin/remote.c:1161
#, c-format
msgid "* remote %s"
msgstr "* remot %s"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1162
#, c-format
msgid " Fetch URL: %s"
msgstr " URL d'obtenció: %s"
-#: builtin/remote.c:1157 builtin/remote.c:1308
+#: builtin/remote.c:1163 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(sense URL)"
-#: builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr " URL de pujada: %s"
-#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr " Branca de HEAD: %s"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1182
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branca remota:%s"
msgstr[1] " Branques remotes:%s"
-#: builtin/remote.c:1191 builtin/remote.c:1218
+#: builtin/remote.c:1197 builtin/remote.c:1224
msgid " (status not queried)"
msgstr " (estat no consultat)"
-#: builtin/remote.c:1200
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branca local configurada per a 'git pull':"
msgstr[1] " Branques locals configurades per a 'git pull':"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr " 'git push' reflectirà les referències locals"
-#: builtin/remote.c:1215
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Referència local configurada per a 'git push'%s:"
msgstr[1] " Referències locals configurades per a 'git push'%s:"
-#: builtin/remote.c:1236
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
-#: builtin/remote.c:1238
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "suprimeix refs/remotes/<name>/HEAD"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "No es pot determinar el HEAD remot"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explícitament "
"amb:"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "No s'ha pogut suprimir %s"
-#: builtin/remote.c:1273
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "No és una referència vàlida: %s"
-#: builtin/remote.c:1275
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "No s'ha pogut configurar %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s es tornarà penjant!"
-#: builtin/remote.c:1294
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s s'ha tornat penjant!"
-#: builtin/remote.c:1304
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "Podant %s"
-#: builtin/remote.c:1305
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1321
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [podaria] %s"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [podat] %s"
-#: builtin/remote.c:1369
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "poda els remots després d'obtenir-los"
-#: builtin/remote.c:1435 builtin/remote.c:1509
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
#, c-format
msgid "No such remote '%s'"
msgstr "No hi ha tal remot '%s'"
-#: builtin/remote.c:1455
+#: builtin/remote.c:1461
msgid "add branch"
msgstr "afegeix branca"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1468
msgid "no remote specified"
msgstr "cap remot especificat"
-#: builtin/remote.c:1484
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr "consulta els URL de pujada en lloc dels URL d'obteniment"
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr "retorna tots els URL"
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "cap URL configurat per al remot '%s'"
+
+#: builtin/remote.c:1541
msgid "manipulate push URLs"
msgstr "manipula els URL de pujada"
-#: builtin/remote.c:1486
+#: builtin/remote.c:1543
msgid "add URL"
msgstr "afegeix URL"
-#: builtin/remote.c:1488
+#: builtin/remote.c:1545
msgid "delete URLs"
msgstr "suprimeix URLs"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1552
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no té sentit"
-#: builtin/remote.c:1535
+#: builtin/remote.c:1592
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patró d'URL antic no vàlid: %s"
-#: builtin/remote.c:1543
+#: builtin/remote.c:1600
#, c-format
msgid "No such URL found: %s"
msgstr "No s'ha trobat tal URL: %s"
-#: builtin/remote.c:1545
+#: builtin/remote.c:1602
msgid "Will not delete all non-push URLs"
msgstr "No se suprimiran tots els URL no de pujada"
-#: builtin/remote.c:1559
+#: builtin/remote.c:1616
msgid "be verbose; must be placed before a subcommand"
-msgstr "sigues detallat; s'ha de col·locar abans d'un subordre"
+msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
#: builtin/repack.c:17
msgid "git repack [<options>]"
@@ -9765,7 +9846,11 @@ msgstr "mida màxima de cada fitxer de paquet"
msgid "repack objects in packs marked with .keep"
msgstr "reempaqueta els objectes en paquets marcats amb .keep"
-#: builtin/repack.c:378
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "no es pot suprimir paquets en un dipòsit d'objectes precioses"
+
+#: builtin/repack.c:381
#, c-format
msgid "removing '%s' failed"
msgstr "l'eliminació de '%s' ha fallat"
@@ -9860,7 +9945,7 @@ msgstr "usa aquest format"
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget <camí>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:57
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "registra les resolucions netes en l'índex"
@@ -9996,23 +10081,23 @@ msgstr "No s'ha pogut escriure el fitxer d'índex nou."
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
-#: builtin/rev-parse.c:361
+#: builtin/rev-parse.c:358
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
msgstr "retén el `--` passat com a paràmetre"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
msgstr "deixa d'analitzar després del primer paràmetre no d'opció"
-#: builtin/rev-parse.c:371
+#: builtin/rev-parse.c:368
msgid "output in stuck long form"
msgstr "emet en forma llarga enganxada"
-#: builtin/rev-parse.c:502
+#: builtin/rev-parse.c:499
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -10242,7 +10327,7 @@ msgstr "llegeix les referències des d'stdin"
#: builtin/send-pack.c:173
msgid "print status from remote helper"
-msgstr "imprimeix l'estat des del ajudant remot"
+msgstr "imprimeix l'estat des de l'ajudant remot"
#: builtin/shortlog.c:13
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
@@ -10274,7 +10359,7 @@ msgstr "w[,i1[,i2]]"
msgid "Linewrap output"
msgstr "Ajusta les línies de la sortida"
-#: builtin/show-branch.c:9
+#: builtin/show-branch.c:10
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -10286,71 +10371,71 @@ msgstr ""
"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
"\t\t [--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
msgstr "mostra les branques amb seguiment remot i les locals"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
msgstr "mostra les branques amb seguiment remot"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
msgstr "colora '*!+-' corresponent a la branca"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:646
msgid "show <n> more commits after the common ancestor"
msgstr "mostra <n> comissions després de l'avantpassat comú"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:648
msgid "synonym to more=-1"
msgstr "sinònim de more=-1"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:649
msgid "suppress naming strings"
msgstr "omet l'anomenament de cadenes"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:651
msgid "include the current branch"
msgstr "inclou la branca actual"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:653
msgid "name commits with their object names"
msgstr "anomena les comissions amb els seus noms d'objecte"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:655
msgid "show possible merge bases"
msgstr "mostra les bases de fusió possibles"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
msgstr "mostra les referències inabastables de qualsevulla altra referència"
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:659
msgid "show commits in topological order"
msgstr "mostra les comissions en ordre topològic"
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:662
msgid "show only commits not on the first branch"
msgstr "mostra només les comissions que no siguin en la primera branca"
-#: builtin/show-branch.c:683
+#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
msgstr "mostra les fusions abastables de només una punta"
-#: builtin/show-branch.c:685
+#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible"
-#: builtin/show-branch.c:688
+#: builtin/show-branch.c:669
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:689
+#: builtin/show-branch.c:670
msgid "show <n> most recent ref-log entries starting at base"
msgstr "mostra les <n> entrades més recents començant a la base"
@@ -10363,43 +10448,137 @@ msgstr ""
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"
-msgstr "git show-ref --exclude-existing[=<patró>] < <llista-de-referències>"
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<patró>]"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
msgstr "mostra només les etiquetes (es pot combinar amb heads)"
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
msgstr "mostra només els caps (es pot combinar amb tags)"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
msgstr ""
"comprovació de referència més estricta, requereix el camí de referència "
"exacte"
-#: builtin/show-ref.c:175 builtin/show-ref.c:177
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "mostra la referència HEAD, encara que es filtrés"
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:174
msgid "dereference tags into object IDs"
msgstr "dereferencia les etiquetes a IDs d'objecte"
-#: builtin/show-ref.c:181
+#: builtin/show-ref.c:176
msgid "only show SHA1 hash using <n> digits"
msgstr "mostra el hash SHA1 usant només <n> xifres"
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:180
msgid "do not print results to stdout (useful with --verify)"
msgstr "no imprimeixis els resultats a stdout (útil amb --verify)"
-#: builtin/show-ref.c:187
+#: builtin/show-ref.c:182
msgid "show refs from stdin that aren't in local repository"
msgstr "mostra les referències d'stdin que no siguin en el dipòsit local"
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+"salta i elimina totes les línies començant amb el caràcter de comentari"
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr "anteposa el caràcter de comentari i espai blanc a cada línia"
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr "àncora alternativa per als camins relatius"
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <camí>"
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí '%s'"
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr "a on es clonarà el submòdul nou"
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr "nom del submòdul nou"
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr "url del qual clonar el submòdul"
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr "profunditat dels clons superficials"
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+msgstr ""
+"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
+"<dipòsit>] [--name <nom>] [--url <url>][--depth <profunditat>] [--] "
+"[<camí>...]"
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "no s'ha pogut crear el directori '%s'"
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "el clonatge de '%s' al camí de submòdul '%s' ha fallat"
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr "no es pot obrir el fitxer '%s'"
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr "no s'ha pogut tancar el fitxer %s"
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "no s'ha pogut obtenir el directori de submòdul per a '%s'"
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr "fatal: s'ha d'executar la subordre submodule--helper amb una subordre"
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr "fatal: '%s' no és una subordre vàlida de submodule--helper"
+
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<opcions>] <nom> [<referència>]"
@@ -10428,7 +10607,7 @@ msgstr "raó"
msgid "reason of the update"
msgstr "raó de l'actualització"
-#: builtin/tag.c:22
+#: builtin/tag.c:23
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
@@ -10436,48 +10615,44 @@ msgstr ""
"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-"
"d'etiqueta> [<cap>]"
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nom-d'etiqueta>..."
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[<pattern>...]"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
"git tag -l [-n[<nombre>]] [--contains <comissió>]\n"
-"\t\t[--points-at <objecte>] [<patró>...]"
+"\t\t[--points-at <objecte>] [--format=<format>]\n"
+"\t\t[--[no-]merged [<comissió>]] [<patró>...]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -v <tagname>..."
msgstr "git tag -v <nom-d'etiqueta>..."
-#: builtin/tag.c:69
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "objecte mal format a '%s'"
-
-#: builtin/tag.c:301
+#: builtin/tag.c:80
#, c-format
msgid "tag name too long: %.*s..."
msgstr "nom d'etiqueta massa llarg: %.*s..."
-#: builtin/tag.c:306
+#: builtin/tag.c:85
#, c-format
msgid "tag '%s' not found."
msgstr "etiqueta '%s' no trobada."
-#: builtin/tag.c:321
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "L'etiqueta '%s' s'ha suprimit (era %s)\n"
-#: builtin/tag.c:333
+#: builtin/tag.c:112
#, c-format
msgid "could not verify the tag '%s'"
msgstr "no s'ha pogut verificar l'etiqueta '%s'"
-#: builtin/tag.c:343
+#: builtin/tag.c:122
#, c-format
msgid ""
"\n"
@@ -10490,7 +10665,7 @@ msgstr ""
" %s\n"
"Les línies que comencin amb '%c' s'ignoraran.\n"
-#: builtin/tag.c:347
+#: builtin/tag.c:126
#, c-format
msgid ""
"\n"
@@ -10505,153 +10680,138 @@ msgstr ""
"Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós "
"mateix si voleu.\n"
-#: builtin/tag.c:371
-#, c-format
-msgid "unsupported sort specification '%s'"
-msgstr "especificació d'ordenació '%s' no admesa"
-
-#: builtin/tag.c:373
-#, c-format
-msgid "unsupported sort specification '%s' in variable '%s'"
-msgstr "especificació d'ordenació '%s' no admesa en la variable '%s'"
-
-#: builtin/tag.c:428
+#: builtin/tag.c:199
msgid "unable to sign the tag"
msgstr "no s'ha pogut firmar l'etiqueta"
-#: builtin/tag.c:430
+#: builtin/tag.c:201
msgid "unable to write tag file"
msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
-#: builtin/tag.c:455
+#: builtin/tag.c:226
msgid "bad object type."
msgstr "tipus d'objecte dolent."
-#: builtin/tag.c:468
+#: builtin/tag.c:239
msgid "tag header too big."
msgstr "capçalera d'etiqueta massa gran."
-#: builtin/tag.c:504
+#: builtin/tag.c:275
msgid "no tag message?"
msgstr "cap missatge d'etiqueta?"
-#: builtin/tag.c:510
+#: builtin/tag.c:281
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "S'ha deixat el missatge de l'etiqueta en %s\n"
-#: builtin/tag.c:559
-msgid "switch 'points-at' requires an object"
-msgstr "l'opció 'points-at' requereix un objecte"
-
-#: builtin/tag.c:561
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nom d'objecte mal format '%s'"
-
-#: builtin/tag.c:590
+#: builtin/tag.c:339
msgid "list tag names"
msgstr "llista els noms d'etiqueta"
-#: builtin/tag.c:592
+#: builtin/tag.c:341
msgid "print <n> lines of each tag message"
msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
-#: builtin/tag.c:594
+#: builtin/tag.c:343
msgid "delete tags"
msgstr "suprimeix les etiquetes"
-#: builtin/tag.c:595
+#: builtin/tag.c:344
msgid "verify tags"
msgstr "verifica les etiquetes"
-#: builtin/tag.c:597
+#: builtin/tag.c:346
msgid "Tag creation options"
msgstr "Opcions de creació d'etiquetes"
-#: builtin/tag.c:599
+#: builtin/tag.c:348
msgid "annotated tag, needs a message"
msgstr "etiqueta anotada, necessita un missatge"
-#: builtin/tag.c:601
+#: builtin/tag.c:350
msgid "tag message"
msgstr "missatge d'etiqueta"
-#: builtin/tag.c:603
+#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
msgstr "etiqueta anotada i firmada per GPG"
-#: builtin/tag.c:607
+#: builtin/tag.c:356
msgid "use another key to sign the tag"
msgstr "usa una altra clau per a firmar l'etiqueta"
-#: builtin/tag.c:608
+#: builtin/tag.c:357
msgid "replace the tag if exists"
msgstr "reemplaça l'etiqueta si existeix"
-#: builtin/tag.c:609 builtin/update-ref.c:368
+#: builtin/tag.c:358 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "crea un registre de referències"
-#: builtin/tag.c:611
+#: builtin/tag.c:360
msgid "Tag listing options"
msgstr "Opcions de llistat d'etiquetes"
-#: builtin/tag.c:612
+#: builtin/tag.c:361
msgid "show tag list in columns"
msgstr "mostra la llista d'etiquetes en columnes"
-#: builtin/tag.c:614
-msgid "sort tags"
-msgstr "ordena les etiquetes"
-
-#: builtin/tag.c:619 builtin/tag.c:625
+#: builtin/tag.c:362 builtin/tag.c:363
msgid "print only tags that contain the commit"
msgstr "imprimeix només les etiquetes que continguin la comissió"
-#: builtin/tag.c:631
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
+msgstr "imprimeix només les etiquetes que s'han fusionat"
+
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
+msgstr "imprimeix només les etiquetes que no s'han fusionat"
+
+#: builtin/tag.c:370
msgid "print only tags of the object"
msgstr "imprimeix només les etiquetes de l'objecte"
-#: builtin/tag.c:657
+#: builtin/tag.c:399
msgid "--column and -n are incompatible"
msgstr "--column i -n són incompatibles"
-#: builtin/tag.c:669
-msgid "--sort and -n are incompatible"
-msgstr "--sort i -n són incompatibles"
-
-#: builtin/tag.c:676
+#: builtin/tag.c:419
msgid "-n option is only allowed with -l."
msgstr "es permet l'opció -n només amb -l."
-#: builtin/tag.c:678
+#: builtin/tag.c:421
msgid "--contains option is only allowed with -l."
msgstr "es permet l'opció --contains només amb -l."
-#: builtin/tag.c:680
+#: builtin/tag.c:423
msgid "--points-at option is only allowed with -l."
msgstr "es permet --points-at option només amb -l."
-#: builtin/tag.c:688
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr "es permeten les opcions --merged i --no-merged només amb -l"
+
+#: builtin/tag.c:433
msgid "only one -F or -m option is allowed."
msgstr "només es permet una opció -F o -m."
-#: builtin/tag.c:708
+#: builtin/tag.c:453
msgid "too many params"
msgstr "massa paràmetres"
-#: builtin/tag.c:714
+#: builtin/tag.c:459
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' no és un nom d'etiqueta vàlid."
-#: builtin/tag.c:719
+#: builtin/tag.c:464
#, c-format
msgid "tag '%s' already exists"
msgstr "l'etiqueta '%s' ja existeix"
-#: builtin/tag.c:744
+#: builtin/tag.c:489
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualitzada (era %s)\n"
@@ -10923,78 +11083,82 @@ msgstr "git verify-tag [-v | --verbose] <etiqueta>..."
msgid "print tag contents"
msgstr "imprimeix els continguts de l'etiqueta"
-#: builtin/worktree.c:13
-msgid "git worktree add [<options>] <path> <branch>"
-msgstr "git worktree add [<opcions>] <camí> <branca>"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<opcions>] <camí> [<branca>]"
-#: builtin/worktree.c:14
+#: builtin/worktree.c:16
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opcions>]"
-#: builtin/worktree.c:36
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<opcions>]"
+
+#: builtin/worktree.c:39
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:45
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
-#: builtin/worktree.c:47
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
-#: builtin/worktree.c:74
+#: builtin/worktree.c:77
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
"existent"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:112
#, c-format
msgid "failed to remove: %s"
msgstr "s'ha fallat en eliminar: %s"
-#: builtin/worktree.c:198
+#: builtin/worktree.c:201
#, c-format
msgid "'%s' already exists"
msgstr "'%s' ja existeix"
-#: builtin/worktree.c:232
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "no s'ha pogut crear directori de '%s'"
-#: builtin/worktree.c:268
+#: builtin/worktree.c:271
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Preparant %s (identificador %s)"
-#: builtin/worktree.c:316
+#: builtin/worktree.c:319
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
-#: builtin/worktree.c:318
+#: builtin/worktree.c:321
msgid "create a new branch"
msgstr "crea una branca nova"
-#: builtin/worktree.c:320
+#: builtin/worktree.c:323
msgid "create or reset a branch"
msgstr "crea o restableix una branca"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:324
msgid "detach HEAD at named commit"
msgstr "separa el HEAD a la comissió anomenada"
-#: builtin/worktree.c:328
+#: builtin/worktree.c:331
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B i --detach són mutualment exclusius"
@@ -11144,49 +11308,49 @@ msgstr "data-de-caducitat"
msgid "no-op (backward compatibility)"
msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
-#: parse-options.h:236
+#: parse-options.h:237
msgid "be more verbose"
msgstr "sigues més detallat"
-#: parse-options.h:238
+#: parse-options.h:239
msgid "be more quiet"
msgstr "sigues més callat"
-#: parse-options.h:244
+#: parse-options.h:245
msgid "use <n> digits to display SHA-1s"
msgstr "usa <n> xifres per presentar els SHA-1"
-#: rerere.h:28
+#: rerere.h:38
msgid "update the index with reused conflict resolution if possible"
msgstr ""
"actualitza l'índex amb la resolució de conflicte reusada si és possible"
-#: git-bisect.sh:50
+#: git-bisect.sh:55
msgid "You need to start by \"git bisect start\""
msgstr "Cal començar per \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:56
+#: git-bisect.sh:61
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Voleu que ho faci per vós [Y/n]? "
-#: git-bisect.sh:99
+#: git-bisect.sh:122
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "opció no reconeguda: '$arg'"
-#: git-bisect.sh:103
+#: git-bisect.sh:126
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' no sembla una revisió vàlida"
-#: git-bisect.sh:132
+#: git-bisect.sh:155
msgid "Bad HEAD - I need a HEAD"
msgstr "HEAD dolent - Cal un HEAD"
-#: git-bisect.sh:145
+#: git-bisect.sh:168
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
@@ -11194,39 +11358,39 @@ msgstr ""
"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-"
"vàlida>'."
-#: git-bisect.sh:155
+#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek"
-#: git-bisect.sh:159
+#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
msgstr "HEAD dolent - referència simbòlica estranya"
-#: git-bisect.sh:211
+#: git-bisect.sh:234
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Paràmetre bisect_write dolent: $state"
-#: git-bisect.sh:240
+#: git-bisect.sh:263
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Introducció de revisió dolenta: $arg"
-#: git-bisect.sh:255
+#: git-bisect.sh:278
msgid "Please call 'bisect_state' with at least one argument."
msgstr "Si us plau, invoqueu 'bisect_state' amb almenys un paràmetre."
-#: git-bisect.sh:267
+#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Introducció de revisió dolenta: $rev"
-#: git-bisect.sh:276
+#: git-bisect.sh:299
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' pot acceptar només un paràmetre."
-#: git-bisect.sh:299
+#: git-bisect.sh:322
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "Avís: bisecant amb només comissió $TERM_BAD."
@@ -11234,11 +11398,11 @@ msgstr "Avís: bisecant amb només comissió $TERM_BAD."
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:305
+#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
msgstr "N'esteu segur [Y/n]? "
-#: git-bisect.sh:317
+#: git-bisect.sh:340
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -11247,7 +11411,7 @@ msgstr ""
"Cal donar-me almenys una revisió $bad_syn i una $good_syn.\n"
"(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
-#: git-bisect.sh:320
+#: git-bisect.sh:343
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11258,16 +11422,16 @@ msgstr ""
"Després cal donar-me almenys una revisió $good_syn i una $bad_syn.\n"
"(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
-#: git-bisect.sh:391 git-bisect.sh:521
+#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
msgstr "No estem bisecant."
-#: git-bisect.sh:398
+#: git-bisect.sh:421
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' no és una comissió vàlida"
-#: git-bisect.sh:407
+#: git-bisect.sh:430
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -11276,25 +11440,25 @@ msgstr ""
"No s'ha pogut agafar el HEAD original '$branch'.\n"
"Proveu 'git bisect reset <comissió>'."
-#: git-bisect.sh:435
+#: git-bisect.sh:458
msgid "No logfile given"
msgstr "Cap fitxer de registre donat"
-#: git-bisect.sh:436
+#: git-bisect.sh:459
#, sh-format
msgid "cannot read $file for replaying"
msgstr "no es pot llegir $file per a reproducció"
-#: git-bisect.sh:455
+#: git-bisect.sh:480
msgid "?? what are you talking about?"
msgstr "?? de què parleu?"
-#: git-bisect.sh:467
+#: git-bisect.sh:492
#, sh-format
msgid "running $command"
msgstr "executant $command"
-#: git-bisect.sh:474
+#: git-bisect.sh:499
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11303,11 +11467,11 @@ msgstr ""
"el pas de bisecció ha fallat:\n"
"el codi de sortida $res de '$command' és < 0 o >= 128"
-#: git-bisect.sh:500
+#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
msgstr "el pas de bisecció no pot continuar més"
-#: git-bisect.sh:506
+#: git-bisect.sh:531
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11316,15 +11480,47 @@ msgstr ""
"el pas de bisecció ha fallat:\n"
"'bisect_state $state' ha surt amb el codi d'error $res"
-#: git-bisect.sh:513
+#: git-bisect.sh:538
msgid "bisect run success"
msgstr "pas de bisecció reeixit"
-#: git-bisect.sh:548
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "si us plau, useu dos termes distintes"
+
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "'$term' no és un terme vàlid"
+
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr "no es pot usar l'ordre interna '$term' com a terme"
+
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "no es pot canviar el significat del terme '$term'"
+
+#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr "Ordre invàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD"
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "cap terme definit"
+
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"paràmetre invàlid $arg per a 'git bisect terms'.\n"
+"Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
+
#: git-rebase.sh:57
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
@@ -11364,24 +11560,24 @@ msgstr "El ganxo de prerebasament ha refusat rebasar."
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Sembla que git-am està en curs. No es pot rebasar."
-#: git-rebase.sh:351
+#: git-rebase.sh:354
msgid "The --exec option must be used with the --interactive option"
msgstr "L'opció --exec s'ha d'usar amb l'opció --interactive"
-#: git-rebase.sh:356
+#: git-rebase.sh:359
msgid "No rebase in progress?"
msgstr "No hi ha rebasament en curs?"
-#: git-rebase.sh:367
+#: git-rebase.sh:370
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'acció --edit-todo només es pot usar durant un rebasament interactiva."
-#: git-rebase.sh:374
+#: git-rebase.sh:377
msgid "Cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: git-rebase.sh:377
+#: git-rebase.sh:380
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11389,12 +11585,12 @@ msgstr ""
"Heu d'editar tots els conflictes de fusió i després\n"
"marcar-los com a resolts fent servir git add"
-#: git-rebase.sh:395
+#: git-rebase.sh:398
#, sh-format
msgid "Could not move back to $head_name"
msgstr "No s'ha pogut tornar a $head_name"
-#: git-rebase.sh:414
+#: git-rebase.sh:417
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11415,65 +11611,65 @@ msgstr ""
"i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
"de valor."
-#: git-rebase.sh:465
+#: git-rebase.sh:468
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "font no vàlida $upstream_name"
-#: git-rebase.sh:489
+#: git-rebase.sh:492
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: ja hi ha més d'una base de fusió"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:495 git-rebase.sh:499
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: no hi ha cap base de fusió"
-#: git-rebase.sh:501
+#: git-rebase.sh:504
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "No assenyala una comissió vàlida: $onto_name"
-#: git-rebase.sh:524
+#: git-rebase.sh:527
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: no hi ha tal branca: $branch_name"
-#: git-rebase.sh:557
+#: git-rebase.sh:560
msgid "Cannot autostash"
msgstr "No es pot emmagatzemar automàticament"
-#: git-rebase.sh:562
+#: git-rebase.sh:565
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-#: git-rebase.sh:566
+#: git-rebase.sh:569
msgid "Please commit or stash them."
msgstr "Si us plau, cometeu-los o emmagatzemeu-los."
-#: git-rebase.sh:586
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branca actual $branch_name està al dia."
-#: git-rebase.sh:590
+#: git-rebase.sh:593
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branca actual $branch_name està al dia; rebasament forçada."
-#: git-rebase.sh:601
+#: git-rebase.sh:604
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Canvis de $mb a $onto:"
-#: git-rebase.sh:610
+#: git-rebase.sh:613
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Primer, rebobinant el cap per a reproduir el vostre treball al damunt..."
-#: git-rebase.sh:620
+#: git-rebase.sh:623
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "S'ha avançat $branch_name ràpidament a $onto_name"
@@ -11546,115 +11742,99 @@ msgstr "No es pot desar l'estat actual"
msgid "Cannot remove worktree changes"
msgstr "No es pot eliminar els canvis de l'arbre de treball"
-#: git-stash.sh:387
+#: git-stash.sh:405
#, sh-format
msgid "unknown option: $opt"
msgstr "opció desconeguda: $opt"
-#: git-stash.sh:397
+#: git-stash.sh:415
msgid "No stash found."
msgstr "Cap magatzem trobat."
-#: git-stash.sh:404
+#: git-stash.sh:422
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Massa revisions especificades: $REV"
-#: git-stash.sh:410
+#: git-stash.sh:428
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no és una referència vàlida"
-#: git-stash.sh:438
+#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no és una comissió de tipus magatzem"
-#: git-stash.sh:449
+#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no és una referència de magatzem"
-#: git-stash.sh:457
+#: git-stash.sh:475
msgid "unable to refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: git-stash.sh:461
+#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
msgstr "No es pot aplicar un magatzem enmig d'una fusió"
-#: git-stash.sh:469
+#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: git-stash.sh:471
+#: git-stash.sh:489
msgid "Could not save index tree"
msgstr "No s'ha pogut desar l'arbre d'índex"
-#: git-stash.sh:505
+#: git-stash.sh:523
msgid "Cannot unstage modified files"
msgstr "No es pot desallistar fitxers modificats"
-#: git-stash.sh:520
+#: git-stash.sh:538
msgid "Index was not unstashed."
msgstr "L'índex no estava sense emmagatzemar."
-#: git-stash.sh:543
+#: git-stash.sh:561
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} ($s) descartada"
-#: git-stash.sh:544
+#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
-#: git-stash.sh:552
+#: git-stash.sh:570
msgid "No branch name specified"
msgstr "Cap nom de branca especificat"
-#: git-stash.sh:624
+#: git-stash.sh:642
msgid "(To restore them type \"git stash apply\")"
msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
-#: git-submodule.sh:95
+#: git-submodule.sh:104
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "no es pot despullar un component de l'url '$remoteurl'"
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr ""
-"No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí '$sm_path'"
-
-#: git-submodule.sh:287
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr "El clonatge de '$url' al camí de submòdul '$sm_path' ha fallat"
-
-#: git-submodule.sh:296
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr "El directori de git '$a' és part del camí de submòdul '$b' o viceversa"
-
-#: git-submodule.sh:406
+#: git-submodule.sh:281
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"El camí relatiu només es pot usar des del nivell superior de l'arbre de "
"treball"
-#: git-submodule.sh:416
+#: git-submodule.sh:291
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../"
-#: git-submodule.sh:433
+#: git-submodule.sh:308
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ja existeix en l'índex"
-#: git-submodule.sh:437
+#: git-submodule.sh:312
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11665,23 +11845,23 @@ msgstr ""
"$sm_path\n"
"Useu -f si realment voleu afegir-lo."
-#: git-submodule.sh:455
+#: git-submodule.sh:330
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Afegint el dipòsit existent a '$sm_path' a l'índex"
-#: git-submodule.sh:457
+#: git-submodule.sh:332
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid"
-#: git-submodule.sh:465
+#: git-submodule.sh:340
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Es troba un directori de git per a '$sm_name' localment amb els remots:"
-#: git-submodule.sh:467
+#: git-submodule.sh:342
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
@@ -11689,7 +11869,7 @@ msgstr ""
"Si voleu tornar a usar aquest directori de git local en lloc de clonar de "
"nou des de"
-#: git-submodule.sh:469
+#: git-submodule.sh:344
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
@@ -11697,7 +11877,7 @@ msgstr ""
"useu l'opció '--force'. Si el directori de git local no és el dipòsit "
"correcte"
-#: git-submodule.sh:470
+#: git-submodule.sh:345
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
@@ -11705,78 +11885,78 @@ msgid ""
msgstr ""
"o esteu insegur de què vol dir això, trieu un altre nom amb l'opció '--name'."
-#: git-submodule.sh:472
+#: git-submodule.sh:347
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Reactivant el directori de git local per al submòdul '$sm_name'."
-#: git-submodule.sh:484
+#: git-submodule.sh:359
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "no s'ha pogut agafar el submòdul '$sm_path'"
-#: git-submodule.sh:489
+#: git-submodule.sh:364
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "S'ha fallat en afegir el submòdul '$sm_path'"
-#: git-submodule.sh:498
+#: git-submodule.sh:373
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "S'ha fallat en registrar el submòdul '$sm_path'"
-#: git-submodule.sh:542
+#: git-submodule.sh:417
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr "Entrant a '$prefix$displaypath'"
-#: git-submodule.sh:562
+#: git-submodule.sh:437
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr ""
"Aturant a '$prefix$displaypath'; l'script ha retornat un estat no zero."
-#: git-submodule.sh:608
+#: git-submodule.sh:483
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr ""
"No s'ha trobat cap url per al camí de submòdul '$displaypath' a .gitmodules"
-#: git-submodule.sh:617
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
msgstr "S'ha fallat en registrar l'url per al camí de submòdul '$displaypath'"
-#: git-submodule.sh:619
+#: git-submodule.sh:494
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr "S'ha registrat el submòdul '$name' ($url) per al camí '$displaypath'"
-#: git-submodule.sh:636
+#: git-submodule.sh:511
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr ""
"S'ha fallat en registrar el mode d'actualització per al camí de submòdul "
"'$displaypath'"
-#: git-submodule.sh:674
+#: git-submodule.sh:549
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr "Useu '.' si realment voleu desinicialitzar tots els submòduls"
-#: git-submodule.sh:691
+#: git-submodule.sh:566
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr "L'arbre de treball de submòdul '$displaypath' conté un directori .git"
-#: git-submodule.sh:692
+#: git-submodule.sh:567
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
"(useu 'rm -rf' si realment voleu eliminar-lo incloent tota la seva història)"
-#: git-submodule.sh:698
+#: git-submodule.sh:573
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -11785,27 +11965,27 @@ msgstr ""
"L'arbre de treball de submòdul '$displaypath' conté modificacions locals; "
"useu '-f' per a descartar-les"
-#: git-submodule.sh:701
+#: git-submodule.sh:576
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "S'ha netejat el directori '$displaypath'"
-#: git-submodule.sh:702
+#: git-submodule.sh:577
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul '$displaypath'"
-#: git-submodule.sh:705
+#: git-submodule.sh:580
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "No s'ha pogut crear el directori de submòdul buit '$displaypath'"
-#: git-submodule.sh:714
+#: git-submodule.sh:589
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'"
-#: git-submodule.sh:830
+#: git-submodule.sh:705
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
@@ -11814,53 +11994,53 @@ msgstr ""
"Camí de submòdul '$displaypath' no inicialitzat\n"
"Potser voleu usar 'update --init'?"
-#: git-submodule.sh:843
+#: git-submodule.sh:718
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:852
+#: git-submodule.sh:727
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'"
-#: git-submodule.sh:876
+#: git-submodule.sh:751
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:890
+#: git-submodule.sh:765
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:891
+#: git-submodule.sh:766
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
-#: git-submodule.sh:895
+#: git-submodule.sh:770
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "no s'ha pogut rebasar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:896
+#: git-submodule.sh:771
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha rebasat en '$sha1'"
-#: git-submodule.sh:901
+#: git-submodule.sh:776
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:902
+#: git-submodule.sh:777
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
-#: git-submodule.sh:907
+#: git-submodule.sh:782
#, sh-format
msgid ""
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
@@ -11868,50 +12048,50 @@ msgstr ""
"L'execució de '$command $sha1' ha fallat en el camí de submòdul '$prefix"
"$sm_path'"
-#: git-submodule.sh:908
+#: git-submodule.sh:783
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr "Camí de submòdul '$prefix$sm_path': '$command $sha1'"
-#: git-submodule.sh:938
+#: git-submodule.sh:813
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "S'ha fallat en recursar al camí de submòdul '$displaypath'"
-#: git-submodule.sh:1046
+#: git-submodule.sh:921
msgid "The --cached option cannot be used with the --files option"
msgstr "L'opció --cached no es pot usar amb l'opció --files"
-#: git-submodule.sh:1098
+#: git-submodule.sh:973
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode inesperat $mod_dst"
-#: git-submodule.sh:1118
+#: git-submodule.sh:993
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Avís: $display_name no conté la comissió $sha1_src"
-#: git-submodule.sh:1121
+#: git-submodule.sh:996
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Avís: $display_name no conté la comissió $sha1_dst"
-#: git-submodule.sh:1124
+#: git-submodule.sh:999
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst"
-#: git-submodule.sh:1149
+#: git-submodule.sh:1024
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1267
+#: git-submodule.sh:1142
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "S'ha fallat en recursar al camí de submòdul '$sm_path'"
-#: git-submodule.sh:1331
+#: git-submodule.sh:1206
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Sincronitzant l'url de submòdul per a '$displaypath'"
diff --git a/po/de.po b/po/de.po
index c682aaf..8c5f05d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-09-15 06:45+0800\n"
+"POT-Creation-Date: 2015-12-22 22:50+0800\n"
"PO-Revision-Date: 2015-01-21 15:01+0800\n"
"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
"Language-Team: German <>\n"
@@ -31,13 +31,13 @@ msgstr ""
"dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
"und zu committen."
-#: advice.c:101 builtin/merge.c:1227
+#: advice.c:101 builtin/merge.c:1225
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
#: advice.c:103
-msgid "Please, commit your changes before you can merge."
-msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
+msgid "Please, commit your changes before merging."
+msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
#: advice.c:104
msgid "Exiting because of unfinished merge."
@@ -62,76 +62,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
-#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
-#: archive.c:428
+#: archive.c:429
msgid "fmt"
msgstr "Format"
-#: archive.c:428
+#: archive.c:429
msgid "archive format"
msgstr "Archivformat"
-#: archive.c:429 builtin/log.c:1229
+#: archive.c:430 builtin/log.c:1229
msgid "prefix"
msgstr "Präfix"
-#: archive.c:430
+#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
-#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516
-#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535
+#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99
#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "Datei"
-#: archive.c:432 builtin/archive.c:89
+#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "das Archiv in diese Datei schreiben"
-#: archive.c:434
+#: archive.c:435
msgid "read .gitattributes in working directory"
msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
-#: archive.c:435
+#: archive.c:436
msgid "report archived files on stderr"
msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
-#: archive.c:436
+#: archive.c:437
msgid "store only"
msgstr "nur speichern"
-#: archive.c:437
+#: archive.c:438
msgid "compress faster"
msgstr "schneller komprimieren"
-#: archive.c:445
+#: archive.c:446
msgid "compress better"
msgstr "besser komprimieren"
-#: archive.c:448
+#: archive.c:449
msgid "list supported archive formats"
msgstr "unterstützte Archivformate auflisten"
-#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr "Repository"
-#: archive.c:451 builtin/archive.c:91
+#: archive.c:452 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "Archiv vom Remote-Repository <Repository> abrufen"
-#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr "Programm"
-#: archive.c:453 builtin/archive.c:93
+#: archive.c:454 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
@@ -143,87 +143,87 @@ msgstr ""
"Verneinende Muster werden in Git-Attributen ignoriert.\n"
"Benutzen Sie '\\!' für führende Ausrufezeichen."
-#: branch.c:60
+#: branch.c:61
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "Branch %s kann nicht sein eigener Upstream-Branch sein."
-#: branch.c:83
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
"Branch %s konfiguriert zum Folgen von Remote-Branch %s von %s durch Rebase."
-#: branch.c:84
+#: branch.c:85
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "Branch %s konfiguriert zum Folgen von Remote-Branch %s von %s."
-#: branch.c:88
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr "Branch %s konfiguriert zum Folgen von lokalem Branch %s durch Rebase."
-#: branch.c:89
+#: branch.c:90
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "Branch %s konfiguriert zum Folgen von lokalem Branch %s."
-#: branch.c:94
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr "Branch %s konfiguriert zum Folgen von Remote-Referenz %s durch Rebase."
-#: branch.c:95
+#: branch.c:96
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "Branch %s konfiguriert zum Folgen von Remote-Referenz %s."
-#: branch.c:99
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
"Branch %s konfiguriert zum Folgen von lokaler Referenz %s durch Rebase."
-#: branch.c:100
+#: branch.c:101
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "Branch %s konfiguriert zum Folgen von lokaler Referenz %s."
-#: branch.c:133
+#: branch.c:134
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
"Konfiguration zum Folgen von Branch nicht eingerichtet. Referenz %s ist "
"mehrdeutig."
-#: branch.c:162
+#: branch.c:163
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' ist kein gültiger Branchname."
-#: branch.c:167
+#: branch.c:168
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Branch '%s' existiert bereits."
-#: branch.c:175
+#: branch.c:176
msgid "Cannot force update the current branch."
msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen."
-#: branch.c:195
+#: branch.c:196
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein "
"Branch."
-#: branch.c:197
+#: branch.c:198
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "der angeforderte Upstream-Branch '%s' existiert nicht"
-#: branch.c:199
+#: branch.c:200
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -244,22 +244,22 @@ msgstr ""
"\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n"
"zu konfigurieren."
-#: branch.c:243
+#: branch.c:244
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Ungültiger Objekt-Name: '%s'"
-#: branch.c:263
+#: branch.c:264
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "mehrdeutiger Objekt-Name: '%s'"
-#: branch.c:268
+#: branch.c:269
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Ungültiger Branchpunkt: '%s'"
-#: branch.c:399
+#: branch.c:322
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ist bereits in '%s' ausgecheckt"
@@ -274,7 +274,7 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus"
msgid "unrecognized header: %s%s (%d)"
msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:765
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr "Konnte '%s' nicht öffnen"
@@ -283,9 +283,9 @@ msgstr "Konnte '%s' nicht öffnen"
msgid "Repository lacks these prerequisite commits:"
msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
-#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708
-#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
-#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
@@ -325,7 +325,7 @@ msgstr "\"rev-list\" abgebrochen"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
@@ -343,13 +343,13 @@ msgstr "kann '%s' nicht erstellen"
msgid "index-pack died"
msgstr "Erstellung der Paketindexdatei abgebrochen"
-#: color.c:260
+#: color.c:275
#, c-format
msgid "invalid color value: %.*s"
msgstr "Ungültiger Farbwert: %.*s"
-#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
-#: builtin/am.c:2128
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
#, c-format
msgid "could not parse %s"
msgstr "konnte %s nicht parsen"
@@ -511,23 +511,23 @@ msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
msgid "Performing inexact rename detection"
msgstr "Führe Erkennung für ungenaue Umbenennung aus"
-#: diff.c:116
+#: diff.c:115
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
-#: diff.c:121
+#: diff.c:120
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Unbekannter \"dirstat\" Parameter '%s'\n"
-#: diff.c:216
+#: diff.c:215
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
-#: diff.c:268
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -536,16 +536,16 @@ msgstr ""
"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
"%s"
-#: diff.c:2998
+#: diff.c:3000
#, c-format
msgid "external diff died, stopping at %s"
msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
-#: diff.c:3394
+#: diff.c:3396
msgid "--follow requires exactly one pathspec"
msgstr "--follow erfordert genau eine Pfadspezifikation"
-#: diff.c:3557
+#: diff.c:3559
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -554,16 +554,16 @@ msgstr ""
"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
"%s"
-#: diff.c:3571
+#: diff.c:3573
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
-#: dir.c:1853
+#: dir.c:1915
msgid "failed to get kernel name and information"
msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
-#: dir.c:1936
+#: dir.c:1998
msgid "Untracked cache is disabled on this system."
msgstr "Cache für unversionierte Dateien ist auf diesem System deaktiviert."
@@ -592,7 +592,7 @@ msgstr "Fehler beim Schreiben der Signatur nach '%s': %s"
#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
-msgstr "'%s': konnte nicht lesen %s"
+msgstr "'%s': konnte %s nicht lesen"
#: grep.c:1735
#, c-format
@@ -672,8 +672,8 @@ msgstr "%s: %s - %s"
msgid "failed to read the cache"
msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
-#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:715
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
msgid "unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
@@ -691,64 +691,64 @@ msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen"
msgid "error building trees"
msgstr "Fehler beim Erstellen der \"Tree\"-Objekte"
-#: merge-recursive.c:687
+#: merge-recursive.c:686
#, c-format
msgid "failed to create path '%s'%s"
msgstr "Fehler beim Erstellen des Pfades '%s'%s"
-#: merge-recursive.c:698
+#: merge-recursive.c:697
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n"
-#: merge-recursive.c:712 merge-recursive.c:733
+#: merge-recursive.c:711 merge-recursive.c:732
msgid ": perhaps a D/F conflict?"
msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
-#: merge-recursive.c:723
+#: merge-recursive.c:722
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
-#: merge-recursive.c:763
+#: merge-recursive.c:762
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kann Objekt %s '%s' nicht lesen"
-#: merge-recursive.c:765
+#: merge-recursive.c:764
#, c-format
msgid "blob expected for %s '%s'"
msgstr "Blob erwartet für %s '%s'"
-#: merge-recursive.c:788 builtin/clone.c:364
+#: merge-recursive.c:787 builtin/clone.c:369
#, c-format
msgid "failed to open '%s'"
msgstr "Fehler beim Öffnen von '%s'"
-#: merge-recursive.c:796
+#: merge-recursive.c:795
#, c-format
msgid "failed to symlink '%s'"
msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s'"
-#: merge-recursive.c:799
+#: merge-recursive.c:798
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
-#: merge-recursive.c:937
+#: merge-recursive.c:936
msgid "Failed to execute internal merge"
msgstr "Fehler bei Ausführung des internen Merges"
-#: merge-recursive.c:941
+#: merge-recursive.c:940
#, c-format
msgid "Unable to add %s to database"
msgstr "Konnte %s nicht zur Datenbank hinzufügen"
-#: merge-recursive.c:957
+#: merge-recursive.c:956
msgid "unsupported object type in the tree"
msgstr "nicht unterstützter Objekttyp im Verzeichnis"
-#: merge-recursive.c:1032 merge-recursive.c:1046
+#: merge-recursive.c:1031 merge-recursive.c:1045
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -757,7 +757,7 @@ msgstr ""
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich gelassen."
-#: merge-recursive.c:1038 merge-recursive.c:1051
+#: merge-recursive.c:1037 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -766,20 +766,20 @@ msgstr ""
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich bei %s gelassen."
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "rename"
msgstr "umbenennen"
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "renamed"
msgstr "umbenannt"
-#: merge-recursive.c:1148
+#: merge-recursive.c:1147
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu"
-#: merge-recursive.c:1170
+#: merge-recursive.c:1169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -788,148 +788,148 @@ msgstr ""
"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
"und \"%s\"->\"%s\" in Branch \"%s\"%s"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1174
msgid " (left unresolved)"
msgstr " (bleibt unaufgelöst)"
-#: merge-recursive.c:1229
+#: merge-recursive.c:1228
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s "
"in %s"
-#: merge-recursive.c:1259
+#: merge-recursive.c:1258
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Benenne stattdessen %s nach %s und %s nach %s um"
-#: merge-recursive.c:1458
+#: merge-recursive.c:1457
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
"%s"
-#: merge-recursive.c:1468
+#: merge-recursive.c:1467
#, c-format
msgid "Adding merged %s"
msgstr "Füge zusammengeführte Datei %s hinzu"
-#: merge-recursive.c:1473 merge-recursive.c:1671
+#: merge-recursive.c:1472 merge-recursive.c:1674
#, c-format
msgid "Adding as %s instead"
msgstr "Füge stattdessen als %s hinzu"
-#: merge-recursive.c:1524
+#: merge-recursive.c:1523
#, c-format
msgid "cannot read object %s"
msgstr "kann Objekt %s nicht lesen"
-#: merge-recursive.c:1527
+#: merge-recursive.c:1526
#, c-format
msgid "object %s is not a blob"
msgstr "Objekt %s ist kein Blob"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modify"
msgstr "ändern"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modified"
msgstr "geändert"
-#: merge-recursive.c:1585
+#: merge-recursive.c:1588
msgid "content"
msgstr "Inhalt"
-#: merge-recursive.c:1592
+#: merge-recursive.c:1595
msgid "add/add"
msgstr "hinzufügen/hinzufügen"
-#: merge-recursive.c:1626
+#: merge-recursive.c:1629
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
-#: merge-recursive.c:1640
+#: merge-recursive.c:1643
#, c-format
msgid "Auto-merging %s"
msgstr "automatischer Merge von %s"
-#: merge-recursive.c:1644 git-submodule.sh:1150
+#: merge-recursive.c:1647 git-submodule.sh:1025
msgid "submodule"
msgstr "Submodul"
-#: merge-recursive.c:1645
+#: merge-recursive.c:1648
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1734
#, c-format
msgid "Removing %s"
msgstr "Entferne %s"
-#: merge-recursive.c:1756
+#: merge-recursive.c:1759
msgid "file/directory"
msgstr "Datei/Verzeichnis"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1765
msgid "directory/file"
msgstr "Verzeichnis/Datei"
-#: merge-recursive.c:1767
+#: merge-recursive.c:1770
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s "
"hinzu."
-#: merge-recursive.c:1777
+#: merge-recursive.c:1780
#, c-format
msgid "Adding %s"
msgstr "Füge %s hinzu"
-#: merge-recursive.c:1794
+#: merge-recursive.c:1797
msgid "Fatal merge failure, shouldn't happen."
msgstr "Fataler Merge-Fehler. Sollte nicht passieren."
-#: merge-recursive.c:1813
+#: merge-recursive.c:1816
msgid "Already up-to-date!"
msgstr "Bereits aktuell!"
-#: merge-recursive.c:1822
+#: merge-recursive.c:1825
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
-#: merge-recursive.c:1852
+#: merge-recursive.c:1855
#, c-format
msgid "Unprocessed path??? %s"
msgstr "unverarbeiteter Pfad??? %s"
-#: merge-recursive.c:1900
+#: merge-recursive.c:1903
msgid "Merging:"
msgstr "Merge:"
-#: merge-recursive.c:1913
+#: merge-recursive.c:1916
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden"
msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden"
-#: merge-recursive.c:1950
+#: merge-recursive.c:1953
msgid "merge returned no commit"
msgstr "Merge hat keinen Commit zurückgegeben"
-#: merge-recursive.c:2007
+#: merge-recursive.c:2010
#, c-format
msgid "Could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: merge-recursive.c:2018 builtin/merge.c:645
+#: merge-recursive.c:2021 builtin/merge.c:645
msgid "Unable to write index."
msgstr "Konnte Index nicht schreiben."
@@ -961,31 +961,41 @@ msgstr "Ungültiger %s Wert: '%s'"
msgid "unable to parse object: %s"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: parse-options.c:563
+#: parse-options.c:570
msgid "..."
msgstr "..."
-#: parse-options.c:581
+#: parse-options.c:588
#, c-format
msgid "usage: %s"
msgstr "Verwendung: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:585
+#: parse-options.c:592
#, c-format
msgid " or: %s"
msgstr " oder: %s"
-#: parse-options.c:588
+#: parse-options.c:595
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:622
+#: parse-options.c:629
msgid "-NUM"
msgstr "-NUM"
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "fehlerhafter Objekt-Name '%s'"
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
+
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
@@ -1057,11 +1067,11 @@ msgstr ""
msgid "unable to parse --pretty format"
msgstr "Konnte --pretty Format nicht parsen."
-#: progress.c:236
+#: progress.c:235
msgid "done"
msgstr "Fertig"
-#: read-cache.c:1296
+#: read-cache.c:1281
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -1070,7 +1080,7 @@ msgstr ""
"index.version gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: read-cache.c:1306
+#: read-cache.c:1291
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1079,121 +1089,166 @@ msgstr ""
"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
#: builtin/merge.c:983
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: refs.c:3001
+#: refs/files-backend.c:2359
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Konnte Referenz %s nicht entfernen: %s"
-#: refs.c:3004
+#: refs/files-backend.c:2362
#, c-format
msgid "could not delete references: %s"
msgstr "Konnte Referenzen nicht entfernen: %s"
-#: refs.c:3013
+#: refs/files-backend.c:2371
#, c-format
msgid "could not remove reference %s"
msgstr "Konnte Referenz %s nicht löschen"
-#: ref-filter.c:660
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "Positiver Wert erwartet contents:lines=%s"
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "Erwartetes Format: %%(color:<Farbe>)"
+
+#: ref-filter.c:835
msgid "unable to parse format"
msgstr "Konnte Format nicht parsen."
-#: remote.c:792
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)"
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr "Sie haben ein ungültiges Format eingegeben align:%s"
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "Positive Breitenangabe für %%(align) erwartet"
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "fehlerhaftes Objekt bei '%s'"
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "Format: %%(end) Atom fehlt"
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr "Missgebildeter Objektname %s"
+
+#: remote.c:756
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen."
-#: remote.c:796
+#: remote.c:760
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s folgt üblicherweise %s, nicht %s"
-#: remote.c:800
+#: remote.c:764
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s folgt sowohl %s als auch %s"
-#: remote.c:808
+#: remote.c:772
msgid "Internal error"
msgstr "Interner Fehler"
-#: remote.c:1723 remote.c:1766
+#: remote.c:1687 remote.c:1730
msgid "HEAD does not point to a branch"
msgstr "HEAD zeigt auf keinen Branch"
-#: remote.c:1732
+#: remote.c:1696
#, c-format
msgid "no such branch: '%s'"
msgstr "Kein solcher Branch: '%s'"
-#: remote.c:1735
+#: remote.c:1699
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
-#: remote.c:1741
+#: remote.c:1705
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
-#: remote.c:1756
+#: remote.c:1720
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
"Branch"
-#: remote.c:1771
+#: remote.c:1735
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: remote.c:1782
+#: remote.c:1746
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
-#: remote.c:1795
+#: remote.c:1759
msgid "push has no destination (push.default is 'nothing')"
msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
-#: remote.c:1817
+#: remote.c:1781
msgid "cannot resolve 'simple' push to a single destination"
msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
-#: remote.c:2124
+#: remote.c:2083
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
"Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
-#: remote.c:2128
+#: remote.c:2087
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
-#: remote.c:2131
+#: remote.c:2090
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n"
-#: remote.c:2135
+#: remote.c:2094
#, 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] "Ihr Branch ist vor '%s' um %d Commit.\n"
msgstr[1] "Ihr Branch ist vor '%s' um %d Commits.\n"
-#: remote.c:2141
+#: remote.c:2100
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
-#: remote.c:2144
+#: remote.c:2103
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1203,12 +1258,12 @@ msgstr[0] ""
msgstr[1] ""
"Ihr Branch ist zu '%s' um %d Commits hinterher, und kann vorgespult werden.\n"
-#: remote.c:2152
+#: remote.c:2111
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
-#: remote.c:2155
+#: remote.c:2114
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1223,30 +1278,30 @@ msgstr[1] ""
"Ihr Branch und '%s' sind divergiert,\n"
"und haben jeweils %d und %d unterschiedliche Commits.\n"
-#: remote.c:2165
+#: remote.c:2124
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
"zusammenzuführen)\n"
-#: revision.c:2198
+#: revision.c:2193
msgid "your current branch appears to be broken"
msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
-#: revision.c:2201
+#: revision.c:2196
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
-#: revision.c:2395
+#: revision.c:2390
msgid "--first-parent is incompatible with --bisect"
msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
-#: run-command.c:83
+#: run-command.c:90
msgid "open /dev/null failed"
msgstr "Öffnen von /dev/null fehlgeschlagen"
-#: run-command.c:85
+#: run-command.c:92
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) fehlgeschlagen"
@@ -1467,7 +1522,7 @@ msgstr "kann HEAD nicht auflösen"
msgid "cannot abort from a branch yet to be born"
msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird"
-#: sequencer.c:887 builtin/apply.c:4291
+#: sequencer.c:887 builtin/apply.c:4287
#, c-format
msgid "cannot open %s: %s"
msgstr "Kann %s nicht öffnen: %s"
@@ -1509,12 +1564,12 @@ msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
msgid "Can't cherry-pick into empty head"
msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen."
-#: setup.c:243
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "Fehler beim Lesen von %s"
-#: sha1_name.c:453
+#: sha1_name.c:463
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1564,7 +1619,7 @@ msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
msgid "staging updated .gitmodules failed"
msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
-#: submodule.c:1045
+#: submodule.c:1040
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "Konnte core.worktree in '%s' nicht setzen."
@@ -1575,7 +1630,7 @@ msgstr "Konnte core.worktree in '%s' nicht setzen."
msgid "unknown value '%s' for key '%s'"
msgstr "unbekannter Wert '%s' für Schlüssel %s"
-#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
#, c-format
msgid "more than one %s"
msgstr "mehr als ein %s"
@@ -1642,8 +1697,8 @@ msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen."
msgid "could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
-#: builtin/merge.c:1076 builtin/pull.c:380
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
#, c-format
msgid "could not open '%s' for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
@@ -1658,30 +1713,21 @@ msgstr "konnte nicht auf '%s' zugreifen: %s"
msgid "unable to access '%s'"
msgstr "konnte nicht auf '%s' zugreifen"
-#: wrapper.c:611
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr "konnte aktuellen Benutzer nicht in Passwort-Datei finden: %s"
-
-#: wrapper.c:612
-msgid "no such user"
-msgstr "kein solcher Benutzer"
-
-#: wrapper.c:620
+#: wrapper.c:608
msgid "unable to get current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
-#: wrapper.c:631
+#: wrapper.c:635
#, c-format
msgid "could not open %s for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: wrapper.c:642 builtin/am.c:424
+#: wrapper.c:646 builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "Konnte nicht nach '%s' schreiben."
-#: wrapper.c:648
+#: wrapper.c:652
#, c-format
msgid "could not close %s"
msgstr "Konnte '%s' nicht schließen."
@@ -2055,27 +2101,27 @@ msgstr ""
" (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
"zurückzukehren)"
-#: wt-status.c:1437
+#: wt-status.c:1438
msgid "On branch "
msgstr "Auf Branch "
-#: wt-status.c:1445
+#: wt-status.c:1444
msgid "interactive rebase in progress; onto "
msgstr "interaktives Rebase im Gange; auf "
-#: wt-status.c:1447
+#: wt-status.c:1446
msgid "rebase in progress; onto "
msgstr "Rebase im Gange; auf "
-#: wt-status.c:1452
+#: wt-status.c:1451
msgid "HEAD detached at "
msgstr "HEAD losgelöst bei "
-#: wt-status.c:1454
+#: wt-status.c:1453
msgid "HEAD detached from "
msgstr "HEAD losgelöst von "
-#: wt-status.c:1457
+#: wt-status.c:1456
msgid "Not currently on any branch."
msgstr "Im Moment auf keinem Branch."
@@ -2165,23 +2211,23 @@ msgstr ""
msgid "nothing to commit, working directory clean\n"
msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
-#: wt-status.c:1644
-msgid "HEAD (no branch)"
-msgstr "HEAD (kein Branch)"
-
-#: wt-status.c:1650
+#: wt-status.c:1642
msgid "Initial commit on "
msgstr "Initialer Commit auf "
-#: wt-status.c:1677
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
+msgstr "HEAD (kein Branch)"
+
+#: wt-status.c:1675
msgid "gone"
msgstr "entfernt"
-#: wt-status.c:1679 wt-status.c:1687
+#: wt-status.c:1677 wt-status.c:1685
msgid "behind "
msgstr "hinterher "
-#: compat/precompose_utf8.c:55 builtin/clone.c:403
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
#, c-format
msgid "failed to unlink '%s'"
msgstr "Konnte '%s' nicht entfernen."
@@ -2195,7 +2241,7 @@ msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
msgid "unexpected diff status %c"
msgstr "unerwarteter Differenz-Status %c"
-#: builtin/add.c:70 builtin/commit.c:277
+#: builtin/add.c:70 builtin/commit.c:278
msgid "updating files failed"
msgstr "Aktualisierung der Dateien fehlgeschlagen"
@@ -2209,7 +2255,7 @@ msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
-#: builtin/add.c:194 builtin/rev-parse.c:799
+#: builtin/add.c:194 builtin/rev-parse.c:796
msgid "Could not read the index"
msgstr "Konnte den Index nicht lesen"
@@ -2246,15 +2292,15 @@ msgstr ""
"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
"ignoriert:\n"
-#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
-#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "Probelauf"
-#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
-#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
-#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "erweiterte Ausgaben"
@@ -2262,7 +2308,7 @@ msgstr "erweiterte Ausgaben"
msgid "interactive picking"
msgstr "interaktives Auswählen"
-#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "Blöcke interaktiv auswählen"
@@ -2323,154 +2369,154 @@ msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden."
-#: builtin/add.c:358
+#: builtin/add.c:352
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
-#: builtin/add.c:359
+#: builtin/add.c:353
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Meinten Sie vielleicht 'git add .'?\n"
-#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
-#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
msgid "index file corrupt"
msgstr "Index-Datei beschädigt"
-#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: builtin/am.c:41
+#: builtin/am.c:42
#, c-format
msgid "could not stat %s"
msgstr "Konnte '%s' nicht lesen"
-#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737
-#: builtin/merge.c:1079
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
#, c-format
msgid "could not read '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: builtin/am.c:444
+#: builtin/am.c:445
msgid "could not parse author script"
msgstr "konnte Autor-Skript nicht parsen"
-#: builtin/am.c:521
+#: builtin/am.c:522
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
-#: builtin/am.c:562 builtin/notes.c:300
+#: builtin/am.c:563 builtin/notes.c:300
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Fehlerhafte Eingabezeile: '%s'."
-#: builtin/am.c:599 builtin/notes.c:315
+#: builtin/am.c:600 builtin/notes.c:315
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
-#: builtin/am.c:625
+#: builtin/am.c:626
msgid "fseek failed"
msgstr "\"fseek\" fehlgeschlagen"
-#: builtin/am.c:786 builtin/am.c:874
+#: builtin/am.c:787 builtin/am.c:875
#, c-format
msgid "could not open '%s' for reading: %s"
msgstr "Konnte '%s' nicht zum Lesen öffnen: %s"
-#: builtin/am.c:793
+#: builtin/am.c:794
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s"
-#: builtin/am.c:802
+#: builtin/am.c:803
#, c-format
msgid "could not parse patch '%s'"
msgstr "konnte Patch '%s' nicht parsen"
-#: builtin/am.c:867
+#: builtin/am.c:868
msgid "Only one StGIT patch series can be applied at once"
msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden."
-#: builtin/am.c:915
+#: builtin/am.c:916
msgid "invalid timestamp"
msgstr "ungültiger Zeitstempel"
-#: builtin/am.c:918 builtin/am.c:926
+#: builtin/am.c:919 builtin/am.c:927
msgid "invalid Date line"
msgstr "Ungültige \"Date\"-Zeile"
-#: builtin/am.c:923
+#: builtin/am.c:924
msgid "invalid timezone offset"
msgstr "Ungültiger Offset in der Zeitzone"
-#: builtin/am.c:1010
+#: builtin/am.c:1011
msgid "Patch format detection failed."
msgstr "Patch-Formaterkennung fehlgeschlagen."
-#: builtin/am.c:1015 builtin/clone.c:368
+#: builtin/am.c:1016 builtin/clone.c:373
#, c-format
msgid "failed to create directory '%s'"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/am.c:1019
+#: builtin/am.c:1020
msgid "Failed to split patches."
msgstr "Fehler beim Aufteilen der Patches."
-#: builtin/am.c:1151 builtin/commit.c:362
+#: builtin/am.c:1152 builtin/commit.c:363
msgid "unable to write index file"
msgstr "Konnte Index-Datei nicht schreiben."
-#: builtin/am.c:1202
+#: builtin/am.c:1203
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
"Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus."
-#: builtin/am.c:1203
+#: builtin/am.c:1204
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip"
"\" aus."
-#: builtin/am.c:1204
+#: builtin/am.c:1205
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Um den ursprünglichen Branch wiederherzustellen und die Anwendung der "
"Patches abzubrechen, führen Sie \"%s --abort\" aus."
-#: builtin/am.c:1339
+#: builtin/am.c:1343
msgid "Patch is empty. Was it split wrong?"
msgstr "Patch ist leer. War dessen Aufteilung falsch?"
-#: builtin/am.c:1413 builtin/log.c:1345
+#: builtin/am.c:1417 builtin/log.c:1347
#, c-format
msgid "invalid ident line: %s"
msgstr "Ungültige Identifikationszeile: %s"
-#: builtin/am.c:1440
+#: builtin/am.c:1444
#, c-format
msgid "unable to parse commit %s"
msgstr "Konnte Commit '%s' nicht parsen."
-#: builtin/am.c:1614
+#: builtin/am.c:1646
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge "
"zurückzufallen."
-#: builtin/am.c:1616
+#: builtin/am.c:1648
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
"nachzustellen ..."
-#: builtin/am.c:1635
+#: builtin/am.c:1667
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2478,39 +2524,39 @@ msgstr ""
"Haben Sie den Patch per Hand editiert?\n"
"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
-#: builtin/am.c:1641
+#: builtin/am.c:1673
msgid "Falling back to patching base and 3-way merge..."
msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
-#: builtin/am.c:1666
+#: builtin/am.c:1688
msgid "Failed to merge in the changes."
msgstr "Merge der Änderungen fehlgeschlagen."
-#: builtin/am.c:1691 builtin/merge.c:632
+#: builtin/am.c:1712 builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-#: builtin/am.c:1698
+#: builtin/am.c:1719
msgid "applying to an empty history"
msgstr "auf leere Historie anwenden"
-#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
#: builtin/merge.c:854
msgid "failed to write commit object"
msgstr "Fehler beim Schreiben des Commit-Objektes."
-#: builtin/am.c:1743 builtin/am.c:1747
+#: builtin/am.c:1764 builtin/am.c:1768
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Kann nicht fortsetzen: %s existiert nicht"
-#: builtin/am.c:1763
+#: builtin/am.c:1784
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
"Terminal verbunden ist."
-#: builtin/am.c:1768
+#: builtin/am.c:1789
msgid "Commit Body is:"
msgstr "Commit-Beschreibung ist:"
@@ -2518,35 +2564,35 @@ msgstr "Commit-Beschreibung ist:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1778
+#: builtin/am.c:1799
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-#: builtin/am.c:1828
+#: builtin/am.c:1849
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
-#: builtin/am.c:1863 builtin/am.c:1934
+#: builtin/am.c:1884 builtin/am.c:1955
#, c-format
msgid "Applying: %.*s"
msgstr "Wende an: %.*s"
-#: builtin/am.c:1879
+#: builtin/am.c:1900
msgid "No changes -- Patch already applied."
msgstr "Keine Änderungen -- Patches bereits angewendet."
-#: builtin/am.c:1887
+#: builtin/am.c:1908
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
-#: builtin/am.c:1893
+#: builtin/am.c:1914
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s"
-#: builtin/am.c:1937
+#: builtin/am.c:1958
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2557,7 +2603,7 @@ msgstr ""
"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
"auslassen."
-#: builtin/am.c:1944
+#: builtin/am.c:1965
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2565,17 +2611,17 @@ msgstr ""
"Sie haben immer noch nicht zusammengeführte Pfade im Index.\n"
"Haben Sie vergessen 'git add' zu benutzen?"
-#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
-#: builtin/am.c:2104
+#: builtin/am.c:2125
msgid "failed to clean index"
msgstr "Fehler beim Bereinigen des Index"
-#: builtin/am.c:2138
+#: builtin/am.c:2159
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2583,151 +2629,153 @@ msgstr ""
"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
"Keine Zurücksetzung zu ORIG_HEAD."
-#: builtin/am.c:2199
+#: builtin/am.c:2220
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ungültiger Wert für --patch-format: %s"
-#: builtin/am.c:2221
-msgid "git am [options] [(<mbox>|<Maildir>)...]"
-msgstr "git am [Optionen] [(<mbox>|<E-Mail-Verzeichnis>)...]"
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+msgstr "git am [<Optionen>] [(<mbox>|<E-Mail-Verzeichnis>)...]"
-#: builtin/am.c:2222
-msgid "git am [options] (--continue | --skip | --abort)"
-msgstr "git am [Optionen] (--continue | --skip | --abort)"
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
-#: builtin/am.c:2228
+#: builtin/am.c:2260
msgid "run interactively"
msgstr "interaktiv ausführen"
-#: builtin/am.c:2230
+#: builtin/am.c:2262
msgid "historical option -- no-op"
msgstr "historische Option -- kein Effekt"
-#: builtin/am.c:2232
+#: builtin/am.c:2264
msgid "allow fall back on 3way merging if needed"
msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
-#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "weniger Ausgaben"
-#: builtin/am.c:2235
+#: builtin/am.c:2267
msgid "add a Signed-off-by line to the commit message"
msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen"
-#: builtin/am.c:2238
+#: builtin/am.c:2270
msgid "recode into utf8 (default)"
msgstr "nach UTF-8 umkodieren (Standard)"
-#: builtin/am.c:2240
+#: builtin/am.c:2272
msgid "pass -k flag to git-mailinfo"
msgstr "-k an git-mailinfo übergeben"
-#: builtin/am.c:2242
+#: builtin/am.c:2274
msgid "pass -b flag to git-mailinfo"
msgstr "-b an git-mailinfo übergeben"
-#: builtin/am.c:2244
+#: builtin/am.c:2276
msgid "pass -m flag to git-mailinfo"
msgstr "-m an git-mailinfo übergeben"
-#: builtin/am.c:2246
+#: builtin/am.c:2278
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben"
-#: builtin/am.c:2249
+#: builtin/am.c:2281
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr"
-#: builtin/am.c:2252
+#: builtin/am.c:2284
msgid "strip everything before a scissors line"
msgstr "alles vor einer Scheren-Zeile entfernen"
-#: builtin/am.c:2253 builtin/apply.c:4563
+#: builtin/am.c:2285 builtin/apply.c:4554
msgid "action"
msgstr "Aktion"
-#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2281
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
msgid "pass it through git-apply"
msgstr "an git-apply übergeben"
-#: builtin/am.c:2262 builtin/apply.c:4587
+#: builtin/am.c:2294 builtin/apply.c:4578
msgid "root"
msgstr "Wurzelverzeichnis"
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525
-#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
-#: builtin/pull.c:167
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
msgid "path"
msgstr "Pfad"
-#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
-#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
-#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
-#: parse-options.h:134 parse-options.h:243
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "Anzahl"
-#: builtin/am.c:2274 builtin/apply.c:4531
+#: builtin/am.c:2306 builtin/apply.c:4522
msgid "num"
msgstr "Anzahl"
-#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
msgid "format"
msgstr "Format"
-#: builtin/am.c:2278
+#: builtin/am.c:2310
msgid "format the patch(es) are in"
msgstr "Patch-Format"
-#: builtin/am.c:2284
+#: builtin/am.c:2316
msgid "override error message when patch failure occurs"
msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
-#: builtin/am.c:2286
+#: builtin/am.c:2318
msgid "continue applying patches after resolving a conflict"
msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
-#: builtin/am.c:2289
+#: builtin/am.c:2321
msgid "synonyms for --continue"
msgstr "Synonyme für --continue"
-#: builtin/am.c:2292
+#: builtin/am.c:2324
msgid "skip the current patch"
msgstr "den aktuellen Patch auslassen"
-#: builtin/am.c:2295
+#: builtin/am.c:2327
msgid "restore the original branch and abort the patching operation."
msgstr ""
"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
-#: builtin/am.c:2299
+#: builtin/am.c:2331
msgid "lie about committer date"
msgstr "Autor-Datum als Commit-Datum verwenden"
-#: builtin/am.c:2301
+#: builtin/am.c:2333
msgid "use current timestamp for author date"
msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
-#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225
-#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "GPG-Schlüsselkennung"
-#: builtin/am.c:2304
+#: builtin/am.c:2336
msgid "GPG-sign commits"
msgstr "Commits mit GPG signieren"
-#: builtin/am.c:2307
+#: builtin/am.c:2339
msgid "(internal use for git-rebase)"
msgstr "(intern für git-rebase verwendet)"
-#: builtin/am.c:2322
+#: builtin/am.c:2354
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -2735,16 +2783,16 @@ msgstr ""
"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
"entfernt. Bitte verwenden Sie diese nicht mehr."
-#: builtin/am.c:2329
+#: builtin/am.c:2361
msgid "failed to read the index"
msgstr "Fehler beim Lesen des Index"
-#: builtin/am.c:2344
+#: builtin/am.c:2376
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben."
-#: builtin/am.c:2368
+#: builtin/am.c:2400
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2753,7 +2801,7 @@ msgstr ""
"Stray %s Verzeichnis gefunden.\n"
"Benutzen Sie \"git am --abort\", um es zu entfernen."
-#: builtin/am.c:2374
+#: builtin/am.c:2406
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
@@ -2761,66 +2809,66 @@ msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<Optionen>] [<Patch>...]"
-#: builtin/apply.c:112
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "nicht erkannte Whitespace-Option: '%s'"
-#: builtin/apply.c:127
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
-#: builtin/apply.c:822
+#: builtin/apply.c:818
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
-#: builtin/apply.c:831
+#: builtin/apply.c:827
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
-#: builtin/apply.c:912
+#: builtin/apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
-#: builtin/apply.c:944
+#: builtin/apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile "
"%d"
-#: builtin/apply.c:948
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d"
-#: builtin/apply.c:949
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d"
-#: builtin/apply.c:956
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d"
-#: builtin/apply.c:1419
+#: builtin/apply.c:1415
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: unerwartete Zeile: %.*s"
-#: builtin/apply.c:1476
+#: builtin/apply.c:1472
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
-#: builtin/apply.c:1493
+#: builtin/apply.c:1489
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2835,65 +2883,65 @@ msgstr[1] ""
"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
"%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
-#: builtin/apply.c:1659
+#: builtin/apply.c:1655
msgid "new file depends on old contents"
msgstr "neue Datei hängt von alten Inhalten ab"
-#: builtin/apply.c:1661
+#: builtin/apply.c:1657
msgid "deleted file still has contents"
msgstr "entfernte Datei hat noch Inhalte"
-#: builtin/apply.c:1687
+#: builtin/apply.c:1683
#, c-format
msgid "corrupt patch at line %d"
msgstr "fehlerhafter Patch bei Zeile %d"
-#: builtin/apply.c:1723
+#: builtin/apply.c:1719
#, c-format
msgid "new file %s depends on old contents"
msgstr "neue Datei %s hängt von alten Inhalten ab"
-#: builtin/apply.c:1725
+#: builtin/apply.c:1721
#, c-format
msgid "deleted file %s still has contents"
msgstr "entfernte Datei %s hat noch Inhalte"
-#: builtin/apply.c:1728
+#: builtin/apply.c:1724
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
-#: builtin/apply.c:1874
+#: builtin/apply.c:1870
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
-#: builtin/apply.c:1903
+#: builtin/apply.c:1899
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "nicht erkannter Binär-Patch bei Zeile %d"
-#: builtin/apply.c:2054
+#: builtin/apply.c:2050
#, c-format
msgid "patch with only garbage at line %d"
msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2140
#, c-format
msgid "unable to read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: builtin/apply.c:2148
+#: builtin/apply.c:2144
#, c-format
msgid "unable to open or read %s"
msgstr "konnte %s nicht öffnen oder lesen"
-#: builtin/apply.c:2781
+#: builtin/apply.c:2777
#, c-format
msgid "invalid start of line: '%c'"
msgstr "Ungültiger Zeilenanfang: '%c'"
-#: builtin/apply.c:2900
+#: builtin/apply.c:2896
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -2901,12 +2949,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)"
msgstr[1] ""
"Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
-#: builtin/apply.c:2912
+#: builtin/apply.c:2908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden"
-#: builtin/apply.c:2918
+#: builtin/apply.c:2914
#, c-format
msgid ""
"while searching for:\n"
@@ -2915,337 +2963,337 @@ msgstr ""
"bei der Suche nach:\n"
"%.*s"
-#: builtin/apply.c:2938
+#: builtin/apply.c:2934
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "keine Daten in Binär-Patch für '%s'"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3035
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
-#: builtin/apply.c:3045
+#: builtin/apply.c:3041
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)"
-#: builtin/apply.c:3066
+#: builtin/apply.c:3062
#, c-format
msgid "patch failed: %s:%ld"
msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
-#: builtin/apply.c:3190
+#: builtin/apply.c:3186
#, c-format
msgid "cannot checkout %s"
msgstr "kann %s nicht auschecken"
-#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
#, c-format
msgid "read of %s failed"
msgstr "Konnte %s nicht lesen"
-#: builtin/apply.c:3243
+#: builtin/apply.c:3239
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
-#: builtin/apply.c:3271 builtin/apply.c:3493
+#: builtin/apply.c:3267 builtin/apply.c:3489
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "Pfad %s wurde umbenannt/gelöscht"
-#: builtin/apply.c:3352 builtin/apply.c:3507
+#: builtin/apply.c:3348 builtin/apply.c:3503
#, c-format
msgid "%s: does not exist in index"
msgstr "%s ist nicht im Index"
-#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3361 builtin/apply.c:3515
+#: builtin/apply.c:3357 builtin/apply.c:3511
#, c-format
msgid "%s: does not match index"
msgstr "%s entspricht nicht der Version im Index"
-#: builtin/apply.c:3463
+#: builtin/apply.c:3459
msgid "removal patch leaves file contents"
msgstr "Lösch-Patch hinterlässt Dateiinhalte"
-#: builtin/apply.c:3532
+#: builtin/apply.c:3528
#, c-format
msgid "%s: wrong type"
msgstr "%s: falscher Typ"
-#: builtin/apply.c:3534
+#: builtin/apply.c:3530
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s ist vom Typ %o, erwartete %o"
-#: builtin/apply.c:3693 builtin/apply.c:3695
+#: builtin/apply.c:3689 builtin/apply.c:3691
#, c-format
msgid "invalid path '%s'"
msgstr "Ungültiger Pfad '%s'"
-#: builtin/apply.c:3750
+#: builtin/apply.c:3746
#, c-format
msgid "%s: already exists in index"
msgstr "%s ist bereits bereitgestellt"
-#: builtin/apply.c:3753
+#: builtin/apply.c:3749
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s existiert bereits im Arbeitsverzeichnis"
-#: builtin/apply.c:3773
+#: builtin/apply.c:3769
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)"
-#: builtin/apply.c:3778
+#: builtin/apply.c:3774
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3794
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
-#: builtin/apply.c:3802
+#: builtin/apply.c:3798
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: Patch konnte nicht angewendet werden"
-#: builtin/apply.c:3816
+#: builtin/apply.c:3812
#, c-format
msgid "Checking patch %s..."
msgstr "Prüfe Patch %s ..."
-#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
-#: builtin/apply.c:4052
+#: builtin/apply.c:4048
#, c-format
msgid "unable to remove %s from index"
msgstr "konnte %s nicht aus dem Index entfernen"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4077
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "fehlerhafter Patch für Submodul %s"
-#: builtin/apply.c:4085
+#: builtin/apply.c:4081
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "konnte neu erstellte Datei '%s' nicht lesen"
-#: builtin/apply.c:4090
+#: builtin/apply.c:4086
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen"
-#: builtin/apply.c:4093 builtin/apply.c:4201
+#: builtin/apply.c:4089 builtin/apply.c:4197
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
-#: builtin/apply.c:4126
+#: builtin/apply.c:4122
#, c-format
msgid "closing file '%s'"
msgstr "schließe Datei '%s'"
-#: builtin/apply.c:4175
+#: builtin/apply.c:4171
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
-#: builtin/apply.c:4262
+#: builtin/apply.c:4258
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s sauber angewendet"
-#: builtin/apply.c:4270
+#: builtin/apply.c:4266
msgid "internal error"
msgstr "interner Fehler"
-#: builtin/apply.c:4273
+#: builtin/apply.c:4269
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..."
msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..."
-#: builtin/apply.c:4283
+#: builtin/apply.c:4279
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
-#: builtin/apply.c:4304
+#: builtin/apply.c:4300
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Patch-Bereich #%d sauber angewendet."
-#: builtin/apply.c:4307
+#: builtin/apply.c:4303
#, c-format
msgid "Rejected hunk #%d."
msgstr "Patch-Block #%d zurückgewiesen."
-#: builtin/apply.c:4397
+#: builtin/apply.c:4393
msgid "unrecognized input"
msgstr "nicht erkannte Eingabe"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4404
msgid "unable to read index file"
msgstr "Konnte Index-Datei nicht lesen"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4517
msgid "don't apply changes matching the given path"
msgstr "keine Änderungen im angegebenen Pfad anwenden"
-#: builtin/apply.c:4529
+#: builtin/apply.c:4520
msgid "apply changes matching the given path"
msgstr "Änderungen nur im angegebenen Pfad anwenden"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4523
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
"entfernen"
-#: builtin/apply.c:4535
+#: builtin/apply.c:4526
msgid "ignore additions made by the patch"
msgstr "hinzugefügte Zeilen des Patches ignorieren"
-#: builtin/apply.c:4537
+#: builtin/apply.c:4528
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe "
"ausgegeben"
-#: builtin/apply.c:4541
+#: builtin/apply.c:4532
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4534
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
"anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe "
"ausgeben"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4536
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
"anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4538
msgid "make sure the patch is applicable to the current index"
msgstr ""
"sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
-#: builtin/apply.c:4549
+#: builtin/apply.c:4540
msgid "apply a patch without touching the working tree"
msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
-#: builtin/apply.c:4551
+#: builtin/apply.c:4542
msgid "accept a patch that touches outside the working area"
msgstr ""
"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
-#: builtin/apply.c:4553
+#: builtin/apply.c:4544
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
-#: builtin/apply.c:4555
+#: builtin/apply.c:4546
msgid "attempt three-way merge if a patch does not apply"
msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
-#: builtin/apply.c:4557
+#: builtin/apply.c:4548
msgid "build a temporary index based on embedded index information"
msgstr ""
"einen temporären Index, basierend auf den integrierten Index-Informationen, "
"erstellen"
-#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr "Pfade sind getrennt durch NUL Zeichen"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4553
msgid "ensure at least <n> lines of context match"
msgstr ""
"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
-#: builtin/apply.c:4564
+#: builtin/apply.c:4555
msgid "detect new or modified lines that have whitespace errors"
msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
-#: builtin/apply.c:4567 builtin/apply.c:4570
+#: builtin/apply.c:4558 builtin/apply.c:4561
msgid "ignore changes in whitespace when finding context"
msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
-#: builtin/apply.c:4573
+#: builtin/apply.c:4564
msgid "apply the patch in reverse"
msgstr "den Patch in umgekehrter Reihenfolge anwenden"
-#: builtin/apply.c:4575
+#: builtin/apply.c:4566
msgid "don't expect at least one line of context"
msgstr "keinen Kontext erwarten"
-#: builtin/apply.c:4577
+#: builtin/apply.c:4568
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
-#: builtin/apply.c:4579
+#: builtin/apply.c:4570
msgid "allow overlapping hunks"
msgstr "sich überlappende Patch-Blöcke erlauben"
-#: builtin/apply.c:4582
+#: builtin/apply.c:4573
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
-#: builtin/apply.c:4585
+#: builtin/apply.c:4576
msgid "do not trust the line counts in the hunk headers"
msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
-#: builtin/apply.c:4588
+#: builtin/apply.c:4579
msgid "prepend <root> to all filenames"
msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
-#: builtin/apply.c:4610
+#: builtin/apply.c:4601
msgid "--3way outside a repository"
msgstr ""
"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
-#: builtin/apply.c:4618
+#: builtin/apply.c:4609
msgid "--index outside a repository"
msgstr ""
"Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
-#: builtin/apply.c:4621
+#: builtin/apply.c:4612
msgid "--cached outside a repository"
msgstr ""
"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
-#: builtin/apply.c:4640
+#: builtin/apply.c:4631
#, c-format
msgid "can't open patch '%s'"
msgstr "kann Patch '%s' nicht öffnen"
-#: builtin/apply.c:4654
+#: builtin/apply.c:4645
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "unterdrückte %d Whitespace-Fehler"
msgstr[1] "unterdrückte %d Whitespace-Fehler"
-#: builtin/apply.c:4660 builtin/apply.c:4670
+#: builtin/apply.c:4651 builtin/apply.c:4661
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3307,98 +3355,98 @@ msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
-#: builtin/blame.c:2500
+#: builtin/blame.c:2519
msgid "Show blame entries as we find them, incrementally"
msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
-#: builtin/blame.c:2501
+#: builtin/blame.c:2520
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)"
-#: builtin/blame.c:2502
+#: builtin/blame.c:2521
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)"
-#: builtin/blame.c:2503
+#: builtin/blame.c:2522
msgid "Show work cost statistics"
msgstr "Statistiken zum Arbeitsaufwand anzeigen"
-#: builtin/blame.c:2504
+#: builtin/blame.c:2523
msgid "Show output score for blame entries"
msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
-#: builtin/blame.c:2505
+#: builtin/blame.c:2524
msgid "Show original filename (Default: auto)"
msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
-#: builtin/blame.c:2506
+#: builtin/blame.c:2525
msgid "Show original linenumber (Default: off)"
msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
-#: builtin/blame.c:2507
+#: builtin/blame.c:2526
msgid "Show in a format designed for machine consumption"
msgstr "Anzeige in einem Format für maschinelle Auswertung"
-#: builtin/blame.c:2508
+#: builtin/blame.c:2527
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
-#: builtin/blame.c:2509
+#: builtin/blame.c:2528
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
-#: builtin/blame.c:2510
+#: builtin/blame.c:2529
msgid "Show raw timestamp (Default: off)"
msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
-#: builtin/blame.c:2511
+#: builtin/blame.c:2530
msgid "Show long commit SHA1 (Default: off)"
msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
-#: builtin/blame.c:2512
+#: builtin/blame.c:2531
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
-#: builtin/blame.c:2513
+#: builtin/blame.c:2532
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
-#: builtin/blame.c:2514
+#: builtin/blame.c:2533
msgid "Ignore whitespace differences"
msgstr "Unterschiede im Whitespace ignorieren"
-#: builtin/blame.c:2515
+#: builtin/blame.c:2534
msgid "Spend extra cycles to find better match"
msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
-#: builtin/blame.c:2516
+#: builtin/blame.c:2535
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
-#: builtin/blame.c:2517
+#: builtin/blame.c:2536
msgid "Use <file>'s contents as the final image"
msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
-#: builtin/blame.c:2518 builtin/blame.c:2519
+#: builtin/blame.c:2537 builtin/blame.c:2538
msgid "score"
msgstr "Bewertung"
-#: builtin/blame.c:2518
+#: builtin/blame.c:2537
msgid "Find line copies within and across files"
msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:2519
+#: builtin/blame.c:2538
msgid "Find line movements within and across files"
msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "Process only line range n,m, counting from 1"
msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
@@ -3408,27 +3456,31 @@ msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2601
+#: builtin/blame.c:2620
msgid "4 years, 11 months ago"
msgstr "vor 4 Jahren, und 11 Monaten"
-#: builtin/branch.c:24
+#: builtin/branch.c:25
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<Optionen>] [-l] [-f] <Branchname> [<Startpunkt>]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..."
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>"
-#: builtin/branch.c:150
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<Optionen>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:142
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3437,7 +3489,7 @@ msgstr ""
"entferne Branch '%s', der zusammengeführt wurde mit\n"
" '%s', aber noch nicht mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:154
+#: builtin/branch.c:146
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3446,12 +3498,12 @@ msgstr ""
"entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n"
" '%s', obwohl er mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:168
+#: builtin/branch.c:160
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
-#: builtin/branch.c:172
+#: builtin/branch.c:164
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3461,311 +3513,303 @@ msgstr ""
"Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
"%s' aus."
-#: builtin/branch.c:185
+#: builtin/branch.c:177
msgid "Update of config-file failed"
msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
-#: builtin/branch.c:213
+#: builtin/branch.c:205
msgid "cannot use -a with -d"
msgstr "kann -a nicht mit -d benutzen"
-#: builtin/branch.c:219
+#: builtin/branch.c:211
msgid "Couldn't look up commit object for HEAD"
msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
-#: builtin/branch.c:227
+#: builtin/branch.c:219
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr ""
"Kann Branch '%s' nicht entfernen, da Sie sich gerade auf diesem befinden."
-#: builtin/branch.c:243
+#: builtin/branch.c:235
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
-#: builtin/branch.c:244
+#: builtin/branch.c:236
#, c-format
msgid "branch '%s' not found."
msgstr "Branch '%s' nicht gefunden."
-#: builtin/branch.c:259
+#: builtin/branch.c:251
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'"
-#: builtin/branch.c:260
+#: builtin/branch.c:252
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fehler beim Entfernen des Branches '%s'"
-#: builtin/branch.c:267
+#: builtin/branch.c:259
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:268
+#: builtin/branch.c:260
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:369
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr "Branch '%s' zeigt auf keinen Commit"
-
-#: builtin/branch.c:452
+#: builtin/branch.c:303
#, c-format
msgid "[%s: gone]"
msgstr "[%s: entfernt]"
-#: builtin/branch.c:457
+#: builtin/branch.c:308
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:462
+#: builtin/branch.c:313
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: %d hinterher]"
-#: builtin/branch.c:464
+#: builtin/branch.c:315
#, c-format
msgid "[behind %d]"
msgstr "[%d hinterher]"
-#: builtin/branch.c:468
+#: builtin/branch.c:319
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: %d voraus]"
-#: builtin/branch.c:470
+#: builtin/branch.c:321
#, c-format
msgid "[ahead %d]"
msgstr "[%d voraus]"
-#: builtin/branch.c:473
+#: builtin/branch.c:324
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: %d voraus, %d hinterher]"
-#: builtin/branch.c:476
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[%d voraus, %d hinterher]"
-#: builtin/branch.c:489
+#: builtin/branch.c:340
msgid " **** invalid ref ****"
msgstr " **** ungültige Referenz ****"
-#: builtin/branch.c:580
+#: builtin/branch.c:366
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(kein Branch, Rebase von Branch %s im Gange)"
-#: builtin/branch.c:583
+#: builtin/branch.c:369
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(kein Branch, binäre Suche begonnen bei %s)"
-#: builtin/branch.c:589
+#: builtin/branch.c:375
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD losgelöst bei %s)"
-#: builtin/branch.c:592
+#: builtin/branch.c:378
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD losgelöst von %s)"
-#: builtin/branch.c:596
+#: builtin/branch.c:382
msgid "(no branch)"
msgstr "(kein Branch)"
-#: builtin/branch.c:643
-#, c-format
-msgid "object '%s' does not point to a commit"
-msgstr "Objekt '%s' zeigt auf keinen Commit"
-
-#: builtin/branch.c:691
-msgid "some refs could not be read"
-msgstr "Konnte einige Referenzen nicht lesen"
-
-#: builtin/branch.c:704
+#: builtin/branch.c:524
msgid "cannot rename the current branch while not on any."
msgstr ""
"Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden."
-#: builtin/branch.c:714
+#: builtin/branch.c:534
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ungültiger Branchname: '%s'"
-#: builtin/branch.c:729
+#: builtin/branch.c:549
msgid "Branch rename failed"
msgstr "Umbenennung des Branches fehlgeschlagen"
-#: builtin/branch.c:733
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "falsch benannten Branch '%s' umbenannt"
-#: builtin/branch.c:737
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!"
-#: builtin/branch.c:744
+#: builtin/branch.c:564
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
"fehlgeschlagen."
-#: builtin/branch.c:759
-#, c-format
-msgid "malformed object name %s"
-msgstr "Missgebildeter Objektname %s"
-
-#: builtin/branch.c:781
+#: builtin/branch.c:587
#, c-format
msgid "could not write branch description template: %s"
msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben: %s"
-#: builtin/branch.c:811
+#: builtin/branch.c:616
msgid "Generic options"
msgstr "Allgemeine Optionen"
-#: builtin/branch.c:813
+#: builtin/branch.c:618
msgid "show hash and subject, give twice for upstream branch"
msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
-#: builtin/branch.c:814
+#: builtin/branch.c:619
msgid "suppress informational messages"
msgstr "Informationsmeldungen unterdrücken"
-#: builtin/branch.c:815
+#: builtin/branch.c:620
msgid "set up tracking mode (see git-pull(1))"
msgstr "den Ãœbernahmemodus einstellen (siehe git-pull(1))"
-#: builtin/branch.c:817
+#: builtin/branch.c:622
msgid "change upstream info"
msgstr "Informationen zum Upstream-Branch ändern"
-#: builtin/branch.c:821
+#: builtin/branch.c:626
msgid "use colored output"
msgstr "farbige Ausgaben verwenden"
-#: builtin/branch.c:822
+#: builtin/branch.c:627
msgid "act on remote-tracking branches"
msgstr "auf Remote-Tracking-Branches wirken"
-#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
-#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
-#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
-#: builtin/tag.c:624
-msgid "commit"
-msgstr "Commit"
-
-#: builtin/branch.c:826 builtin/branch.c:832
+#: builtin/branch.c:629 builtin/branch.c:630
msgid "print only branches that contain the commit"
msgstr "nur Branches ausgeben, welche diesen Commit beinhalten"
-#: builtin/branch.c:838
+#: builtin/branch.c:633
msgid "Specific git-branch actions:"
msgstr "spezifische Aktionen für \"git-branch\":"
-#: builtin/branch.c:839
+#: builtin/branch.c:634
msgid "list both remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches auflisten"
-#: builtin/branch.c:841
+#: builtin/branch.c:636
msgid "delete fully merged branch"
msgstr "vollständig zusammengeführten Branch entfernen"
-#: builtin/branch.c:842
+#: builtin/branch.c:637
msgid "delete branch (even if not merged)"
msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
-#: builtin/branch.c:843
+#: builtin/branch.c:638
msgid "move/rename a branch and its reflog"
msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
-#: builtin/branch.c:844
+#: builtin/branch.c:639
msgid "move/rename a branch, even if target exists"
msgstr ""
"einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:845
+#: builtin/branch.c:640
msgid "list branch names"
msgstr "Branchnamen auflisten"
-#: builtin/branch.c:846
+#: builtin/branch.c:641
msgid "create the branch's reflog"
msgstr "das Reflog des Branches erzeugen"
-#: builtin/branch.c:848
+#: builtin/branch.c:643
msgid "edit the description for the branch"
msgstr "die Beschreibung für den Branch bearbeiten"
-#: builtin/branch.c:849
+#: builtin/branch.c:644
msgid "force creation, move/rename, deletion"
msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
-#: builtin/branch.c:852
-msgid "print only not merged branches"
-msgstr "nur Branches ausgeben, die nicht zusammengeführt sind"
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
+msgstr "nur zusammengeführte Branches ausgeben"
-#: builtin/branch.c:858
-msgid "print only merged branches"
-msgstr "nur Branches ausgeben, die zusammengeführt sind"
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
+msgstr "nur nicht zusammengeführte Branches ausgeben"
-#: builtin/branch.c:862
+#: builtin/branch.c:647
msgid "list branches in columns"
msgstr "Branches in Spalten auflisten"
-#: builtin/branch.c:875
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr "Schüssel"
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr "sortiere nach diesem Feld"
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr "Objekt"
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr "nur Branches von diesem Objekt ausgeben"
+
+#: builtin/branch.c:670
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
-#: builtin/branch.c:879 builtin/clone.c:690
+#: builtin/branch.c:674 builtin/clone.c:697
msgid "HEAD not found below refs/heads!"
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
-#: builtin/branch.c:901
+#: builtin/branch.c:694
msgid "--column and --verbose are incompatible"
msgstr "Die Optionen --column und --verbose sind inkompatibel."
-#: builtin/branch.c:912 builtin/branch.c:951
+#: builtin/branch.c:705 builtin/branch.c:747
msgid "branch name required"
msgstr "Branchname erforderlich"
-#: builtin/branch.c:927
+#: builtin/branch.c:723
msgid "Cannot give description to detached HEAD"
msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
-#: builtin/branch.c:932
+#: builtin/branch.c:728
msgid "cannot edit description of more than one branch"
msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
-#: builtin/branch.c:939
+#: builtin/branch.c:735
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Noch kein Commit in Branch '%s'."
-#: builtin/branch.c:942
+#: builtin/branch.c:738
#, c-format
msgid "No branch named '%s'."
msgstr "Branch '%s' nicht vorhanden."
-#: builtin/branch.c:957
+#: builtin/branch.c:753
msgid "too many branches for a rename operation"
msgstr "zu viele Branches für eine Umbenennen-Operation angegeben"
-#: builtin/branch.c:962
+#: builtin/branch.c:758
msgid "too many branches to set new upstream"
msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen"
-#: builtin/branch.c:966
+#: builtin/branch.c:762
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3773,43 +3817,43 @@ msgstr ""
"Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
"keinen Branch zeigt."
-#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
#, c-format
msgid "no such branch '%s'"
msgstr "Kein solcher Branch '%s'"
-#: builtin/branch.c:973
+#: builtin/branch.c:769
#, c-format
msgid "branch '%s' does not exist"
msgstr "Branch '%s' existiert nicht"
-#: builtin/branch.c:985
+#: builtin/branch.c:781
msgid "too many branches to unset upstream"
msgstr ""
"zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen"
-#: builtin/branch.c:989
+#: builtin/branch.c:785
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n"
"auf keinen Branch zeigt."
-#: builtin/branch.c:995
+#: builtin/branch.c:791
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: builtin/branch.c:1009
+#: builtin/branch.c:805
msgid "it does not make sense to create 'HEAD' manually"
msgstr "'HEAD' darf nicht manuell erstellt werden"
-#: builtin/branch.c:1015
+#: builtin/branch.c:811
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem "
"Branchnamen verwendet werden."
-#: builtin/branch.c:1018
+#: builtin/branch.c:814
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3818,7 +3862,7 @@ msgstr ""
"Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --"
"track oder --set-upstream-to\n"
-#: builtin/branch.c:1035
+#: builtin/branch.c:831
#, c-format
msgid ""
"\n"
@@ -3829,12 +3873,12 @@ msgstr ""
"Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen "
"Sie aus:\n"
-#: builtin/branch.c:1036
+#: builtin/branch.c:832
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1037
+#: builtin/branch.c:833
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3861,12 +3905,8 @@ msgstr ""
"<Art>|--textconv) <Objekt>"
#: builtin/cat-file.c:429
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
-"objects>"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <Liste-von-"
-"Objekten"
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
#: builtin/cat-file.c:466
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -3926,9 +3966,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <Attribut>...] [--] <Pfadname>..."
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
-msgstr ""
-"git check-attr --stdin [-z] [-a | --all | <Attribut>...] < <Liste-von-Pfaden>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <Attribut>...]"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@ -3946,7 +3985,7 @@ msgstr "Dateinamen von der Standard-Eingabe lesen"
msgid "terminate input and output records by a NUL character"
msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "Fortschrittsanzeige unterdrücken"
@@ -4035,6 +4074,8 @@ msgid "write the content to temporary files"
msgstr "den Inhalt in temporäre Dateien schreiben"
#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
msgid "string"
msgstr "Zeichenkette"
@@ -4055,106 +4096,106 @@ msgstr "git checkout [<Optionen>] <Branch>"
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..."
-#: builtin/checkout.c:133 builtin/checkout.c:166
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
msgid "path '%s' does not have our version"
msgstr "Pfad '%s' hat nicht unsere Version."
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have their version"
msgstr "Pfad '%s' hat nicht deren Version."
-#: builtin/checkout.c:151
+#: builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
-#: builtin/checkout.c:195
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
-#: builtin/checkout.c:212
+#: builtin/checkout.c:213
#, c-format
msgid "path '%s': cannot merge"
msgstr "Pfad '%s': kann nicht zusammenführen"
-#: builtin/checkout.c:229
+#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:263 builtin/checkout.c:266
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:269
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
-#: builtin/checkout.c:279 builtin/checkout.c:473
+#: builtin/checkout.c:280 builtin/checkout.c:474
msgid "corrupt index file"
msgstr "beschädigte Index-Datei"
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr "Pfad '%s' ist nicht zusammengeführt."
-#: builtin/checkout.c:495
+#: builtin/checkout.c:496
msgid "you need to resolve your current index first"
msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
-#: builtin/checkout.c:622
+#: builtin/checkout.c:623
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:661
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
-#: builtin/checkout.c:667
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
-#: builtin/checkout.c:670
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:676 builtin/checkout.c:1065
+#: builtin/checkout.c:677 builtin/checkout.c:1066
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Zu neuem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:678
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Zu Branch '%s' gewechselt\n"
-#: builtin/checkout.c:730
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4177,7 +4218,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:755
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4204,146 +4245,152 @@ msgstr[1] ""
" git branch <neuer-Branchname> %s\n"
"\n"
-#: builtin/checkout.c:791
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
-#: builtin/checkout.c:822 builtin/checkout.c:1060
+#: builtin/checkout.c:823 builtin/checkout.c:1061
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch geboren wird"
-#: builtin/checkout.c:967
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "nur eine Referenz erwartet, %d gegeben."
-#: builtin/checkout.c:1006 builtin/worktree.c:210
+#: builtin/checkout.c:1007 builtin/worktree.c:213
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
-#: builtin/checkout.c:1035
+#: builtin/checkout.c:1036
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
-#: builtin/checkout.c:1074
+#: builtin/checkout.c:1075
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1077 builtin/checkout.c:1081
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1102
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
-#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
-#: builtin/worktree.c:319
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
msgid "branch"
msgstr "Branch"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1136
msgid "create and checkout a new branch"
msgstr "einen neuen Branch erzeugen und auschecken"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1138
msgid "create/reset and checkout a branch"
msgstr "einen Branch erstellen/umsetzen und auschecken"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1139
msgid "create reflog for new branch"
msgstr "das Reflog für den neuen Branch erzeugen"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1140
msgid "detach the HEAD at named commit"
msgstr "HEAD zu benanntem Commit setzen"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1141
msgid "set upstream info for new branch"
msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new-branch"
msgstr "neuer Branch"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new unparented branch"
msgstr "neuer Branch ohne Eltern-Commit"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
msgid "checkout our version for unmerged files"
msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1146
msgid "checkout their version for unmerged files"
msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1148
msgid "force checkout (throw away local modifications)"
msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1149
msgid "perform a 3-way merge with the new branch"
msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
-#: builtin/checkout.c:1149 builtin/merge.c:227
+#: builtin/checkout.c:1150 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr "ignorierte Dateien aktualisieren (Standard)"
-#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
+#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
msgid "style"
msgstr "Stil"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1152
msgid "conflict style (merge or diff3)"
msgstr "Konfliktstil (merge oder diff3)"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1155
msgid "do not limit pathspecs to sparse entries only"
msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1157
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "second guess 'git checkout <no-such-branch>'"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1159
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis "
"ausgecheckt wurde, deaktivieren"
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr "Fortschrittsanzeige erzwingen"
+
+#: builtin/checkout.c:1191
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
-#: builtin/checkout.c:1198
+#: builtin/checkout.c:1208
msgid "--track needs a branch name"
msgstr "Bei der Option --track muss ein Branchname angegeben werden."
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1213
msgid "Missing branch name; try -b"
msgstr "Vermisse Branchnamen; versuchen Sie -b"
-#: builtin/checkout.c:1239
+#: builtin/checkout.c:1249
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1256
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4353,12 +4400,12 @@ msgstr ""
"Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst "
"werden kann?"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1261
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1265
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4397,7 +4444,7 @@ msgstr "Würde Repository %s überspringen\n"
msgid "failed to remove %s"
msgstr "Fehler beim Löschen von %s"
-#: builtin/clean.c:317
+#: builtin/clean.c:315
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -4409,7 +4456,7 @@ msgstr ""
"foo - Element anhand eines eindeutigen Präfix auswählen\n"
" - (leer) nichts auswählen"
-#: builtin/clean.c:321
+#: builtin/clean.c:319
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -4429,36 +4476,36 @@ msgstr ""
"* - alle Elemente auswählen\n"
" - (leer) Auswahl beenden"
-#: builtin/clean.c:537
+#: builtin/clean.c:535
#, c-format
msgid "Huh (%s)?"
msgstr "Wie bitte (%s)?"
-#: builtin/clean.c:679
+#: builtin/clean.c:677
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ignorier-Muster eingeben>> "
-#: builtin/clean.c:716
+#: builtin/clean.c:714
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
-#: builtin/clean.c:737
+#: builtin/clean.c:735
msgid "Select items to delete"
msgstr "Wählen Sie Einträge zum Löschen"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:778
+#: builtin/clean.c:776
#, c-format
msgid "Remove %s [y/N]? "
msgstr "'%s' löschen [y/N]? "
-#: builtin/clean.c:803
+#: builtin/clean.c:801
msgid "Bye."
msgstr "Tschüss."
-#: builtin/clean.c:811
+#: builtin/clean.c:809
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -4476,62 +4523,62 @@ msgstr ""
"help - diese Meldung anzeigen\n"
"? - Hilfe zur Auswahl mittels Eingabe anzeigen"
-#: builtin/clean.c:838
+#: builtin/clean.c:836
msgid "*** Commands ***"
msgstr "*** Kommandos ***"
-#: builtin/clean.c:839
+#: builtin/clean.c:837
msgid "What now"
msgstr "Was nun"
-#: builtin/clean.c:847
+#: builtin/clean.c:845
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Würde das folgende Element entfernen:"
msgstr[1] "Würde die folgenden Elemente entfernen:"
-#: builtin/clean.c:864
+#: builtin/clean.c:862
msgid "No more files to clean, exiting."
msgstr "Keine Dateien mehr zum Löschen, beende."
-#: builtin/clean.c:895
+#: builtin/clean.c:893
msgid "do not print names of files removed"
msgstr "keine Namen von gelöschten Dateien ausgeben"
-#: builtin/clean.c:897
+#: builtin/clean.c:895
msgid "force"
msgstr "Aktion erzwingen"
-#: builtin/clean.c:898
+#: builtin/clean.c:896
msgid "interactive cleaning"
msgstr "interaktives Clean"
-#: builtin/clean.c:900
+#: builtin/clean.c:898
msgid "remove whole directories"
msgstr "ganze Verzeichnisse löschen"
-#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
msgid "pattern"
msgstr "Muster"
-#: builtin/clean.c:902
+#: builtin/clean.c:900
msgid "add <pattern> to ignore rules"
msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
-#: builtin/clean.c:903
+#: builtin/clean.c:901
msgid "remove ignored files, too"
msgstr "auch ignorierte Dateien löschen"
-#: builtin/clean.c:905
+#: builtin/clean.c:903
msgid "remove only ignored files"
msgstr "nur ignorierte Dateien löschen"
-#: builtin/clean.c:923
+#: builtin/clean.c:921
msgid "-x and -X cannot be used together"
msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden."
-#: builtin/clean.c:927
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -4539,7 +4586,7 @@ msgstr ""
"clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
"\"clean\" verweigert"
-#: builtin/clean.c:930
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -4551,16 +4598,11 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
-#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
-#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
-msgid "force progress reporting"
-msgstr "Fortschrittsanzeige erzwingen"
-
#: builtin/clone.c:59
msgid "don't create a checkout"
msgstr "kein Auschecken"
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
msgid "create a bare repository"
msgstr "ein Bare-Repository erstellen"
@@ -4584,15 +4626,15 @@ msgstr "als verteiltes Repository einrichten"
msgid "initialize submodules in the clone"
msgstr "Submodule im Klon initialisieren"
-#: builtin/clone.c:75 builtin/init-db.c:501
+#: builtin/clone.c:75 builtin/init-db.c:466
msgid "template-directory"
msgstr "Vorlagenverzeichnis"
-#: builtin/clone.c:76 builtin/init-db.c:502
+#: builtin/clone.c:76 builtin/init-db.c:467
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
-#: builtin/clone.c:78
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
msgid "reference repository"
msgstr "Repository referenzieren"
@@ -4616,7 +4658,7 @@ msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
#: builtin/pull.c:186
msgid "depth"
msgstr "Tiefe"
@@ -4630,11 +4672,11 @@ msgstr ""
msgid "clone only one branch, HEAD or --branch"
msgstr "nur einen Branch klonen, HEAD oder --branch"
-#: builtin/clone.c:91 builtin/init-db.c:510
+#: builtin/clone.c:91 builtin/init-db.c:475
msgid "gitdir"
msgstr ".git-Verzeichnis"
-#: builtin/clone.c:92 builtin/init-db.c:511
+#: builtin/clone.c:92 builtin/init-db.c:476
msgid "separate git dir from working tree"
msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
@@ -4646,55 +4688,61 @@ msgstr "Schlüssel=Wert"
msgid "set config inside the new repository"
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
-#: builtin/clone.c:298
+#: builtin/clone.c:300
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "Referenziertes Repository '%s' wird noch nicht als verknüpftes\n"
+"Arbeitsverzeichnis unterstützt."
+
+#: builtin/clone.c:302
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
-#: builtin/clone.c:302
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
-#: builtin/clone.c:305
+#: builtin/clone.c:310
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
"eingehängt."
-#: builtin/clone.c:370 builtin/diff.c:84
+#: builtin/clone.c:375 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: builtin/clone.c:372
+#: builtin/clone.c:377
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existiert und ist kein Verzeichnis"
-#: builtin/clone.c:386
+#: builtin/clone.c:391
#, c-format
msgid "failed to stat %s\n"
msgstr "Konnte %s nicht lesen\n"
-#: builtin/clone.c:408
+#: builtin/clone.c:413
#, c-format
msgid "failed to create link '%s'"
msgstr "Konnte Verweis '%s' nicht erstellen"
-#: builtin/clone.c:412
+#: builtin/clone.c:417
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
-#: builtin/clone.c:435 builtin/clone.c:619
+#: builtin/clone.c:442 builtin/clone.c:626
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
-#: builtin/clone.c:447
+#: builtin/clone.c:454
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4704,127 +4752,123 @@ msgstr ""
"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
"und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n"
-#: builtin/clone.c:524
+#: builtin/clone.c:531
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
-#: builtin/clone.c:614
+#: builtin/clone.c:621
#, c-format
msgid "Checking connectivity... "
msgstr "Prüfe Konnektivität ... "
-#: builtin/clone.c:617
+#: builtin/clone.c:624
msgid "remote did not send all necessary objects"
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
-#: builtin/clone.c:681
+#: builtin/clone.c:688
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann "
"nicht ausgecheckt werden.\n"
-#: builtin/clone.c:712
+#: builtin/clone.c:719
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
-#: builtin/clone.c:799
+#: builtin/clone.c:808
msgid "cannot repack to clean up"
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
-#: builtin/clone.c:801
+#: builtin/clone.c:810
msgid "cannot unlink temporary alternates file"
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
-#: builtin/clone.c:831
+#: builtin/clone.c:842
msgid "Too many arguments."
msgstr "Zu viele Argumente."
-#: builtin/clone.c:835
+#: builtin/clone.c:846
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
-#: builtin/clone.c:846
+#: builtin/clone.c:857
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
-#: builtin/clone.c:849
+#: builtin/clone.c:860
msgid "--bare and --separate-git-dir are incompatible."
msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
-#: builtin/clone.c:862
+#: builtin/clone.c:873
#, c-format
msgid "repository '%s' does not exist"
msgstr "Repository '%s' existiert nicht."
-#: builtin/clone.c:868 builtin/fetch.c:1168
+#: builtin/clone.c:879 builtin/fetch.c:1166
#, c-format
msgid "depth %s is not a positive number"
msgstr "Tiefe %s ist keine positive Zahl"
-#: builtin/clone.c:878
+#: builtin/clone.c:889
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis."
-#: builtin/clone.c:888
+#: builtin/clone.c:899
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
-#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
-#: builtin/worktree.c:245
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: builtin/clone.c:906
+#: builtin/clone.c:917
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
-#: builtin/clone.c:924
+#: builtin/clone.c:935
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s' ...\n"
-#: builtin/clone.c:926
+#: builtin/clone.c:937
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klone nach '%s' ...\n"
-#: builtin/clone.c:951
-msgid "--dissociate given, but there is no --reference"
-msgstr "--dissociate ohne --reference angegeben"
-
-#: builtin/clone.c:968
+#: builtin/clone.c:975
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
"stattdessen file://"
-#: builtin/clone.c:971
+#: builtin/clone.c:978
msgid "source repository is shallow, ignoring --local"
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --"
"local"
-#: builtin/clone.c:976
+#: builtin/clone.c:983
msgid "--local is ignored"
msgstr "--local wird ignoriert"
-#: builtin/clone.c:980
+#: builtin/clone.c:987
#, c-format
msgid "Don't know how to clone %s"
msgstr "Weiß nicht wie %s zu klonen ist."
-#: builtin/clone.c:1029 builtin/clone.c:1037
+#: builtin/clone.c:1036 builtin/clone.c:1044
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
-#: builtin/clone.c:1040
+#: builtin/clone.c:1047
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
@@ -4860,15 +4904,15 @@ msgstr "Abstand zwischen Spalten"
msgid "--command must be the first argument"
msgstr "Die Option --command muss an erster Stelle stehen."
-#: builtin/commit.c:37
+#: builtin/commit.c:38
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4896,7 +4940,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:60
+#: builtin/commit.c:61
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4922,7 +4966,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
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"
@@ -4932,7 +4976,7 @@ msgstr ""
"machen. Sie können Ihr Kommando mit --allow-empty wiederholen, oder diesen\n"
"Commit mit \"git reset HEAD^\" vollständig entfernen.\n"
-#: builtin/commit.c:77
+#: builtin/commit.c:78
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4947,11 +4991,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:84
+#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
msgstr "Andernfalls benutzen Sie bitte 'git reset'\n"
-#: builtin/commit.c:87
+#: builtin/commit.c:88
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4967,67 +5011,67 @@ msgstr ""
"Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
"Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
-#: builtin/commit.c:304
+#: builtin/commit.c:305
msgid "failed to unpack HEAD tree object"
msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
-#: builtin/commit.c:345
+#: builtin/commit.c:346
msgid "unable to create temporary index"
msgstr "Konnte temporären Index nicht erstellen."
-#: builtin/commit.c:351
+#: builtin/commit.c:352
msgid "interactive add failed"
msgstr "interaktives Hinzufügen fehlgeschlagen"
-#: builtin/commit.c:364
+#: builtin/commit.c:365
msgid "unable to update temporary index"
msgstr "Konnte temporären Index nicht aktualisieren."
-#: builtin/commit.c:366
+#: builtin/commit.c:367
msgid "Failed to update main cache tree"
msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
-#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr "Konnte new_index Datei nicht schreiben"
-#: builtin/commit.c:444
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist."
-#: builtin/commit.c:446
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
"Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist."
-#: builtin/commit.c:455
+#: builtin/commit.c:456
msgid "cannot read the index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:474
+#: builtin/commit.c:475
msgid "unable to write temporary index file"
msgstr "Konnte temporäre Index-Datei nicht schreiben."
-#: builtin/commit.c:579
+#: builtin/commit.c:580
#, c-format
msgid "commit '%s' lacks author header"
msgstr "Commit '%s' fehlt Autor-Kopfbereich"
-#: builtin/commit.c:581
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
-#: builtin/commit.c:600
+#: builtin/commit.c:601
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
-#: builtin/commit.c:608
+#: builtin/commit.c:609
#, c-format
msgid "invalid date format: %s"
msgstr "Ungültiges Datumsformat: %s"
-#: builtin/commit.c:652
+#: builtin/commit.c:653
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5035,38 +5079,38 @@ msgstr ""
"Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
"der aktuellen Commit-Beschreibung verwendet wird."
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr "Konnte Commit %s nicht nachschlagen"
-#: builtin/commit.c:701 builtin/shortlog.c:273
+#: builtin/commit.c:702 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
-#: builtin/commit.c:703
+#: builtin/commit.c:704
msgid "could not read log from standard input"
msgstr "Konnte Log nicht von Standard-Eingabe lesen."
-#: builtin/commit.c:707
+#: builtin/commit.c:708
#, c-format
msgid "could not read log file '%s'"
msgstr "Konnte Log-Datei '%s' nicht lesen"
-#: builtin/commit.c:729
+#: builtin/commit.c:730
msgid "could not read MERGE_MSG"
msgstr "Konnte MERGE_MSG nicht lesen"
-#: builtin/commit.c:733
+#: builtin/commit.c:734
msgid "could not read SQUASH_MSG"
msgstr "Konnte SQUASH_MSG nicht lesen"
-#: builtin/commit.c:784
+#: builtin/commit.c:785
msgid "could not write commit template"
msgstr "Konnte Commit-Vorlage nicht schreiben"
-#: builtin/commit.c:802
+#: builtin/commit.c:803
#, c-format
msgid ""
"\n"
@@ -5081,7 +5125,7 @@ msgstr ""
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:807
+#: builtin/commit.c:808
#, c-format
msgid ""
"\n"
@@ -5096,7 +5140,7 @@ msgstr ""
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5106,7 +5150,7 @@ msgstr ""
"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/commit.c:827
+#: builtin/commit.c:828
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5119,156 +5163,157 @@ msgstr ""
"entfernen.\n"
"Eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/commit.c:847
+#: builtin/commit.c:848
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:855
+#: builtin/commit.c:856
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:862
+#: builtin/commit.c:863
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommit-Ersteller: %.*s <%.*s>"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "Cannot read index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:937
+#: builtin/commit.c:938
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
-#: builtin/commit.c:952 builtin/tag.c:495
+#: builtin/commit.c:953 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
"Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n"
-#: builtin/commit.c:1054
+#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem "
"vorhandenen Autor überein"
-#: builtin/commit.c:1069 builtin/commit.c:1309
+#: builtin/commit.c:1070 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
-#: builtin/commit.c:1106
+#: builtin/commit.c:1107
msgid "--long and -z are incompatible"
msgstr "Die Optionen --long und -z sind inkompatibel."
-#: builtin/commit.c:1136
+#: builtin/commit.c:1137
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
"Die Optionen --reset-author und --author können nicht gemeinsam verwendet "
"werden."
-#: builtin/commit.c:1145
+#: builtin/commit.c:1146
msgid "You have nothing to amend."
msgstr "Sie haben nichts für \"--amend\"."
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen."
-#: builtin/commit.c:1150
+#: builtin/commit.c:1151
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen."
-#: builtin/commit.c:1153
+#: builtin/commit.c:1154
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1164
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden."
-#: builtin/commit.c:1173
+#: builtin/commit.c:1174
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden."
-#: builtin/commit.c:1190
+#: builtin/commit.c:1191
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Es kann nur eine Option von --include/--only/--all/--interactive/--patch "
"verwendet werden."
-#: builtin/commit.c:1192
+#: builtin/commit.c:1193
msgid "No paths with --include/--only does not make sense."
msgstr ""
"Die Optionen --include und --only können nur mit der Angabe von Pfaden "
"verwendet werden."
-#: builtin/commit.c:1194
+#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
msgstr "Klug ... den letzten Commit mit einem geänderten Index nachbessern."
-#: builtin/commit.c:1196
+#: builtin/commit.c:1197
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an"
-#: builtin/commit.c:1208 builtin/tag.c:730
+#: builtin/commit.c:1209 builtin/tag.c:475
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ungültiger \"cleanup\" Modus %s"
-#: builtin/commit.c:1213
+#: builtin/commit.c:1214
msgid "Paths with -a does not make sense."
msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden."
-#: builtin/commit.c:1323 builtin/commit.c:1602
+#: builtin/commit.c:1324 builtin/commit.c:1605
msgid "show status concisely"
msgstr "Status im Kurzformat anzeigen"
-#: builtin/commit.c:1325 builtin/commit.c:1604
+#: builtin/commit.c:1326 builtin/commit.c:1607
msgid "show branch information"
msgstr "Branchinformationen anzeigen"
-#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
+#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
-#: builtin/commit.c:1330 builtin/commit.c:1608
+#: builtin/commit.c:1331 builtin/commit.c:1611
msgid "show status in long format (default)"
msgstr "Status im Langformat anzeigen (Standard)"
-#: builtin/commit.c:1333 builtin/commit.c:1611
+#: builtin/commit.c:1334 builtin/commit.c:1614
msgid "terminate entries with NUL"
msgstr "Einträge mit NUL-Zeichen abschließen"
-#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:604
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "Modus"
-#: builtin/commit.c:1336 builtin/commit.c:1614
+#: builtin/commit.c:1337 builtin/commit.c:1617
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: "
"all)"
-#: builtin/commit.c:1339
+#: builtin/commit.c:1340
msgid "show ignored files"
msgstr "ignorierte Dateien anzeigen"
-#: builtin/commit.c:1340 parse-options.h:155
+#: builtin/commit.c:1341 parse-options.h:155
msgid "when"
msgstr "wann"
-#: builtin/commit.c:1341
+#: builtin/commit.c:1342
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5276,198 +5321,203 @@ msgstr ""
"Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
"(Standard: all)"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1344
msgid "list untracked files in columns"
msgstr "unversionierte Dateien in Spalten auflisten"
-#: builtin/commit.c:1429
+#: builtin/commit.c:1430
msgid "couldn't look up newly created commit"
msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-#: builtin/commit.c:1431
+#: builtin/commit.c:1432
msgid "could not parse newly created commit"
msgstr "Konnte neulich erstellten Commit nicht analysieren."
-#: builtin/commit.c:1476
+#: builtin/commit.c:1477
msgid "detached HEAD"
msgstr "losgelöster HEAD"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1480
msgid " (root-commit)"
msgstr " (Basis-Commit)"
-#: builtin/commit.c:1572
+#: builtin/commit.c:1575
msgid "suppress summary after successful commit"
msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1576
msgid "show diff in commit message template"
msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1578
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
-#: builtin/commit.c:1576 builtin/tag.c:602
+#: builtin/commit.c:1579 builtin/tag.c:351
msgid "read message from file"
msgstr "Beschreibung von Datei lesen"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "author"
msgstr "Autor"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "override author for commit"
msgstr "Autor eines Commits überschreiben"
-#: builtin/commit.c:1578 builtin/gc.c:268
+#: builtin/commit.c:1581 builtin/gc.c:326
msgid "date"
msgstr "Datum"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1581
msgid "override date for commit"
msgstr "Datum eines Commits überschreiben"
-#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
-#: builtin/notes.c:555 builtin/tag.c:600
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
msgid "message"
msgstr "Beschreibung"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1582
msgid "commit message"
msgstr "Commit-Beschreibung"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr "Commit"
+
+#: builtin/commit.c:1583
msgid "reuse and edit message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1584
msgid "reuse message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1585
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1586
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1587
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)"
-#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "'Signed-off-by:'-Zeile hinzufügen"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1589
msgid "use specified template file"
msgstr "angegebene Vorlagendatei verwenden"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1590
msgid "force edit of commit"
msgstr "Bearbeitung des Commits erzwingen"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1591
msgid "default"
msgstr "Standard"
-#: builtin/commit.c:1588 builtin/tag.c:605
+#: builtin/commit.c:1591 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr ""
"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1592
msgid "include status in commit message template"
msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
-#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "Commit mit GPG signieren"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1597
msgid "Commit contents options"
msgstr "Optionen für Commit-Inhalt"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1598
msgid "commit all changed files"
msgstr "alle geänderten Dateien committen"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1599
msgid "add specified files to index for commit"
msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1600
msgid "interactively add files"
msgstr "interaktives Hinzufügen von Dateien"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1601
msgid "interactively add changes"
msgstr "interaktives Hinzufügen von Änderungen"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1602
msgid "commit only specified files"
msgstr "nur die angegebenen Dateien committen"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1603
msgid "bypass pre-commit hook"
msgstr "\"pre-commit hook\" umgehen"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1604
msgid "show what would be committed"
msgstr "anzeigen, was committet werden würde"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1615
msgid "amend previous commit"
msgstr "vorherigen Commit ändern"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1616
msgid "bypass post-rewrite hook"
msgstr "\"post-rewrite hook\" umgehen"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1621
msgid "ok to record an empty change"
msgstr "Aufzeichnung einer leeren Änderung erlauben"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1623
msgid "ok to record a change with an empty message"
msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
msgid "could not parse HEAD commit"
msgstr "Konnte Commit von HEAD nicht analysieren."
-#: builtin/commit.c:1695
+#: builtin/commit.c:1698
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
-#: builtin/commit.c:1702
+#: builtin/commit.c:1705
msgid "could not read MERGE_MODE"
msgstr "Konnte MERGE_MODE nicht lesen"
-#: builtin/commit.c:1721
+#: builtin/commit.c:1724
#, c-format
msgid "could not read commit message: %s"
msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
-#: builtin/commit.c:1732
+#: builtin/commit.c:1735
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n"
-#: builtin/commit.c:1737
+#: builtin/commit.c:1740
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1788
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5606,11 +5656,11 @@ msgstr "nur Variablennamen anzeigen"
msgid "respect include directives on lookup"
msgstr "beachtet \"include\"-Direktiven beim Nachschlagen"
-#: builtin/config.c:311
+#: builtin/config.c:303
msgid "unable to parse default color value"
msgstr "konnte Standard-Farbwert nicht parsen"
-#: builtin/config.c:449
+#: builtin/config.c:441
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5625,16 +5675,16 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:583
+#: builtin/config.c:575
#, c-format
msgid "cannot create configuration file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
-#: builtin/count-objects.c:55
+#: builtin/count-objects.c:77
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:65
+#: builtin/count-objects.c:87
msgid "print sizes in human readable format"
msgstr "gibt Größenangaben in menschenlesbaren Format aus"
@@ -5754,7 +5804,7 @@ msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
msgid "only consider tags matching <pattern>"
msgstr "nur Tags, die <Muster> entsprechen, betrachten"
-#: builtin/describe.c:410 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:314
msgid "show abbreviated commit object as fallback"
msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
@@ -5979,7 +6029,7 @@ msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
"! %-*s %-*s -> %s (kann \"fetch\" im aktuellen Branch nicht ausführen)"
-#: builtin/fetch.c:478 builtin/fetch.c:564
+#: builtin/fetch.c:478 builtin/fetch.c:566
msgid "[rejected]"
msgstr "[zurückgewiesen]"
@@ -6003,41 +6053,41 @@ msgstr "[neuer Branch]"
msgid "[new ref]"
msgstr "[neue Referenz]"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "unable to update local ref"
msgstr "kann lokale Referenz nicht aktualisieren"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "forced update"
msgstr "Aktualisierung erzwungen"
-#: builtin/fetch.c:566
+#: builtin/fetch.c:568
msgid "(non-fast-forward)"
msgstr "(kein Vorspulen)"
-#: builtin/fetch.c:600 builtin/fetch.c:842
+#: builtin/fetch.c:602 builtin/fetch.c:843
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kann %s nicht öffnen: %s\n"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:611
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
-#: builtin/fetch.c:627
+#: builtin/fetch.c:629
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s wurde zurückgewiesen, da Ursprungs-Commits von Repositoriesmit "
"unvollständiger Historie (shallow) nicht aktualisiert werden dürfen."
-#: builtin/fetch.c:715 builtin/fetch.c:807
+#: builtin/fetch.c:716 builtin/fetch.c:808
#, c-format
msgid "From %.*s\n"
msgstr "Von %.*s\n"
-#: builtin/fetch.c:726
+#: builtin/fetch.c:727
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6046,57 +6096,57 @@ msgstr ""
"Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n"
"'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen."
-#: builtin/fetch.c:778
+#: builtin/fetch.c:779
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s wird unreferenziert)"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s wurde unreferenziert)"
-#: builtin/fetch.c:811
+#: builtin/fetch.c:812
msgid "[deleted]"
msgstr "[gelöscht]"
-#: builtin/fetch.c:812 builtin/remote.c:1034
+#: builtin/fetch.c:813 builtin/remote.c:1040
msgid "(none)"
msgstr "(nichts)"
-#: builtin/fetch.c:832
+#: builtin/fetch.c:833
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Der \"fetch\" in den aktuellen Branch %s von einem nicht-Bare-Repository "
"wurde verweigert."
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s"
-#: builtin/fetch.c:854
+#: builtin/fetch.c:855
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Option \"%s\" wird ignoriert für %s\n"
-#: builtin/fetch.c:910
+#: builtin/fetch.c:911
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Weiß nicht wie von %s angefordert wird."
-#: builtin/fetch.c:1071
+#: builtin/fetch.c:1072
#, c-format
msgid "Fetching %s\n"
msgstr "Fordere an von %s\n"
-#: builtin/fetch.c:1073 builtin/remote.c:90
+#: builtin/fetch.c:1074 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Konnte nicht von %s anfordern"
-#: builtin/fetch.c:1091
+#: builtin/fetch.c:1092
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6105,35 +6155,35 @@ msgstr ""
"oder den Namen des Remote-Repositories an, von welchem neue\n"
"Commits angefordert werden sollen."
-#: builtin/fetch.c:1114
+#: builtin/fetch.c:1115
msgid "You need to specify a tag name."
msgstr "Sie müssen den Namen des Tags angeben."
-#: builtin/fetch.c:1156
+#: builtin/fetch.c:1157
msgid "--depth and --unshallow cannot be used together"
msgstr ""
"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1159
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"Die Option --unshallow kann nicht in einem Repository mit unvollständiger "
"Historie verwendet werden."
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1179
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all akzeptiert kein Repository als Argument"
-#: builtin/fetch.c:1183
+#: builtin/fetch.c:1181
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1192
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
-#: builtin/fetch.c:1202
+#: builtin/fetch.c:1200
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n"
@@ -6146,23 +6196,23 @@ msgstr ""
"git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file "
"<Datei>]"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:667
msgid "populate log with at most <n> entries from shortlog"
msgstr "Historie mit höchstens <n> Einträgen von \"shortlog\" hinzufügen"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:670
msgid "alias for --log (deprecated)"
msgstr "Alias für --log (veraltet)"
-#: builtin/fmt-merge-msg.c:676
+#: builtin/fmt-merge-msg.c:673
msgid "text"
msgstr "Text"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:674
msgid "use <text> as start of message"
msgstr "<Text> als Beschreibungsanfang verwenden"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:675
msgid "file to read from"
msgstr "Datei zum Einlesen"
@@ -6170,95 +6220,115 @@ msgstr "Datei zum Einlesen"
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<Optionen>] [<Muster>]"
-#: builtin/for-each-ref.c:24
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <Objekt>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<Objekt>]]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr "git for-each-ref [--contains [<Objekt>]]"
+
+#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr "Platzhalter als Shell-String formatieren"
-#: builtin/for-each-ref.c:26
+#: builtin/for-each-ref.c:29
msgid "quote placeholders suitably for perl"
msgstr "Platzhalter als Perl-String formatieren"
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for python"
msgstr "Platzhalter als Python-String formatieren"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for Tcl"
msgstr "Platzhalter als Tcl-String formatieren"
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:36
msgid "show only <n> matched refs"
msgstr "nur <n> passende Referenzen anzeigen"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
msgid "format to use for the output"
msgstr "für die Ausgabe zu verwendendes Format"
-#: builtin/for-each-ref.c:35
-msgid "key"
-msgstr "Schüssel"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
+msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben"
-#: builtin/for-each-ref.c:36
-msgid "field name to sort on"
-msgstr "sortiere nach diesem Feld"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr "nur zusammengeführte Referenzen ausgeben"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr "nur nicht zusammengeführte Referenzen ausgeben"
-#: builtin/fsck.c:163 builtin/prune.c:137
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
+
+#: builtin/fsck.c:156 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "Prüfe Konnektivität"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:486
msgid "Checking object directories"
msgstr "Prüfe Objekt-Verzeichnisse"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:553
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<Optionen>] [<Objekt>...]"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:559
msgid "show unreachable objects"
msgstr "unerreichbare Objekte anzeigen"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:560
msgid "show dangling objects"
msgstr "unreferenzierte Objekte anzeigen"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:561
msgid "report tags"
msgstr "Tags melden"
-#: builtin/fsck.c:640
+#: builtin/fsck.c:562
msgid "report root nodes"
msgstr "Hauptwurzeln melden"
-#: builtin/fsck.c:641
+#: builtin/fsck.c:563
msgid "make index objects head nodes"
msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
-#: builtin/fsck.c:642
+#: builtin/fsck.c:564
msgid "make reflogs head nodes (default)"
msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
-#: builtin/fsck.c:643
+#: builtin/fsck.c:565
msgid "also consider packs and alternate objects"
msgstr "ebenso Pakete und alternative Objekte betrachten"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:566
msgid "check only connectivity"
msgstr "nur Konnektivität prüfen"
-#: builtin/fsck.c:645
+#: builtin/fsck.c:567
msgid "enable more strict checking"
msgstr "genauere Prüfung aktivieren"
-#: builtin/fsck.c:647
+#: builtin/fsck.c:569
msgid "write dangling objects in .git/lost-found"
msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
-#: builtin/fsck.c:648 builtin/prune.c:107
+#: builtin/fsck.c:570 builtin/prune.c:107
msgid "show progress"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:631
msgid "Checking objects"
msgstr "Prüfe Objekte"
@@ -6266,54 +6336,70 @@ msgstr "Prüfe Objekte"
msgid "git gc [<options>]"
msgstr "git gc [<Optionen>]"
-#: builtin/gc.c:55
+#: builtin/gc.c:72
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Ungültiger %s: '%s'"
-#: builtin/gc.c:100
+#: builtin/gc.c:139
#, c-format
msgid "insanely long object directory %.*s"
msgstr "zu langes Objekt-Verzeichnis %.*s"
-#: builtin/gc.c:269
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"Die letzte Ausführung von \"gc run\" enthielt die folgenden Meldungen.\n"
+"Bitte beheben Sie das Hauptproblem und löschen Sie %s.\n"
+"Ein automatischer Cleanup wird nicht ausgeführt, bis diese Datei entfernt\n"
+"wurde.\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:327
msgid "prune unreferenced objects"
msgstr "unreferenzierte Objekte entfernen"
-#: builtin/gc.c:271
+#: builtin/gc.c:329
msgid "be more thorough (increased runtime)"
msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
-#: builtin/gc.c:272
+#: builtin/gc.c:330
msgid "enable auto-gc mode"
msgstr "\"auto-gc\" Modus aktivieren"
-#: builtin/gc.c:273
+#: builtin/gc.c:331
msgid "force running gc even if there may be another gc running"
msgstr ""
"Ausführung von \"git gc\" erwzingen, selbst wenn ein anderes\n"
"\"git gc\" bereits ausgeführt wird"
-#: builtin/gc.c:315
+#: builtin/gc.c:373
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Die Datenbank des Repositories wird für eine optimale Performance im\n"
"Hintergrund komprimiert.\n"
-#: builtin/gc.c:317
+#: builtin/gc.c:375
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
"Die Datenbank des Projektarchivs wird für eine optimale Performance "
"komprimiert.\n"
-#: builtin/gc.c:318
+#: builtin/gc.c:376
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n"
-#: builtin/gc.c:336
+#: builtin/gc.c:397
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -6321,7 +6407,7 @@ msgstr ""
"\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
"(benutzen Sie --force falls nicht)"
-#: builtin/gc.c:364
+#: builtin/gc.c:441
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -6357,211 +6443,207 @@ msgstr "Schalter '%c' erwartet einen numerischen Wert"
msgid "cannot open '%s'"
msgstr "kann '%s' nicht öffnen"
-#: builtin/grep.c:638
+#: builtin/grep.c:633
msgid "search in index instead of in the work tree"
msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
-#: builtin/grep.c:640
+#: builtin/grep.c:635
msgid "find in contents not managed by git"
msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
-#: builtin/grep.c:642
+#: builtin/grep.c:637
msgid "search in both tracked and untracked files"
msgstr "in versionierten und unversionierten Dateien suchen"
-#: builtin/grep.c:644
+#: builtin/grep.c:639
msgid "ignore files specified via '.gitignore'"
msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
-#: builtin/grep.c:647
+#: builtin/grep.c:642
msgid "show non-matching lines"
msgstr "Zeilen ohne Ãœbereinstimmungen anzeigen"
-#: builtin/grep.c:649
+#: builtin/grep.c:644
msgid "case insensitive matching"
msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
-#: builtin/grep.c:651
+#: builtin/grep.c:646
msgid "match patterns only at word boundaries"
msgstr "nur ganze Wörter suchen"
-#: builtin/grep.c:653
+#: builtin/grep.c:648
msgid "process binary files as text"
msgstr "binäre Dateien als Text verarbeiten"
-#: builtin/grep.c:655
+#: builtin/grep.c:650
msgid "don't match patterns in binary files"
msgstr "keine Muster in Binärdateien finden"
-#: builtin/grep.c:658
+#: builtin/grep.c:653
msgid "process binary files with textconv filters"
msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
-#: builtin/grep.c:660
+#: builtin/grep.c:655
msgid "descend at most <depth> levels"
msgstr "höchstens <Tiefe> Ebenen durchlaufen"
-#: builtin/grep.c:664
+#: builtin/grep.c:659
msgid "use extended POSIX regular expressions"
msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
-#: builtin/grep.c:667
+#: builtin/grep.c:662
msgid "use basic POSIX regular expressions (default)"
msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
-#: builtin/grep.c:670
+#: builtin/grep.c:665
msgid "interpret patterns as fixed strings"
msgstr "Muster als feste Zeichenketten interpretieren"
-#: builtin/grep.c:673
+#: builtin/grep.c:668
msgid "use Perl-compatible regular expressions"
msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
-#: builtin/grep.c:676
+#: builtin/grep.c:671
msgid "show line numbers"
msgstr "Zeilennummern anzeigen"
-#: builtin/grep.c:677
+#: builtin/grep.c:672
msgid "don't show filenames"
msgstr "keine Dateinamen anzeigen"
-#: builtin/grep.c:678
+#: builtin/grep.c:673
msgid "show filenames"
msgstr "Dateinamen anzeigen"
-#: builtin/grep.c:680
+#: builtin/grep.c:675
msgid "show filenames relative to top directory"
msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
-#: builtin/grep.c:682
+#: builtin/grep.c:677
msgid "show only filenames instead of matching lines"
msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
-#: builtin/grep.c:684
+#: builtin/grep.c:679
msgid "synonym for --files-with-matches"
msgstr "Synonym für --files-with-matches"
-#: builtin/grep.c:687
+#: builtin/grep.c:682
msgid "show only the names of files without match"
msgstr "nur die Dateinamen ohne Ãœbereinstimmungen anzeigen"
-#: builtin/grep.c:689
+#: builtin/grep.c:684
msgid "print NUL after filenames"
msgstr "NUL-Zeichen nach Dateinamen ausgeben"
-#: builtin/grep.c:691
+#: builtin/grep.c:686
msgid "show the number of matches instead of matching lines"
msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
-#: builtin/grep.c:692
+#: builtin/grep.c:687
msgid "highlight matches"
msgstr "Ãœbereinstimmungen hervorheben"
-#: builtin/grep.c:694
+#: builtin/grep.c:689
msgid "print empty line between matches from different files"
msgstr ""
"eine Leerzeile zwischen Ãœbereinstimmungen in verschiedenen Dateien ausgeben"
-#: builtin/grep.c:696
+#: builtin/grep.c:691
msgid "show filename only once above matches from same file"
msgstr ""
"den Dateinamen nur einmal oberhalb der Ãœbereinstimmungen aus dieser Datei "
"anzeigen"
-#: builtin/grep.c:699
+#: builtin/grep.c:694
msgid "show <n> context lines before and after matches"
msgstr "<n> Zeilen vor und nach den Ãœbereinstimmungen anzeigen"
-#: builtin/grep.c:702
+#: builtin/grep.c:697
msgid "show <n> context lines before matches"
msgstr "<n> Zeilen vor den Ãœbereinstimmungen anzeigen"
-#: builtin/grep.c:704
+#: builtin/grep.c:699
msgid "show <n> context lines after matches"
msgstr "<n> Zeilen nach den Ãœbereinstimmungen anzeigen"
-#: builtin/grep.c:705
+#: builtin/grep.c:700
msgid "shortcut for -C NUM"
msgstr "Kurzform für -C NUM"
-#: builtin/grep.c:708
+#: builtin/grep.c:703
msgid "show a line with the function name before matches"
msgstr "eine Zeile mit dem Funktionsnamen vor Ãœbereinstimmungen anzeigen"
-#: builtin/grep.c:710
+#: builtin/grep.c:705
msgid "show the surrounding function"
msgstr "die umgebende Funktion anzeigen"
-#: builtin/grep.c:713
+#: builtin/grep.c:708
msgid "read patterns from file"
msgstr "Muster von einer Datei lesen"
-#: builtin/grep.c:715
+#: builtin/grep.c:710
msgid "match <pattern>"
msgstr "<Muster> finden"
-#: builtin/grep.c:717
+#: builtin/grep.c:712
msgid "combine patterns specified with -e"
msgstr "Muster kombinieren, die mit -e angegeben wurden"
-#: builtin/grep.c:729
+#: builtin/grep.c:724
msgid "indicate hit with exit status without output"
msgstr "Ãœbereinstimmungen nur durch Beendigungsstatus anzeigen"
-#: builtin/grep.c:731
+#: builtin/grep.c:726
msgid "show only matches from files that match all patterns"
msgstr ""
"nur Ãœbereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
-#: builtin/grep.c:733
+#: builtin/grep.c:728
msgid "show parse tree for grep expression"
msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "pager"
msgstr "Anzeigeprogramm"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "show matching files in the pager"
msgstr "Dateien mit Ãœbereinstimmungen im Anzeigeprogramm anzeigen"
-#: builtin/grep.c:740
+#: builtin/grep.c:735
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
-#: builtin/grep.c:741 builtin/show-ref.c:189
-msgid "show usage"
-msgstr "Verwendung anzeigen"
-
-#: builtin/grep.c:808
+#: builtin/grep.c:793
msgid "no pattern given."
msgstr "keine Muster angegeben"
-#: builtin/grep.c:866
+#: builtin/grep.c:851
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"Die Option --open-files-in-pager kann nur innerhalb des "
"Arbeitsverzeichnisses verwendet werden."
-#: builtin/grep.c:892
+#: builtin/grep.c:877
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
"Die Optionen --cached und --untracked können nicht mit --no-index verwendet "
"werden."
-#: builtin/grep.c:897
+#: builtin/grep.c:882
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
"Die Optionen --no-index und --untracked können nicht mit Commits verwendet "
"werden."
-#: builtin/grep.c:900
+#: builtin/grep.c:885
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"Die Option --[no-]exclude-standard kann nicht mit versionierten Inhalten "
"verwendet werden."
-#: builtin/grep.c:908
+#: builtin/grep.c:893
msgid "both --cached and trees are given."
msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden."
@@ -6574,10 +6656,10 @@ msgstr ""
"[--] <Datei>..."
#: builtin/hash-object.c:81
-msgid "git hash-object --stdin-paths < <list-of-paths>"
-msgstr "git hash-object --stdin-paths < <Liste-von-Pfaden>"
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:92 builtin/tag.c:614
+#: builtin/hash-object.c:92
msgid "type"
msgstr "Art"
@@ -6650,12 +6732,12 @@ msgstr "Konnte Version des emacsclient nicht parsen."
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
msgid "failed to exec '%s': %s"
msgstr "Fehler beim Ausführen von '%s': %s"
-#: builtin/help.c:215
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -6664,7 +6746,7 @@ msgstr ""
"'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
-#: builtin/help.c:227
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -6673,61 +6755,61 @@ msgstr ""
"'%s': Kommando für unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
-#: builtin/help.c:354
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': unbekannter Handbuch-Betrachter."
-#: builtin/help.c:371
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:379
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:428
+#: builtin/help.c:411
msgid "Defining attributes per path"
msgstr "Definition von Attributen pro Pfad"
-#: builtin/help.c:429
+#: builtin/help.c:412
msgid "Everyday Git With 20 Commands Or So"
msgstr "Tägliche Benutzung von Git mit ungefähr 20 Kommandos"
-#: builtin/help.c:430
+#: builtin/help.c:413
msgid "A Git glossary"
msgstr "Ein Git-Glossar"
-#: builtin/help.c:431
+#: builtin/help.c:414
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
-#: builtin/help.c:432
+#: builtin/help.c:415
msgid "Defining submodule properties"
msgstr "Definition von Submodul-Eigenschaften"
-#: builtin/help.c:433
+#: builtin/help.c:416
msgid "Specifying revisions and ranges for Git"
msgstr "Spezifikation von Commits und Bereichen für Git"
-#: builtin/help.c:434
+#: builtin/help.c:417
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Eine einführende Anleitung zu Git (für Version 1.5.1 oder neuer)"
-#: builtin/help.c:435
+#: builtin/help.c:418
msgid "An overview of recommended workflows with Git"
msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
-#: builtin/help.c:447
+#: builtin/help.c:430
msgid "The common Git guides are:\n"
msgstr "Die allgemein verwendeten Git-Anleitungen sind:\n"
-#: builtin/help.c:468 builtin/help.c:485
+#: builtin/help.c:451 builtin/help.c:468
#, c-format
msgid "usage: %s%s"
msgstr "Verwendung: %s%s"
-#: builtin/help.c:501
+#: builtin/help.c:484
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "für `git %s' wurde der Alias `%s' angelegt"
@@ -7021,87 +7103,62 @@ msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
msgid "--verify with no packfile name given"
msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
-#: builtin/init-db.c:36
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
-
-#: builtin/init-db.c:63
-#, c-format
-msgid "insanely long template name %s"
-msgstr "zu langer Vorlagen-Name %s"
-
-#: builtin/init-db.c:68
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "Kann '%s' nicht lesen"
-#: builtin/init-db.c:74
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "kann Vorlage '%s' nicht lesen"
-#: builtin/init-db.c:81
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "kann Verzeichnis '%s' nicht öffnen"
-#: builtin/init-db.c:98
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr "kann Verweis '%s' nicht lesen"
-#: builtin/init-db.c:100
-#, c-format
-msgid "insanely long symlink %s"
-msgstr "zu lange symbolische Verknüpfung %s"
-
-#: builtin/init-db.c:103
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen"
-#: builtin/init-db.c:107
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "kann '%s' nicht nach '%s' kopieren"
-#: builtin/init-db.c:111
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr "ignoriere Vorlage %s"
-#: builtin/init-db.c:137
-#, c-format
-msgid "insanely long template path %s"
-msgstr "zu langer Vorlagen-Pfad %s"
-
-#: builtin/init-db.c:145
+#: builtin/init-db.c:118
#, c-format
msgid "templates not found %s"
msgstr "keine Vorlagen in '%s' gefunden"
-#: builtin/init-db.c:158
+#: builtin/init-db.c:131
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr "kopiere keine Vorlagen mit einer falschen Formatversion %d von '%s'"
-#: builtin/init-db.c:212
-#, c-format
-msgid "insane git directory %s"
-msgstr "ungültiges Git-Verzeichnis %s"
-
-#: builtin/init-db.c:344 builtin/init-db.c:347
+#: builtin/init-db.c:309 builtin/init-db.c:312
#, c-format
msgid "%s already exists"
msgstr "%s existiert bereits"
-#: builtin/init-db.c:375
+#: builtin/init-db.c:340
#, c-format
msgid "unable to handle file type %d"
msgstr "kann nicht mit Dateityp %d umgehen"
-#: builtin/init-db.c:378
+#: builtin/init-db.c:343
#, c-format
msgid "unable to move %s to %s"
msgstr "Konnte %s nicht nach %s verschieben"
@@ -7109,24 +7166,24 @@ msgstr "Konnte %s nicht nach %s verschieben"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:434
+#: builtin/init-db.c:399
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s Git-Repository in %s%s\n"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Reinitialized existing"
msgstr "Reinitialisierte existierendes"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Initialized empty"
msgstr "Initialisierte leeres"
-#: builtin/init-db.c:436
+#: builtin/init-db.c:401
msgid " shared"
msgstr " gemeinsames"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:448
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7134,25 +7191,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--"
"shared[=<Berechtigungen>]] [<Verzeichnis>]"
-#: builtin/init-db.c:506
+#: builtin/init-db.c:471
msgid "permissions"
msgstr "Berechtigungen"
-#: builtin/init-db.c:507
+#: builtin/init-db.c:472
msgid "specify that the git repository is to be shared amongst several users"
msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird"
-#: builtin/init-db.c:541 builtin/init-db.c:546
+#: builtin/init-db.c:506 builtin/init-db.c:511
#, c-format
msgid "cannot mkdir %s"
msgstr "kann Verzeichnis %s nicht erstellen"
-#: builtin/init-db.c:550
+#: builtin/init-db.c:515
#, c-format
msgid "cannot chdir to %s"
msgstr "kann nicht in Verzeichnis %s wechseln"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:536
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7161,7 +7218,7 @@ msgstr ""
"%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
"(oder --git-dir=<Verzeichnis>)"
-#: builtin/init-db.c:599
+#: builtin/init-db.c:564
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
@@ -7247,33 +7304,33 @@ msgstr "format.headers ohne Wert"
msgid "name of output directory is too long"
msgstr "Name des Ausgabeverzeichnisses ist zu lang."
-#: builtin/log.c:814
+#: builtin/log.c:813
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kann Patch-Datei %s nicht öffnen"
-#: builtin/log.c:828
+#: builtin/log.c:827
msgid "Need exactly one range."
msgstr "Brauche genau einen Commit-Bereich."
-#: builtin/log.c:838
+#: builtin/log.c:837
msgid "Not a range."
msgstr "Kein Commit-Bereich."
-#: builtin/log.c:944
+#: builtin/log.c:943
msgid "Cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
-#: builtin/log.c:1023
+#: builtin/log.c:1022
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
-#: builtin/log.c:1051
+#: builtin/log.c:1050
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
-#: builtin/log.c:1096
+#: builtin/log.c:1095
msgid "Two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
@@ -7330,131 +7387,135 @@ msgid "don't output binary diffs"
msgstr "keine binären Unterschiede ausgeben"
#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
+
+#: builtin/log.c:1243
msgid "don't include a patch matching a commit upstream"
msgstr ""
"keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen"
-#: builtin/log.c:1243
+#: builtin/log.c:1245
msgid "show patch format instead of default (patch + stat)"
msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
-#: builtin/log.c:1245
+#: builtin/log.c:1247
msgid "Messaging"
msgstr "E-Mail-Einstellungen"
-#: builtin/log.c:1246
+#: builtin/log.c:1248
msgid "header"
msgstr "Header"
-#: builtin/log.c:1247
+#: builtin/log.c:1249
msgid "add email header"
msgstr "E-Mail-Header hinzufügen"
-#: builtin/log.c:1248 builtin/log.c:1250
+#: builtin/log.c:1250 builtin/log.c:1252
msgid "email"
msgstr "E-Mail"
-#: builtin/log.c:1248
+#: builtin/log.c:1250
msgid "add To: header"
msgstr "\"To:\"-Header hinzufügen"
-#: builtin/log.c:1250
+#: builtin/log.c:1252
msgid "add Cc: header"
msgstr "\"Cc:\"-Header hinzufügen"
-#: builtin/log.c:1252
+#: builtin/log.c:1254
msgid "ident"
msgstr "Ident"
-#: builtin/log.c:1253
+#: builtin/log.c:1255
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn "
"fehlend)"
-#: builtin/log.c:1255
+#: builtin/log.c:1257
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1256
+#: builtin/log.c:1258
msgid "make first mail a reply to <message-id>"
msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
-#: builtin/log.c:1257 builtin/log.c:1260
+#: builtin/log.c:1259 builtin/log.c:1262
msgid "boundary"
msgstr "Grenze"
-#: builtin/log.c:1258
+#: builtin/log.c:1260
msgid "attach the patch"
msgstr "den Patch anhängen"
-#: builtin/log.c:1261
+#: builtin/log.c:1263
msgid "inline the patch"
msgstr "den Patch direkt in die Nachricht einfügen"
-#: builtin/log.c:1265
+#: builtin/log.c:1267
msgid "enable message threading, styles: shallow, deep"
msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
-#: builtin/log.c:1267
+#: builtin/log.c:1269
msgid "signature"
msgstr "Signatur"
-#: builtin/log.c:1268
+#: builtin/log.c:1270
msgid "add a signature"
msgstr "eine Signatur hinzufügen"
-#: builtin/log.c:1270
+#: builtin/log.c:1272
msgid "add a signature from a file"
msgstr "eine Signatur aus einer Datei hinzufügen"
-#: builtin/log.c:1271
+#: builtin/log.c:1273
msgid "don't print the patch filenames"
msgstr "keine Dateinamen der Patches anzeigen"
-#: builtin/log.c:1360
+#: builtin/log.c:1362
msgid "-n and -k are mutually exclusive."
msgstr "Die Optionen -n und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1362
+#: builtin/log.c:1364
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "Die Optionen --subject-prefix und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1370
+#: builtin/log.c:1372
msgid "--name-only does not make sense"
msgstr "Die Option --name-only kann nicht verwendet werden."
-#: builtin/log.c:1372
+#: builtin/log.c:1374
msgid "--name-status does not make sense"
msgstr "Die Option --name-status kann nicht verwendet werden."
-#: builtin/log.c:1374
+#: builtin/log.c:1376
msgid "--check does not make sense"
msgstr "Die Option --check kann nicht verwendet werden."
-#: builtin/log.c:1397
+#: builtin/log.c:1401
msgid "standard output, or directory, which one?"
msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
-#: builtin/log.c:1399
+#: builtin/log.c:1403
#, c-format
msgid "Could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/log.c:1496
+#: builtin/log.c:1500
#, c-format
msgid "unable to read signature file '%s'"
msgstr "Konnte Signatur-Datei '%s' nicht lesen"
-#: builtin/log.c:1559
+#: builtin/log.c:1563
msgid "Failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
-#: builtin/log.c:1607
+#: builtin/log.c:1611
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
-#: builtin/log.c:1661
+#: builtin/log.c:1665
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7462,7 +7523,7 @@ msgstr ""
"Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
"manuell an.\n"
-#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
+#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr "Unbekannter Commit %s"
@@ -7568,35 +7629,35 @@ msgstr "Ausgaben zur Fehlersuche anzeigen"
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<Optionen>] <Commit-Referenz> [<Pfad>...]"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "nur Verzeichnisse anzeigen"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "Rekursion in Unterverzeichnissen durchführen"
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "Verzeichnisse bei Rekursion anzeigen"
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "Einträge mit NUL-Byte abschließen"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "Objektgröße einschließen"
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "nur Dateinamen auflisten"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "vollständige Pfadnamen verwenden"
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"das gesamte Verzeichnis auflisten; nicht nur das aktuelle Verzeichnis "
@@ -7837,16 +7898,16 @@ msgstr ""
msgid "No remote-tracking branch for %s from %s"
msgstr "Kein Remote-Tracking-Branch für %s von %s"
-#: builtin/merge.c:1081
+#: builtin/merge.c:1079
#, c-format
msgid "could not close '%s'"
msgstr "Konnte '%s' nicht schließen"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1206
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Es gibt keinen Merge zum Abbrechen (MERGE_HEAD fehlt)"
-#: builtin/merge.c:1224
+#: builtin/merge.c:1222
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7854,7 +7915,7 @@ msgstr ""
"Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-#: builtin/merge.c:1231
+#: builtin/merge.c:1229
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7862,56 +7923,56 @@ msgstr ""
"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-#: builtin/merge.c:1234
+#: builtin/merge.c:1232
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)."
-#: builtin/merge.c:1243
+#: builtin/merge.c:1241
msgid "You cannot combine --squash with --no-ff."
msgstr "Sie können --squash nicht mit --no-ff kombinieren."
-#: builtin/merge.c:1251
+#: builtin/merge.c:1249
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
-#: builtin/merge.c:1268
+#: builtin/merge.c:1266
msgid "Squash commit into empty head not supported yet"
msgstr ""
"Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen."
-#: builtin/merge.c:1270
+#: builtin/merge.c:1268
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet "
"werden."
-#: builtin/merge.c:1276
+#: builtin/merge.c:1274
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nichts was wir zusammenführen können"
-#: builtin/merge.c:1278
+#: builtin/merge.c:1276
msgid "Can merge only exactly one commit into empty head"
msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen."
-#: builtin/merge.c:1333
+#: builtin/merge.c:1331
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s."
-#: builtin/merge.c:1336
+#: builtin/merge.c:1334
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s hat keine GPG-Signatur."
-#: builtin/merge.c:1342
+#: builtin/merge.c:1340
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n"
@@ -7921,46 +7982,46 @@ msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n"
msgid "Updating %s..%s\n"
msgstr "Aktualisiere %s..%s\n"
-#: builtin/merge.c:1462
+#: builtin/merge.c:1460
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
-#: builtin/merge.c:1469
+#: builtin/merge.c:1467
#, c-format
msgid "Nope.\n"
msgstr "Nein.\n"
-#: builtin/merge.c:1501
+#: builtin/merge.c:1499
msgid "Not possible to fast-forward, aborting."
msgstr "Vorspulen nicht möglich, breche ab."
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
-#: builtin/merge.c:1528
+#: builtin/merge.c:1526
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Probiere Merge-Strategie %s ...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1592
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
-#: builtin/merge.c:1596
+#: builtin/merge.c:1594
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1603
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n"
-#: builtin/merge.c:1617
+#: builtin/merge.c:1615
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8152,48 +8213,48 @@ msgstr "%s, Quelle=%s, Ziel=%s"
msgid "Renaming %s to %s\n"
msgstr "Benenne %s nach %s um\n"
-#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
-#: builtin/name-rev.c:255
+#: builtin/name-rev.c:251
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<Optionen>] <Commit>..."
-#: builtin/name-rev.c:256
+#: builtin/name-rev.c:252
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<Optionen>] --all"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:253
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<Optionen>] --stdin"
-#: builtin/name-rev.c:309
+#: builtin/name-rev.c:305
msgid "print only names (no SHA-1)"
msgstr "nur Namen anzeigen (keine SHA-1)"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:306
msgid "only use tags to name the commits"
msgstr "nur Tags verwenden, um die Commits zu benennen"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:308
msgid "only use refs matching <pattern>"
msgstr "nur Referenzen verwenden die <Muster> entsprechen"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:310
msgid "list all commits reachable from all refs"
msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:311
msgid "read from stdin"
msgstr "von der Standard-Eingabe lesen"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:312
msgid "allow to print `undefined` names (default)"
msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
-#: builtin/name-rev.c:322
+#: builtin/name-rev.c:318
msgid "dereference tags in the input (internal use)"
msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
@@ -8323,7 +8384,7 @@ msgstr "Konnte Ausgabe von 'show' nicht lesen."
msgid "failed to finish 'show' for object '%s'"
msgstr "konnte 'show' für Objekt '%s' nicht abschließen"
-#: builtin/notes.c:174 builtin/tag.c:477
+#: builtin/notes.c:174 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "konnte Datei '%s' nicht erstellen"
@@ -8342,12 +8403,12 @@ msgstr "Konnte Notiz-Objekt nicht schreiben"
msgid "The note contents have been left in %s"
msgstr "Die Notiz-Inhalte wurden in %s belassen"
-#: builtin/notes.c:232 builtin/tag.c:695
+#: builtin/notes.c:232 builtin/tag.c:440
#, c-format
msgid "cannot read '%s'"
msgstr "kann '%s' nicht lesen"
-#: builtin/notes.c:234 builtin/tag.c:698
+#: builtin/notes.c:234 builtin/tag.c:443
#, c-format
msgid "could not open or read '%s'"
msgstr "konnte '%s' nicht öffnen oder lesen"
@@ -8355,7 +8416,7 @@ msgstr "konnte '%s' nicht öffnen oder lesen"
#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
-#: builtin/notes.c:877 builtin/tag.c:711
+#: builtin/notes.c:877 builtin/tag.c:456
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
@@ -8389,11 +8450,6 @@ msgstr "Notizinhalte als Zeichenkette"
msgid "note contents in a file"
msgstr "Notizinhalte in einer Datei"
-#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
-#: builtin/notes.c:564 builtin/tag.c:630
-msgid "object"
-msgstr "Objekt"
-
#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes"
@@ -8526,7 +8582,7 @@ msgstr "Notiz-Referenz"
msgid "use notes from <notes-ref>"
msgstr "Notizen von <Notiz-Referenz> verwenden"
-#: builtin/notes.c:1012 builtin/remote.c:1588
+#: builtin/notes.c:1012 builtin/remote.c:1647
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Unbekanntes Unterkommando: %s"
@@ -8747,20 +8803,24 @@ msgstr "Lösche doppelte Objekte"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <Zeit>] [--] [<head>...]"
-#: builtin/prune.c:105 builtin/worktree.c:121
+#: builtin/prune.c:105 builtin/worktree.c:124
msgid "do not remove, show only"
msgstr "nicht löschen, nur anzeigen"
-#: builtin/prune.c:106 builtin/worktree.c:122
+#: builtin/prune.c:106 builtin/worktree.c:125
msgid "report pruned objects"
msgstr "gelöschte Objekte melden"
-#: builtin/prune.c:109 builtin/worktree.c:124
+#: builtin/prune.c:109 builtin/worktree.c:127
msgid "expire objects older than <time>"
msgstr "Objekte älter als <Zeit> verfallen lassen"
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
+
#: builtin/pull.c:69
-msgid "git pull [options] [<repository> [<refspec>...]]"
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
#: builtin/pull.c:113
@@ -8925,19 +8985,19 @@ msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
msgid "Cannot rebase onto multiple branches."
msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
-#: builtin/push.c:15
+#: builtin/push.c:16
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/push.c:86
+#: builtin/push.c:88
msgid "tag shorthand without <tag>"
msgstr "Kurzschrift für Tag ohne <Tag>"
-#: builtin/push.c:96
+#: builtin/push.c:98
msgid "--delete only accepts plain target ref names"
msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel."
-#: builtin/push.c:140
+#: builtin/push.c:142
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -8946,7 +9006,7 @@ msgstr ""
"Um eine Variante permanent zu verwenden, siehe push.default in 'git help "
"config'."
-#: builtin/push.c:143
+#: builtin/push.c:145
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -8972,7 +9032,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:158
+#: builtin/push.c:160
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -8987,7 +9047,7 @@ msgstr ""
"\n"
" git push %s HEAD:<Name-des-Remote-Branches>\n"
-#: builtin/push.c:172
+#: builtin/push.c:174
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -9001,13 +9061,13 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:180
+#: builtin/push.c:182
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert."
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -9018,7 +9078,7 @@ msgstr ""
"Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n"
"Remote-Branch zu aktualisieren."
-#: builtin/push.c:206
+#: builtin/push.c:208
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -9069,14 +9129,14 @@ msgstr ""
"von\n"
"Git benutzen.)"
-#: builtin/push.c:273
+#: builtin/push.c:275
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Sie haben keine Refspec für \"push\" angegeben, und push.default ist "
"\"nothing\"."
-#: builtin/push.c:280
+#: builtin/push.c:282
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -9090,7 +9150,7 @@ msgstr ""
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:286
+#: builtin/push.c:288
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -9104,7 +9164,7 @@ msgstr ""
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:292
+#: builtin/push.c:294
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -9123,13 +9183,13 @@ msgstr ""
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:299
+#: builtin/push.c:301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Aktualisierungen wurden zurückgewiesen, weil das Tag bereits\n"
"im Remote-Repository existiert."
-#: builtin/push.c:302
+#: builtin/push.c:304
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -9139,22 +9199,22 @@ msgstr ""
"das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n"
"die Option '--force' zu verwenden.\n"
-#: builtin/push.c:361
+#: builtin/push.c:363
#, c-format
msgid "Pushing to %s\n"
msgstr "Versende nach %s\n"
-#: builtin/push.c:365
+#: builtin/push.c:367
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
-#: builtin/push.c:395
+#: builtin/push.c:397
#, c-format
msgid "bad repository '%s'"
msgstr "ungültiges Repository '%s'"
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9176,100 +9236,104 @@ msgstr ""
"\n"
" git push <Name>\n"
-#: builtin/push.c:411
+#: builtin/push.c:413
msgid "--all and --tags are incompatible"
msgstr "Die Optionen --all und --tags sind inkompatibel."
-#: builtin/push.c:412
+#: builtin/push.c:414
msgid "--all can't be combined with refspecs"
msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden."
-#: builtin/push.c:417
+#: builtin/push.c:419
msgid "--mirror and --tags are incompatible"
msgstr "Die Optionen --mirror und --tags sind inkompatibel."
-#: builtin/push.c:418
+#: builtin/push.c:420
msgid "--mirror can't be combined with refspecs"
msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden."
-#: builtin/push.c:423
+#: builtin/push.c:425
msgid "--all and --mirror are incompatible"
msgstr "Die Optionen --all und --mirror sind inkompatibel."
-#: builtin/push.c:539
+#: builtin/push.c:537
msgid "repository"
msgstr "Repository"
-#: builtin/push.c:540 builtin/send-pack.c:161
+#: builtin/push.c:538 builtin/send-pack.c:161
msgid "push all refs"
msgstr "alle Referenzen versenden"
-#: builtin/push.c:541 builtin/send-pack.c:163
+#: builtin/push.c:539 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "alle Referenzen spiegeln"
-#: builtin/push.c:543
+#: builtin/push.c:541
msgid "delete refs"
msgstr "Referenzen löschen"
-#: builtin/push.c:544
+#: builtin/push.c:542
msgid "push tags (can't be used with --all or --mirror)"
msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)"
-#: builtin/push.c:547 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:164
msgid "force updates"
msgstr "Aktualisierung erzwingen"
-#: builtin/push.c:549 builtin/send-pack.c:175
+#: builtin/push.c:547 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "Referenzname>:<Erwartungswert"
-#: builtin/push.c:550 builtin/send-pack.c:176
+#: builtin/push.c:548 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
-#: builtin/push.c:553
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr "check|on-demand|no"
+
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr "rekursiven \"push\" von Submodulen steuern"
-#: builtin/push.c:555 builtin/send-pack.c:169
+#: builtin/push.c:553 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "kleinere Pakete verwenden"
-#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
+#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "'receive pack' Programm"
-#: builtin/push.c:558
+#: builtin/push.c:556
msgid "set upstream for git pull/status"
msgstr "Upstream für \"git pull/status\" setzen"
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "prune locally removed refs"
msgstr "lokal gelöschte Referenzen entfernen"
-#: builtin/push.c:563
+#: builtin/push.c:561
msgid "bypass pre-push hook"
msgstr "\"pre-push hook\" umgehen"
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "push missing but relevant tags"
msgstr "fehlende, aber relevante Tags versenden"
-#: builtin/push.c:567 builtin/send-pack.c:166
+#: builtin/push.c:565 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "signiert \"push\" mit GPG"
-#: builtin/push.c:569 builtin/send-pack.c:170
+#: builtin/push.c:567 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "Referenzen atomar versenden"
-#: builtin/push.c:579
+#: builtin/push.c:577
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags."
-#: builtin/push.c:581
+#: builtin/push.c:579
msgid "--delete doesn't make sense without any refs"
msgstr "Die Option --delete kann nur mit Referenzen verwendet werden."
@@ -9348,12 +9412,12 @@ msgstr "Anwendung des Filters für spärliches Auschecken überspringen"
msgid "debug unpack-trees"
msgstr "Entpacken der Bäume protokollieren"
-#: builtin/reflog.c:432
+#: builtin/reflog.c:428
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
-#: builtin/reflog.c:549 builtin/reflog.c:554
+#: builtin/reflog.c:545 builtin/reflog.c:550
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' ist kein gültiger Zeitstempel"
@@ -9370,15 +9434,15 @@ msgstr ""
"git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <Name> <URL>"
-#: builtin/remote.c:14 builtin/remote.c:33
+#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
msgstr "git remote rename <alt> <neu>"
-#: builtin/remote.c:15 builtin/remote.c:38
+#: builtin/remote.c:15 builtin/remote.c:39
msgid "git remote remove <name>"
msgstr "git remote remove <Name>"
-#: builtin/remote.c:16 builtin/remote.c:43
+#: builtin/remote.c:16 builtin/remote.c:44
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)"
@@ -9400,48 +9464,52 @@ msgstr ""
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <Name> <Branch>..."
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <Name>"
+
+#: builtin/remote.c:22 builtin/remote.c:75
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]"
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <Name> <neueURL>"
-#: builtin/remote.c:23 builtin/remote.c:71
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <Name> <URL>"
-#: builtin/remote.c:28
+#: builtin/remote.c:29
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<Optionen>] <Name> <URL>"
-#: builtin/remote.c:48
+#: builtin/remote.c:49
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <Name> <Branch>..."
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <Name> <Branch>..."
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<Optionen>] <Name>"
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<Optionen>] <Name>"
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..."
-#: builtin/remote.c:88
+#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
msgstr "Aktualisiere %s"
-#: builtin/remote.c:120
+#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -9449,102 +9517,102 @@ msgstr ""
"--mirror ist gefährlich und veraltet; bitte\n"
"\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push"
-#: builtin/remote.c:137
+#: builtin/remote.c:143
#, c-format
msgid "unknown mirror argument: %s"
msgstr "unbekanntes Argument für Option --mirror: %s"
-#: builtin/remote.c:153
+#: builtin/remote.c:159
msgid "fetch the remote branches"
msgstr "die Remote-Branches anfordern"
-#: builtin/remote.c:155
+#: builtin/remote.c:161
msgid "import all tags and associated objects when fetching"
msgstr "alle Tags und verbundene Objekte beim Anfordern importieren"
-#: builtin/remote.c:158
+#: builtin/remote.c:164
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "oder fordere gar keine Zweige an (--no-tags)"
-#: builtin/remote.c:160
+#: builtin/remote.c:166
msgid "branch(es) to track"
msgstr "Branch(es) zur Ãœbernahme"
-#: builtin/remote.c:161
+#: builtin/remote.c:167
msgid "master branch"
msgstr "Hauptbranch"
-#: builtin/remote.c:162
+#: builtin/remote.c:168
msgid "push|fetch"
msgstr "push|fetch"
-#: builtin/remote.c:163
+#: builtin/remote.c:169
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
"Aufsetzen des Remote-Repositories als Spiegel-Repository für \"push\" und "
"\"fetch\""
-#: builtin/remote.c:175
+#: builtin/remote.c:181
msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
"Die Option --mirror kann nicht mit der Angabe eines Hauptbranches verwendet "
"werden."
-#: builtin/remote.c:177
+#: builtin/remote.c:183
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
"Spiegelarchiven verwendet werden."
-#: builtin/remote.c:187 builtin/remote.c:637
+#: builtin/remote.c:193 builtin/remote.c:643
#, c-format
msgid "remote %s already exists."
msgstr "externes Repository %s existiert bereits"
-#: builtin/remote.c:191 builtin/remote.c:641
+#: builtin/remote.c:197 builtin/remote.c:647
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' ist kein gültiger Name für ein Remote-Repository"
-#: builtin/remote.c:235
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten"
-#: builtin/remote.c:335
+#: builtin/remote.c:341
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen"
-#: builtin/remote.c:436 builtin/remote.c:444
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr "(übereinstimmend)"
-#: builtin/remote.c:448
+#: builtin/remote.c:454
msgid "(delete)"
msgstr "(lösche)"
-#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "Konnte '%s' nicht an '%s' anhängen."
-#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
#, c-format
msgid "No such remote: %s"
msgstr "Kein solches Remote-Repository: %s"
-#: builtin/remote.c:647
+#: builtin/remote.c:653
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
-#: builtin/remote.c:653 builtin/remote.c:821
+#: builtin/remote.c:659 builtin/remote.c:827
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
-#: builtin/remote.c:668
+#: builtin/remote.c:674
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9555,27 +9623,27 @@ msgstr ""
"\t%s\n"
"\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
-#: builtin/remote.c:674
+#: builtin/remote.c:680
#, c-format
msgid "Could not append '%s'"
msgstr "Konnte '%s' nicht anhängen."
-#: builtin/remote.c:685
+#: builtin/remote.c:691
#, c-format
msgid "Could not set '%s'"
msgstr "Konnte '%s' nicht setzen"
-#: builtin/remote.c:707
+#: builtin/remote.c:713
#, c-format
msgid "deleting '%s' failed"
msgstr "Konnte '%s' nicht löschen"
-#: builtin/remote.c:741
+#: builtin/remote.c:747
#, c-format
msgid "creating '%s' failed"
msgstr "Konnte '%s' nicht erstellen"
-#: builtin/remote.c:807
+#: builtin/remote.c:813
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9591,120 +9659,120 @@ msgstr[1] ""
"entfernt;\n"
"um diese zu entfernen, benutzen Sie:"
-#: builtin/remote.c:922
+#: builtin/remote.c:928
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)"
-#: builtin/remote.c:925
+#: builtin/remote.c:931
msgid " tracked"
msgstr " gefolgt"
-#: builtin/remote.c:927
+#: builtin/remote.c:933
msgid " stale (use 'git remote prune' to remove)"
msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
-#: builtin/remote.c:929
+#: builtin/remote.c:935
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:970
+#: builtin/remote.c:976
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen"
-#: builtin/remote.c:977
+#: builtin/remote.c:983
#, c-format
msgid "rebases onto remote %s"
msgstr "Rebase auf Remote-Branch %s"
-#: builtin/remote.c:980
+#: builtin/remote.c:986
#, c-format
msgid " merges with remote %s"
msgstr " führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:981
+#: builtin/remote.c:987
msgid " and with remote"
msgstr " und mit Remote-Branch"
-#: builtin/remote.c:983
+#: builtin/remote.c:989
#, c-format
msgid "merges with remote %s"
msgstr "führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:984
+#: builtin/remote.c:990
msgid " and with remote"
msgstr " und mit Remote-Branch"
-#: builtin/remote.c:1030
+#: builtin/remote.c:1036
msgid "create"
msgstr "erstellt"
-#: builtin/remote.c:1033
+#: builtin/remote.c:1039
msgid "delete"
msgstr "gelöscht"
-#: builtin/remote.c:1037
+#: builtin/remote.c:1043
msgid "up to date"
msgstr "aktuell"
-#: builtin/remote.c:1040
+#: builtin/remote.c:1046
msgid "fast-forwardable"
msgstr "vorspulbar"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1049
msgid "local out of date"
msgstr "lokal nicht aktuell"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s erzwingt Versandt nach %-*s (%s)"
-#: builtin/remote.c:1053
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s versendet nach %-*s (%s)"
-#: builtin/remote.c:1057
+#: builtin/remote.c:1063
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s erzwingt Versand nach %s"
-#: builtin/remote.c:1060
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s versendet nach %s"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
msgid "do not query remotes"
msgstr "keine Abfrage von Remote-Repositories"
-#: builtin/remote.c:1155
+#: builtin/remote.c:1161
#, c-format
msgid "* remote %s"
msgstr "* Remote-Repository %s"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1162
#, c-format
msgid " Fetch URL: %s"
msgstr " URL zum Abholen: %s"
-#: builtin/remote.c:1157 builtin/remote.c:1308
+#: builtin/remote.c:1163 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(keine URL)"
-#: builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr " URL zum Versenden: %s"
-#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr " Hauptbranch: %s"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1182
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -9712,146 +9780,159 @@ msgstr ""
" Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
"sein):\n"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Remote-Branch:%s"
msgstr[1] " Remote-Branches:%s"
-#: builtin/remote.c:1191 builtin/remote.c:1218
+#: builtin/remote.c:1197 builtin/remote.c:1224
msgid " (status not queried)"
msgstr " (Zustand nicht abgefragt)"
-#: builtin/remote.c:1200
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokaler Branch konfiguriert für 'git pull':"
msgstr[1] " Lokale Branches konfiguriert für 'git pull':"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokale Referenzen werden von 'git push' gespiegelt"
-#: builtin/remote.c:1215
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:"
msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:"
-#: builtin/remote.c:1236
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
-#: builtin/remote.c:1238
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "entfernt refs/remotes/<Name>/HEAD"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen "
"aus mit:"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "Konnte %s nicht entfernen"
-#: builtin/remote.c:1273
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "keine gültige Referenz: %s"
-#: builtin/remote.c:1275
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "Konnte %s nicht einrichten"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s wird unreferenziert!"
-#: builtin/remote.c:1294
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s wurde unreferenziert!"
-#: builtin/remote.c:1304
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "entferne veraltete Branches von %s"
-#: builtin/remote.c:1305
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1321
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [würde veralteten Branch entfernen] %s"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr "* [veralteten Branch entfernt] %s"
-#: builtin/remote.c:1369
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
-#: builtin/remote.c:1435 builtin/remote.c:1509
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
#, c-format
msgid "No such remote '%s'"
msgstr "Kein solches Remote-Repository '%s'"
-#: builtin/remote.c:1455
+#: builtin/remote.c:1461
msgid "add branch"
msgstr "Branch hinzufügen"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1468
msgid "no remote specified"
msgstr "kein Remote-Repository angegeben"
-#: builtin/remote.c:1484
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr "nur URLs für Push ausgeben"
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr "alle URLs ausgeben"
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
+
+#: builtin/remote.c:1541
msgid "manipulate push URLs"
msgstr "URLs für \"push\" manipulieren"
-#: builtin/remote.c:1486
+#: builtin/remote.c:1543
msgid "add URL"
msgstr "URL hinzufügen"
-#: builtin/remote.c:1488
+#: builtin/remote.c:1545
msgid "delete URLs"
msgstr "URLs löschen"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1552
msgid "--add --delete doesn't make sense"
msgstr ""
"Die Optionen --add und --delete können nicht gemeinsam verwendet werden."
-#: builtin/remote.c:1535
+#: builtin/remote.c:1592
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ungültiges altes URL Format: %s"
-#: builtin/remote.c:1543
+#: builtin/remote.c:1600
#, c-format
msgid "No such URL found: %s"
msgstr "Keine solche URL gefunden: %s"
-#: builtin/remote.c:1545
+#: builtin/remote.c:1602
msgid "Will not delete all non-push URLs"
msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
-#: builtin/remote.c:1559
+#: builtin/remote.c:1616
msgid "be verbose; must be placed before a subcommand"
msgstr "erweiterte Ausgaben; muss vor einem Unterkommando angegeben werden"
@@ -9926,7 +10007,11 @@ msgid "repack objects in packs marked with .keep"
msgstr ""
"Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
-#: builtin/repack.c:378
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
+
+#: builtin/repack.c:381
#, c-format
msgid "removing '%s' failed"
msgstr "Löschen von '%s' fehlgeschlagen"
@@ -10021,7 +10106,7 @@ msgstr "das angegebene Format benutzen"
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clean | forget <Pfad>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:57
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "saubere Auflösungen im Index registrieren"
@@ -10157,24 +10242,24 @@ msgstr "Konnte neue Index-Datei nicht schreiben."
msgid "rev-list does not support display of notes"
msgstr "rev-list unterstützt keine Anzeige von Notizen"
-#: builtin/rev-parse.c:361
+#: builtin/rev-parse.c:358
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]"
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
msgstr "`--` als Argument lassen"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen"
-#: builtin/rev-parse.c:371
+#: builtin/rev-parse.c:368
msgid "output in stuck long form"
msgstr ""
"Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')"
-#: builtin/rev-parse.c:502
+#: builtin/rev-parse.c:499
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -10440,7 +10525,7 @@ msgstr "w[,i1[,i2]]"
msgid "Linewrap output"
msgstr "Ausgabe mit Zeilenumbrüchen"
-#: builtin/show-branch.c:9
+#: builtin/show-branch.c:10
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -10452,72 +10537,72 @@ msgstr ""
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches anzeigen"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
msgstr "Remote-Tracking-Branches anzeigen"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
msgstr "'*!+-' entsprechend des Branches einfärben"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:646
msgid "show <n> more commits after the common ancestor"
msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:648
msgid "synonym to more=-1"
msgstr "Synonym für more=-1"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:649
msgid "suppress naming strings"
msgstr "Namen unterdrücken"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:651
msgid "include the current branch"
msgstr "den aktuellen Branch einbeziehen"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:653
msgid "name commits with their object names"
msgstr "Commits nach ihren Objektnamen benennen"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:655
msgid "show possible merge bases"
msgstr "mögliche Merge-Basen anzeigen"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
msgstr ""
"Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen"
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:659
msgid "show commits in topological order"
msgstr "Commits in topologischer Ordnung anzeigen"
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:662
msgid "show only commits not on the first branch"
msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden"
-#: builtin/show-branch.c:683
+#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind"
-#: builtin/show-branch.c:685
+#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich"
-#: builtin/show-branch.c:688
+#: builtin/show-branch.c:669
msgid "<n>[,<base>]"
msgstr "<n>[,<Basis>]"
-#: builtin/show-branch.c:689
+#: builtin/show-branch.c:670
msgid "show <n> most recent ref-log entries starting at base"
msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen"
@@ -10530,45 +10615,138 @@ msgstr ""
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<Muster>...] "
#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"
-msgstr "git show-ref --exclude-existing[=<Muster>] < <Referenzliste>"
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<Muster>]"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
msgstr "nur Tags anzeigen (kann mit \"heads\" kombiniert werden)"
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
msgstr "nur Branches anzeigen (kann mit \"tags\" kombiniert werden)"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
msgstr "strengere Referenzprüfung, erfordert exakten Referenzpfad"
-#: builtin/show-ref.c:175 builtin/show-ref.c:177
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
"die HEAD-Referenz anzeigen, selbst wenn diese ausgefiltert werden würde"
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:174
msgid "dereference tags into object IDs"
msgstr "Tags in Objekt-Identifikationen dereferenzieren"
-#: builtin/show-ref.c:181
+#: builtin/show-ref.c:176
msgid "only show SHA1 hash using <n> digits"
msgstr "nur SHA1 Hash mit <n> Ziffern anzeigen"
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:180
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"keine Ausgabe der Ergebnisse in die Standard-Ausgabe (nützlich mit --verify)"
-#: builtin/show-ref.c:187
+#: builtin/show-ref.c:182
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen "
"Repository befinden"
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr "alle Zeilen, die mit dem Kommentarzeichen beginnen, überspringen und "
+"entfernen"
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr "Kommentarzeichen mit Leerzeichen an jeder Zeile voranstellen"
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr "Alternativer Anker für relative Pfade"
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <Pfad>"
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden"
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr "Pfad für neues Submodul"
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr "Name des neuen Submoduls"
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr "URL von der das Submodul geklont wird"
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+msgstr ""
+"git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference "
+"<Repository>] [--name <Name>] [--url <URL>][--depth <Tiefe>] [--] [<Pfad>...]"
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "Konnte Verzeichnis '%s' nicht erstellen."
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr "Kann Datei '%s' nicht öffnen"
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr "Konnte Datei '%s' nicht schließen."
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr "fatal: submodule--helper muss mit einem Unterkommando aufgerufen werden"
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr "fatal: '%s' ist kein gültiges Unterkommando von submodule--helper"
+
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<Optionen>] <Name> [<Referenz>]"
@@ -10598,7 +10776,7 @@ msgstr "Grund"
msgid "reason of the update"
msgstr "Grund für die Aktualisierung"
-#: builtin/tag.c:22
+#: builtin/tag.c:23
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
@@ -10606,48 +10784,43 @@ msgstr ""
"git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>] "
"<Tagname> [<Commit>]"
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid "git tag -d <tagname>..."
msgstr "git tag -d <Tagname>..."
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[<pattern>...]"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
"git tag -l [-n[<Nummer>]] [--contains <Commit>] [--points-at <Objekt>]\n"
-"\t\t[<Muster>...]"
+"\t\t[--format=<Muster>] [--[no-]merged [<Commit>]] [<Muster>...]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -v <tagname>..."
msgstr "git tag -v <Tagname>..."
-#: builtin/tag.c:69
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "fehlerhaftes Objekt bei '%s'"
-
-#: builtin/tag.c:301
+#: builtin/tag.c:80
#, c-format
msgid "tag name too long: %.*s..."
msgstr "Tagname zu lang: %.*s..."
-#: builtin/tag.c:306
+#: builtin/tag.c:85
#, c-format
msgid "tag '%s' not found."
msgstr "Tag '%s' nicht gefunden."
-#: builtin/tag.c:321
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' gelöscht (war %s)\n"
-#: builtin/tag.c:333
+#: builtin/tag.c:112
#, c-format
msgid "could not verify the tag '%s'"
msgstr "Konnte Tag '%s' nicht verifizieren"
-#: builtin/tag.c:343
+#: builtin/tag.c:122
#, c-format
msgid ""
"\n"
@@ -10660,7 +10833,7 @@ msgstr ""
" %s\n"
"ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
-#: builtin/tag.c:347
+#: builtin/tag.c:126
#, c-format
msgid ""
"\n"
@@ -10675,153 +10848,138 @@ msgstr ""
"ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n"
"selbst entfernen wenn Sie möchten.\n"
-#: builtin/tag.c:371
-#, c-format
-msgid "unsupported sort specification '%s'"
-msgstr "Nicht unterstützte Angabe für \"--sort\" '%s'"
-
-#: builtin/tag.c:373
-#, c-format
-msgid "unsupported sort specification '%s' in variable '%s'"
-msgstr "Nicht unterstützte Angabe für \"--sort\" '%s' in Variable '%s'"
-
-#: builtin/tag.c:428
+#: builtin/tag.c:199
msgid "unable to sign the tag"
msgstr "konnte Tag nicht signieren"
-#: builtin/tag.c:430
+#: builtin/tag.c:201
msgid "unable to write tag file"
msgstr "konnte Tag-Datei nicht schreiben"
-#: builtin/tag.c:455
+#: builtin/tag.c:226
msgid "bad object type."
msgstr "ungültiger Objekt-Typ"
-#: builtin/tag.c:468
+#: builtin/tag.c:239
msgid "tag header too big."
msgstr "Tag-Kopf zu groß."
-#: builtin/tag.c:504
+#: builtin/tag.c:275
msgid "no tag message?"
msgstr "keine Tag-Beschreibung?"
-#: builtin/tag.c:510
+#: builtin/tag.c:281
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Die Tag-Beschreibung wurde gelassen in %s\n"
-#: builtin/tag.c:559
-msgid "switch 'points-at' requires an object"
-msgstr "Option 'points-at' erfordert ein Objekt"
-
-#: builtin/tag.c:561
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "fehlerhafter Objekt-Name '%s'"
-
-#: builtin/tag.c:590
+#: builtin/tag.c:339
msgid "list tag names"
msgstr "Tagnamen auflisten"
-#: builtin/tag.c:592
+#: builtin/tag.c:341
msgid "print <n> lines of each tag message"
msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
-#: builtin/tag.c:594
+#: builtin/tag.c:343
msgid "delete tags"
msgstr "Tags löschen"
-#: builtin/tag.c:595
+#: builtin/tag.c:344
msgid "verify tags"
msgstr "Tags überprüfen"
-#: builtin/tag.c:597
+#: builtin/tag.c:346
msgid "Tag creation options"
msgstr "Optionen für Erstellung von Tags"
-#: builtin/tag.c:599
+#: builtin/tag.c:348
msgid "annotated tag, needs a message"
msgstr "annotiertes Tag, benötigt eine Beschreibung"
-#: builtin/tag.c:601
+#: builtin/tag.c:350
msgid "tag message"
msgstr "Tag-Beschreibung"
-#: builtin/tag.c:603
+#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
msgstr "annotiertes und GPG-signiertes Tag"
-#: builtin/tag.c:607
+#: builtin/tag.c:356
msgid "use another key to sign the tag"
msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
-#: builtin/tag.c:608
+#: builtin/tag.c:357
msgid "replace the tag if exists"
msgstr "das Tag ersetzen, wenn es existiert"
-#: builtin/tag.c:609 builtin/update-ref.c:368
+#: builtin/tag.c:358 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "Reflog erstellen"
-#: builtin/tag.c:611
+#: builtin/tag.c:360
msgid "Tag listing options"
msgstr "Optionen für Auflistung der Tags"
-#: builtin/tag.c:612
+#: builtin/tag.c:361
msgid "show tag list in columns"
msgstr "Liste der Tags in Spalten anzeigen"
-#: builtin/tag.c:614
-msgid "sort tags"
-msgstr "Tags sortieren"
-
-#: builtin/tag.c:619 builtin/tag.c:625
+#: builtin/tag.c:362 builtin/tag.c:363
msgid "print only tags that contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
-#: builtin/tag.c:631
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
+msgstr "nur Tags ausgeben, die gemerged wurden"
+
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
+msgstr "nur Tags ausgeben, die nicht gemerged wurden"
+
+#: builtin/tag.c:370
msgid "print only tags of the object"
msgstr "nur Tags von dem Objekt ausgeben"
-#: builtin/tag.c:657
+#: builtin/tag.c:399
msgid "--column and -n are incompatible"
msgstr "--column und -n sind inkompatibel"
-#: builtin/tag.c:669
-msgid "--sort and -n are incompatible"
-msgstr "--sort und -n sind inkompatibel"
-
-#: builtin/tag.c:676
+#: builtin/tag.c:419
msgid "-n option is only allowed with -l."
msgstr "-n Option ist nur erlaubt mit -l."
-#: builtin/tag.c:678
+#: builtin/tag.c:421
msgid "--contains option is only allowed with -l."
msgstr "--contains Option ist nur erlaubt mit -l."
-#: builtin/tag.c:680
+#: builtin/tag.c:423
msgid "--points-at option is only allowed with -l."
msgstr "--points-at Option ist nur erlaubt mit -l."
-#: builtin/tag.c:688
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr "Die Optionen --merged und --no-merged sind nur mit -l erlaubt."
+
+#: builtin/tag.c:433
msgid "only one -F or -m option is allowed."
msgstr "nur eine -F oder -m Option ist erlaubt."
-#: builtin/tag.c:708
+#: builtin/tag.c:453
msgid "too many params"
msgstr "zu viele Parameter"
-#: builtin/tag.c:714
+#: builtin/tag.c:459
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ist kein gültiger Tagname."
-#: builtin/tag.c:719
+#: builtin/tag.c:464
#, c-format
msgid "tag '%s' already exists"
msgstr "Tag '%s' existiert bereits"
-#: builtin/tag.c:744
+#: builtin/tag.c:489
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aktualisiert (war %s)\n"
@@ -11099,78 +11257,82 @@ msgstr "git verify-tag [-v | --verbose] <Tag>..."
msgid "print tag contents"
msgstr "Tag-Inhalte ausgeben"
-#: builtin/worktree.c:13
-msgid "git worktree add [<options>] <path> <branch>"
-msgstr "git worktree add [<Optionen>] <Pfad> <Branch>"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<Optionen>] <Pfad> [<Branch>]"
-#: builtin/worktree.c:14
+#: builtin/worktree.c:16
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<Optionen>]"
-#: builtin/worktree.c:36
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<Optionen>]"
+
+#: builtin/worktree.c:39
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:45
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
-#: builtin/worktree.c:47
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen"
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
-#: builtin/worktree.c:74
+#: builtin/worktree.c:77
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:112
#, c-format
msgid "failed to remove: %s"
msgstr "Fehler beim Löschen: %s"
-#: builtin/worktree.c:198
+#: builtin/worktree.c:201
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existiert bereits"
-#: builtin/worktree.c:232
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/worktree.c:268
+#: builtin/worktree.c:271
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Bereite %s vor (Identifikation %s)"
-#: builtin/worktree.c:316
+#: builtin/worktree.c:319
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"<Branch> auschecken, auch wenn dieser bereits in einem anderen "
"Arbeitsverzeichnis ausgecheckt ist"
-#: builtin/worktree.c:318
+#: builtin/worktree.c:321
msgid "create a new branch"
msgstr "neuen Branch erstellen"
-#: builtin/worktree.c:320
+#: builtin/worktree.c:323
msgid "create or reset a branch"
msgstr "Branch erstellen oder umsetzen"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:324
msgid "detach HEAD at named commit"
msgstr "HEAD bei benanntem Commit loslösen"
-#: builtin/worktree.c:328
+#: builtin/worktree.c:331
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B und --detach schließen sich gegenseitig aus"
@@ -11327,49 +11489,49 @@ msgstr "Verfallsdatum"
msgid "no-op (backward compatibility)"
msgstr "Kein Effekt (Rückwärtskompatibilität)"
-#: parse-options.h:236
+#: parse-options.h:237
msgid "be more verbose"
msgstr "erweiterte Ausgaben"
-#: parse-options.h:238
+#: parse-options.h:239
msgid "be more quiet"
msgstr "weniger Ausgaben"
-#: parse-options.h:244
+#: parse-options.h:245
msgid "use <n> digits to display SHA-1s"
msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s"
-#: rerere.h:28
+#: rerere.h:38
msgid "update the index with reused conflict resolution if possible"
msgstr ""
"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren"
-#: git-bisect.sh:50
+#: git-bisect.sh:55
msgid "You need to start by \"git bisect start\""
msgstr "Sie müssen mit \"git bisect start\" beginnen."
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:56
+#: git-bisect.sh:61
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Wollen Sie, dass ich es für Sie mache [Y/n]? "
-#: git-bisect.sh:99
+#: git-bisect.sh:122
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "nicht erkannte Option: '$arg'"
-#: git-bisect.sh:103
+#: git-bisect.sh:126
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' scheint kein gültiger Commit zu sein"
-#: git-bisect.sh:132
+#: git-bisect.sh:155
msgid "Bad HEAD - I need a HEAD"
msgstr "Ungültiger HEAD - HEAD wird benötigt"
-#: git-bisect.sh:145
+#: git-bisect.sh:168
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
@@ -11377,40 +11539,40 @@ msgstr ""
"Auschecken von '$start_head' fehlgeschlagen. Versuchen Sie 'git bisect reset "
"<gültiger-Branch>'."
-#: git-bisect.sh:155
+#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
"binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich"
-#: git-bisect.sh:159
+#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
msgstr "Ungültiger HEAD - merkwürdige symbolische Referenz"
-#: git-bisect.sh:211
+#: git-bisect.sh:234
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Ungültiges \"bisect_write\" Argument: $state"
-#: git-bisect.sh:240
+#: git-bisect.sh:263
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Ungültige Referenz-Eingabe: $arg"
-#: git-bisect.sh:255
+#: git-bisect.sh:278
msgid "Please call 'bisect_state' with at least one argument."
msgstr "Bitte rufen Sie 'bisect_state' mit mindestens einem Argument auf."
-#: git-bisect.sh:267
+#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Ungültige Referenz-Eingabe: $rev"
-#: git-bisect.sh:276
+#: git-bisect.sh:299
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' kann nur ein Argument entgegennehmen."
-#: git-bisect.sh:299
+#: git-bisect.sh:322
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "Warnung: binäre Suche nur mit einem $TERM_BAD Commit."
@@ -11418,11 +11580,11 @@ msgstr "Warnung: binäre Suche nur mit einem $TERM_BAD Commit."
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:305
+#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
msgstr "Sind Sie sicher [Y/n]? "
-#: git-bisect.sh:317
+#: git-bisect.sh:340
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -11433,7 +11595,7 @@ msgstr ""
"(Sie können dafür \"git bisect $bad_syn\" und \"git bisect $good_syn\" "
"benutzen.)"
-#: git-bisect.sh:320
+#: git-bisect.sh:343
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11446,16 +11608,16 @@ msgstr ""
"(Sie können dafür \"git bisect $bad_syn\" und \"git bisect $good_syn\" "
"benutzen.)"
-#: git-bisect.sh:391 git-bisect.sh:521
+#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
msgstr "keine binäre Suche im Gange"
-#: git-bisect.sh:398
+#: git-bisect.sh:421
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' ist kein gültiger Commit"
-#: git-bisect.sh:407
+#: git-bisect.sh:430
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -11464,25 +11626,25 @@ msgstr ""
"Konnte den ursprünglichen HEAD '$branch' nicht auschecken.\n"
"Versuchen Sie 'git bisect reset <Commit>'."
-#: git-bisect.sh:435
+#: git-bisect.sh:458
msgid "No logfile given"
msgstr "Keine Log-Datei gegeben"
-#: git-bisect.sh:436
+#: git-bisect.sh:459
#, sh-format
msgid "cannot read $file for replaying"
msgstr "kann $file nicht für das Abspielen lesen"
-#: git-bisect.sh:455
+#: git-bisect.sh:480
msgid "?? what are you talking about?"
msgstr "?? Was reden Sie da?"
-#: git-bisect.sh:467
+#: git-bisect.sh:492
#, sh-format
msgid "running $command"
msgstr "führe $command aus"
-#: git-bisect.sh:474
+#: git-bisect.sh:499
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11491,11 +11653,11 @@ msgstr ""
"'bisect run' fehlgeschlagen:\n"
"Rückkehrwert $res von '$command' ist < 0 oder >= 128"
-#: git-bisect.sh:500
+#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
-#: git-bisect.sh:506
+#: git-bisect.sh:531
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11504,17 +11666,49 @@ msgstr ""
"'bisect run' fehlgeschlagen:\n"
"'bisect_state $state' wurde mit Fehlerwert $res beendet"
-#: git-bisect.sh:513
+#: git-bisect.sh:538
msgid "bisect run success"
msgstr "'bisect run' erfolgreich ausgeführt"
-#: git-bisect.sh:548
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "Bitte verwenden Sie zwei verschiedene Begriffe."
+
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "'$term' ist kein gültiger Begriff"
+
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr "Kann eingebautes Kommando '$term' nicht als Begriff verwenden"
+
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "Kann Bedeutung von '$term' nicht ändern."
+
+#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
"Ungültiges Kommando: Sie sind gerade bei einer binären $TERM_BAD/$TERM_GOOD "
"Suche."
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "Keine Begriffe definiert."
+
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"Ungültiges Argument $arg für 'git bisect terms'.\n"
+"Unterstützte Optionen sind: --term-good|--term-old und --term-bad|--term-new."
+
#: git-rebase.sh:57
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
@@ -11556,25 +11750,25 @@ msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "\"git-am\" scheint im Gange zu sein. Kann Rebase nicht durchführen."
-#: git-rebase.sh:351
+#: git-rebase.sh:354
msgid "The --exec option must be used with the --interactive option"
msgstr "Die Option --exec muss mit --interactive verwendet werden."
-#: git-rebase.sh:356
+#: git-rebase.sh:359
msgid "No rebase in progress?"
msgstr "Kein Rebase im Gange?"
-#: git-rebase.sh:367
+#: git-rebase.sh:370
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet "
"werden."
-#: git-rebase.sh:374
+#: git-rebase.sh:377
msgid "Cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: git-rebase.sh:377
+#: git-rebase.sh:380
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11582,12 +11776,12 @@ msgstr ""
"Sie müssen alle Merge-Konflikte editieren und diese dann\n"
"mittels \"git add\" als aufgelöst markieren"
-#: git-rebase.sh:395
+#: git-rebase.sh:398
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Konnte nicht zu $head_name zurückgehen"
-#: git-rebase.sh:414
+#: git-rebase.sh:417
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11608,67 +11802,67 @@ msgstr ""
"und führen Sie dieses Kommando nochmal aus. Es wird angehalten, falls noch\n"
"etwas Schützenswertes vorhanden ist."
-#: git-rebase.sh:465
+#: git-rebase.sh:468
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ungültiger Upstream-Branch $upstream_name"
-#: git-rebase.sh:489
+#: git-rebase.sh:492
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: es gibt mehr als eine Merge-Basis"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:495 git-rebase.sh:499
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: es gibt keine Merge-Basis"
-#: git-rebase.sh:501
+#: git-rebase.sh:504
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "$onto_name zeigt auf keinen gültigen Commit"
-#: git-rebase.sh:524
+#: git-rebase.sh:527
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: Branch $branch_name nicht gefunden"
-#: git-rebase.sh:557
+#: git-rebase.sh:560
msgid "Cannot autostash"
msgstr "Kann \"autostash\" nicht ausführen."
-#: git-rebase.sh:562
+#: git-rebase.sh:565
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "\"autostash\" erzeugt: $stash_abbrev"
-#: git-rebase.sh:566
+#: git-rebase.sh:569
msgid "Please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: git-rebase.sh:586
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand."
-#: git-rebase.sh:590
+#: git-rebase.sh:593
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
"Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen."
-#: git-rebase.sh:601
+#: git-rebase.sh:604
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Änderungen von $mb zu $onto:"
-#: git-rebase.sh:610
+#: git-rebase.sh:613
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n"
"darauf neu anzuwenden ..."
-#: git-rebase.sh:620
+#: git-rebase.sh:623
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name zu $onto_name vorgespult."
@@ -11742,114 +11936,99 @@ msgstr "Kann den aktuellen Status nicht speichern"
msgid "Cannot remove worktree changes"
msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
-#: git-stash.sh:387
+#: git-stash.sh:405
#, sh-format
msgid "unknown option: $opt"
msgstr "unbekannte Option: $opt"
-#: git-stash.sh:397
+#: git-stash.sh:415
msgid "No stash found."
-msgstr "Kein \"stash\" gefunden."
+msgstr "Kein Stash-Eintrag gefunden."
-#: git-stash.sh:404
+#: git-stash.sh:422
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Zu viele Commits angegeben: $REV"
-#: git-stash.sh:410
+#: git-stash.sh:428
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference ist keine gültige Referenz"
-#: git-stash.sh:438
+#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' ist kein \"stash\"-artiger Commit"
-#: git-stash.sh:449
+#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' ist keine \"stash\"-Referenz"
-#: git-stash.sh:457
+#: git-stash.sh:475
msgid "unable to refresh index"
-msgstr "unfähig den Index zu aktualisieren"
+msgstr "Konnte den Index nicht aktualisieren."
-#: git-stash.sh:461
+#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Kann \"stash\" nicht anwenden, solang ein Merge im Gange ist"
-#: git-stash.sh:469
+#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
-#: git-stash.sh:471
+#: git-stash.sh:489
msgid "Could not save index tree"
msgstr "Konnte Index-Verzeichnis nicht speichern"
-#: git-stash.sh:505
+#: git-stash.sh:523
msgid "Cannot unstage modified files"
msgstr "Kann geänderte Dateien nicht aus dem Index entfernen"
-#: git-stash.sh:520
+#: git-stash.sh:538
msgid "Index was not unstashed."
msgstr "Index wurde nicht aus dem Stash zurückgeladen."
-#: git-stash.sh:543
+#: git-stash.sh:561
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Gelöscht ${REV} ($s)"
-#: git-stash.sh:544
+#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen"
-#: git-stash.sh:552
+#: git-stash.sh:570
msgid "No branch name specified"
msgstr "Kein Branchname spezifiziert"
-#: git-stash.sh:624
+#: git-stash.sh:642
msgid "(To restore them type \"git stash apply\")"
msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
-#: git-submodule.sh:95
+#: git-submodule.sh:104
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "Kann eine Komponente von URL '$remoteurl' nicht extrahieren"
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '$sm_path' gefunden"
-
-#: git-submodule.sh:287
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr "Klonen von '$url' in Submodul-Pfad '$sm_path' fehlgeschlagen"
-
-#: git-submodule.sh:296
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr "Git-Verzeichnis '$a' ist Teil des Submodul-Pfades '$b', oder umgekehrt"
-
-#: git-submodule.sh:406
+#: git-submodule.sh:281
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses "
"benutzt werden."
-#: git-submodule.sh:416
+#: git-submodule.sh:291
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
-#: git-submodule.sh:433
+#: git-submodule.sh:308
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
-#: git-submodule.sh:437
+#: git-submodule.sh:312
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11860,24 +12039,24 @@ msgstr ""
"$sm_path\n"
"Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten."
-#: git-submodule.sh:455
+#: git-submodule.sh:330
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu."
-#: git-submodule.sh:457
+#: git-submodule.sh:332
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository"
-#: git-submodule.sh:465
+#: git-submodule.sh:340
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-"
"Repositories:"
-#: git-submodule.sh:467
+#: git-submodule.sh:342
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
@@ -11885,7 +12064,7 @@ msgstr ""
"Wenn Sie dieses lokale Git-Verzeichnis wiederverwenden möchtest, anstatt "
"erneut zu klonen"
-#: git-submodule.sh:469
+#: git-submodule.sh:344
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
@@ -11893,7 +12072,7 @@ msgstr ""
"benutzen Sie die Option '--force'. Wenn das lokale Git-Verzeichnis nicht das "
"korrekte Repository ist"
-#: git-submodule.sh:470
+#: git-submodule.sh:345
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
@@ -11902,77 +12081,77 @@ msgstr ""
"oder Sie sich unsicher sind, was das bedeutet, wählen Sie einen anderen "
"Namenmit der Option '--name'."
-#: git-submodule.sh:472
+#: git-submodule.sh:347
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'."
-#: git-submodule.sh:484
+#: git-submodule.sh:359
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kann Submodul '$sm_path' nicht auschecken"
-#: git-submodule.sh:489
+#: git-submodule.sh:364
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
-#: git-submodule.sh:498
+#: git-submodule.sh:373
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
-#: git-submodule.sh:542
+#: git-submodule.sh:417
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr "Betrete '$prefix$displaypath'"
-#: git-submodule.sh:562
+#: git-submodule.sh:437
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr "Stoppe bei '$prefix$displaypath'; Skript gab nicht-Null Status zurück."
-#: git-submodule.sh:608
+#: git-submodule.sh:483
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr "Keine URL für Submodul-Pfad '$displaypath' in .gitmodules gefunden"
-#: git-submodule.sh:617
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
msgstr ""
"Fehler beim Eintragen der URL für Submodul-Pfad '$displaypath' in die "
"Konfiguration."
-#: git-submodule.sh:619
+#: git-submodule.sh:494
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr ""
"Submodul '$name' ($url) für Pfad '$displaypath' in die Konfiguration "
"eingetragen."
-#: git-submodule.sh:636
+#: git-submodule.sh:511
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr ""
"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad "
"'$displaypath' in der Konfiguration."
-#: git-submodule.sh:674
+#: git-submodule.sh:549
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr ""
"Verwenden Sie '.' wenn Sie wirklich alle Submodule\n"
"deinitialisieren möchten."
-#: git-submodule.sh:691
+#: git-submodule.sh:566
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
"Arbeitsverzeichnis des Submoduls in '$displaypath' enthält ein .git-"
"Verzeichnis"
-#: git-submodule.sh:692
+#: git-submodule.sh:567
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -11980,7 +12159,7 @@ msgstr ""
"(benutzen Sie 'rm -rf' wenn Sie dieses Submodul wirklich mitsamt\n"
"seiner Historie löschen möchten)"
-#: git-submodule.sh:698
+#: git-submodule.sh:573
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -11989,31 +12168,31 @@ msgstr ""
"Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; "
"verwenden Sie '-f', um diese zu verwerfen"
-#: git-submodule.sh:701
+#: git-submodule.sh:576
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Verzeichnis '$displaypath' bereinigt."
-#: git-submodule.sh:702
+#: git-submodule.sh:577
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht löschen."
-#: git-submodule.sh:705
+#: git-submodule.sh:580
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
"Konnte kein leeres Verzeichnis für Submodul in '$displaypath' erstellen."
-#: git-submodule.sh:714
+#: git-submodule.sh:589
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration "
"entfernt."
-#: git-submodule.sh:830
+#: git-submodule.sh:705
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
@@ -12022,52 +12201,52 @@ msgstr ""
"Submodul-Pfad '$displaypath' ist nicht initialisiert.\n"
"Vielleicht möchten Sie 'update --init' benutzen?"
-#: git-submodule.sh:843
+#: git-submodule.sh:718
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden."
-#: git-submodule.sh:852
+#: git-submodule.sh:727
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen"
-#: git-submodule.sh:876
+#: git-submodule.sh:751
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen"
-#: git-submodule.sh:890
+#: git-submodule.sh:765
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
-#: git-submodule.sh:891
+#: git-submodule.sh:766
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
-#: git-submodule.sh:895
+#: git-submodule.sh:770
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich"
-#: git-submodule.sh:896
+#: git-submodule.sh:771
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
-#: git-submodule.sh:901
+#: git-submodule.sh:776
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
-#: git-submodule.sh:902
+#: git-submodule.sh:777
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
-#: git-submodule.sh:907
+#: git-submodule.sh:782
#, sh-format
msgid ""
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
@@ -12075,56 +12254,111 @@ msgstr ""
"Ausführung von '$command $sha1' in Submodul-Pfad '$prefix$sm_path' "
"fehlgeschlagen"
-#: git-submodule.sh:908
+#: git-submodule.sh:783
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr "Submodul-Pfad '$prefix$sm_path': '$command $sha1'"
-#: git-submodule.sh:938
+#: git-submodule.sh:813
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
-#: git-submodule.sh:1046
+#: git-submodule.sh:921
msgid "The --cached option cannot be used with the --files option"
msgstr ""
"Die Optionen --cached und --files können nicht gemeinsam verwendet werden."
-#: git-submodule.sh:1098
+#: git-submodule.sh:973
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "unerwarteter Modus $mod_dst"
-#: git-submodule.sh:1118
+#: git-submodule.sh:993
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src"
-#: git-submodule.sh:1121
+#: git-submodule.sh:996
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
-#: git-submodule.sh:1124
+#: git-submodule.sh:999
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst"
-#: git-submodule.sh:1149
+#: git-submodule.sh:1024
msgid "blob"
msgstr "Blob"
-#: git-submodule.sh:1267
+#: git-submodule.sh:1142
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
-#: git-submodule.sh:1331
+#: git-submodule.sh:1206
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisiere Submodul-URL für '$displaypath'"
+#~ msgid "unable to look up current user in the passwd file: %s"
+#~ msgstr "konnte aktuellen Benutzer nicht in Passwort-Datei finden: %s"
+
+#~ msgid "no such user"
+#~ msgstr "kein solcher Benutzer"
+
+#~ msgid "branch '%s' does not point at a commit"
+#~ msgstr "Branch '%s' zeigt auf keinen Commit"
+
+#~ msgid "object '%s' does not point to a commit"
+#~ msgstr "Objekt '%s' zeigt auf keinen Commit"
+
+#~ msgid "some refs could not be read"
+#~ msgstr "Konnte einige Referenzen nicht lesen"
+
+#~ msgid "print only merged branches"
+#~ msgstr "nur Branches ausgeben, die zusammengeführt sind"
+
+#~ msgid "--dissociate given, but there is no --reference"
+#~ msgstr "--dissociate ohne --reference angegeben"
+
+#~ msgid "show usage"
+#~ msgstr "Verwendung anzeigen"
+
+#~ msgid "insanely long template name %s"
+#~ msgstr "zu langer Vorlagen-Name %s"
+
+#~ msgid "insanely long symlink %s"
+#~ msgstr "zu lange symbolische Verknüpfung %s"
+
+#~ msgid "insanely long template path %s"
+#~ msgstr "zu langer Vorlagen-Pfad %s"
+
+#~ msgid "insane git directory %s"
+#~ msgstr "ungültiges Git-Verzeichnis %s"
+
+#~ msgid "unsupported sort specification '%s'"
+#~ msgstr "Nicht unterstützte Angabe für \"--sort\" '%s'"
+
+#~ msgid "unsupported sort specification '%s' in variable '%s'"
+#~ msgstr "Nicht unterstützte Angabe für \"--sort\" '%s' in Variable '%s'"
+
+#~ msgid "switch 'points-at' requires an object"
+#~ msgstr "Option 'points-at' erfordert ein Objekt"
+
+#~ msgid "sort tags"
+#~ msgstr "Tags sortieren"
+
+#~ msgid "--sort and -n are incompatible"
+#~ msgstr "--sort und -n sind inkompatibel"
+
+#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
+#~ msgstr ""
+#~ "Git-Verzeichnis '$a' ist Teil des Submodul-Pfades '$b', oder umgekehrt"
+
#~ msgid "false|true|preserve"
#~ msgstr "false|true|preserve"
diff --git a/po/fr.po b/po/fr.po
index 581167f..facc5c6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -73,8 +73,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-09-15 06:45+0800\n"
-"PO-Revision-Date: 2015-09-15 20:20+0200\n"
+"POT-Creation-Date: 2015-12-22 22:50+0800\n"
+"PO-Revision-Date: 2015-12-24 07:36+0100\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -96,13 +96,13 @@ msgstr ""
"Corrigez-les puis lancez 'git add/rm <fichier>'\n"
"si nécessaire pour marquer la résolution et valider."
-#: advice.c:101 builtin/merge.c:1227
+#: advice.c:101 builtin/merge.c:1225
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
#: advice.c:103
-msgid "Please, commit your changes before you can merge."
-msgstr "Veuillez valider vos changements avant de pouvoir fusionner."
+msgid "Please, commit your changes before merging."
+msgstr "Veuillez valider vos changements avant de fusionner."
#: advice.c:104
msgid "Exiting because of unfinished merge."
@@ -127,76 +127,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
-#: archive.c:428
+#: archive.c:429
msgid "fmt"
msgstr "fmt"
-#: archive.c:428
+#: archive.c:429
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:429 builtin/log.c:1229
+#: archive.c:430 builtin/log.c:1229
msgid "prefix"
msgstr "préfixe"
-#: archive.c:430
+#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516 builtin/blame.c:2517
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 builtin/blame.c:2536
#: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:712 builtin/hash-object.c:99 builtin/ls-files.c:446
+#: builtin/grep.c:707 builtin/hash-object.c:99 builtin/ls-files.c:446
#: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "fichier"
-#: archive.c:432 builtin/archive.c:89
+#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "écrire l'archive dans ce fichier"
-#: archive.c:434
+#: archive.c:435
msgid "read .gitattributes in working directory"
msgstr "lire .gitattributes dans le répertoire de travail"
-#: archive.c:435
+#: archive.c:436
msgid "report archived files on stderr"
msgstr "afficher les fichiers archivés sur stderr"
-#: archive.c:436
+#: archive.c:437
msgid "store only"
msgstr "stockage seulement"
-#: archive.c:437
+#: archive.c:438
msgid "compress faster"
msgstr "compression rapide"
-#: archive.c:445
+#: archive.c:446
msgid "compress better"
msgstr "compression efficace"
-#: archive.c:448
+#: archive.c:449
msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
-#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr "dépôt"
-#: archive.c:451 builtin/archive.c:91
+#: archive.c:452 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
-#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr "commande"
-#: archive.c:453 builtin/archive.c:93
+#: archive.c:454 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "chemin vers la commande distante git-upload-archive"
@@ -208,90 +208,90 @@ msgstr ""
"Les motifs de négation sont ignorés dans les attributs git\n"
"Utilisez '\\!' pour un point d'exclamation littéral."
-#: branch.c:60
+#: branch.c:61
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "La branche %s ne peut pas être sa propre branche amont."
-#: branch.c:83
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
"La branche %s est paramétrée pour suivre la branche distante %s de %s en "
"rebasant."
-#: branch.c:84
+#: branch.c:85
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr ""
"La branche %s est paramétrée pour suivre la branche distante %s depuis %s."
-#: branch.c:88
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr ""
"La branche %s est paramétrée pour suivre la branche locale %s en rebasant."
-#: branch.c:89
+#: branch.c:90
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "La branche %s est paramétrée pour suivre la branche locale %s."
-#: branch.c:94
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr ""
"La branche %s est paramétrée pour suivre la référence distante %s en "
"rebasant."
-#: branch.c:95
+#: branch.c:96
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "La branche %s est paramétrée pour suivre la référence distante %s."
-#: branch.c:99
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
"La branche %s est paramétrée pour suivre la référence locale %s en rebasant."
-#: branch.c:100
+#: branch.c:101
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "La branche %s est paramétrée pour suivre la référence locale %s."
-#: branch.c:133
+#: branch.c:134
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Pas de suivi : information ambiguë pour la référence %s"
-#: branch.c:162
+#: branch.c:163
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' n'est pas un nom de branche valide."
-#: branch.c:167
+#: branch.c:168
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Une branche nommée '%s' existe déjà."
-#: branch.c:175
+#: branch.c:176
msgid "Cannot force update the current branch."
msgstr "Impossible de forcer la mise à jour de la branche courante."
-#: branch.c:195
+#: branch.c:196
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "
"pas une branche."
-#: branch.c:197
+#: branch.c:198
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branche amont demandée '%s' n'existe pas"
-#: branch.c:199
+#: branch.c:200
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -311,22 +311,22 @@ msgstr ""
"sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"
"pour paramétrer le suivi distant en même temps que vous poussez."
-#: branch.c:243
+#: branch.c:244
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Nom d'objet invalide : '%s'."
-#: branch.c:263
+#: branch.c:264
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objet ambigu : '%s'."
-#: branch.c:268
+#: branch.c:269
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Point d'embranchement invalide : '%s'."
-#: branch.c:399
+#: branch.c:322
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' est déjà extrait dans '%s'"
@@ -341,7 +341,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:765
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
@@ -350,9 +350,9 @@ msgstr "impossible d'ouvrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708
-#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
-#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
@@ -392,7 +392,7 @@ msgstr "rev-list a disparu"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "la référence '%s' est exclue par les options de rev-list"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
@@ -410,13 +410,13 @@ msgstr "impossible de créer '%s'"
msgid "index-pack died"
msgstr "l'index de groupe a disparu"
-#: color.c:260
+#: color.c:275
#, c-format
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
-#: builtin/am.c:2128
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
@@ -577,24 +577,24 @@ msgstr "impossible de lire le fichier de commande '%s'"
msgid "Performing inexact rename detection"
msgstr "Détection de renommage inexact en cours"
-#: diff.c:116
+#: diff.c:115
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
-#: diff.c:121
+#: diff.c:120
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paramètre dirstat inconnu '%s'\n"
-#: diff.c:216
+#: diff.c:215
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-#: diff.c:268
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -603,16 +603,16 @@ msgstr ""
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:2998
+#: diff.c:3000
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:3394
+#: diff.c:3396
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:3557
+#: diff.c:3559
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -621,16 +621,16 @@ msgstr ""
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:3571
+#: diff.c:3573
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
-#: dir.c:1853
+#: dir.c:1915
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:1936
+#: dir.c:1998
msgid "Untracked cache is disabled on this system."
msgstr "Le cache non suivi est désactivé sur ce système."
@@ -740,8 +740,8 @@ msgstr "%s: %s - %s"
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:715
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
@@ -759,64 +759,64 @@ msgstr "échec de addinfo_cache pour le chemin '%s'"
msgid "error building trees"
msgstr "erreur de construction des arbres"
-#: merge-recursive.c:687
+#: merge-recursive.c:686
#, c-format
msgid "failed to create path '%s'%s"
msgstr "impossible de créer le chemin '%s' %s"
-#: merge-recursive.c:698
+#: merge-recursive.c:697
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"
-#: merge-recursive.c:712 merge-recursive.c:733
+#: merge-recursive.c:711 merge-recursive.c:732
msgid ": perhaps a D/F conflict?"
msgstr ": peut-être un conflit D/F ?"
-#: merge-recursive.c:723
+#: merge-recursive.c:722
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "refus de perdre le fichier non suivi '%s'"
-#: merge-recursive.c:763
+#: merge-recursive.c:762
#, c-format
msgid "cannot read object %s '%s'"
msgstr "impossible de lire l'objet %s '%s'"
-#: merge-recursive.c:765
+#: merge-recursive.c:764
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob attendu pour %s '%s'"
-#: merge-recursive.c:788 builtin/clone.c:364
+#: merge-recursive.c:787 builtin/clone.c:369
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: merge-recursive.c:796
+#: merge-recursive.c:795
#, c-format
msgid "failed to symlink '%s'"
msgstr "échec à la création du lien symbolique '%s'"
-#: merge-recursive.c:799
+#: merge-recursive.c:798
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "ne sait pas traiter %06o %s '%s'"
-#: merge-recursive.c:937
+#: merge-recursive.c:936
msgid "Failed to execute internal merge"
msgstr "Échec à l'exécution de la fusion interne"
-#: merge-recursive.c:941
+#: merge-recursive.c:940
#, c-format
msgid "Unable to add %s to database"
msgstr "Impossible d'ajouter %s à la base de données"
-#: merge-recursive.c:957
+#: merge-recursive.c:956
msgid "unsupported object type in the tree"
msgstr "type d'objet non supporté dans l'arbre"
-#: merge-recursive.c:1032 merge-recursive.c:1046
+#: merge-recursive.c:1031 merge-recursive.c:1045
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -825,7 +825,7 @@ msgstr ""
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre."
-#: merge-recursive.c:1038 merge-recursive.c:1051
+#: merge-recursive.c:1037 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -834,20 +834,20 @@ msgstr ""
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre dans le fichier %s."
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "rename"
msgstr "renommage"
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1148
+#: merge-recursive.c:1147
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"
-#: merge-recursive.c:1170
+#: merge-recursive.c:1169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -856,146 +856,146 @@ msgstr ""
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1174
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1229
+#: merge-recursive.c:1228
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
">'%s' dans %s"
-#: merge-recursive.c:1259
+#: merge-recursive.c:1258
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Renommage de %s en %s et de %s en %s à la place"
-#: merge-recursive.c:1458
+#: merge-recursive.c:1457
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
-#: merge-recursive.c:1468
+#: merge-recursive.c:1467
#, c-format
msgid "Adding merged %s"
msgstr "Ajout de %s fusionné"
-#: merge-recursive.c:1473 merge-recursive.c:1671
+#: merge-recursive.c:1472 merge-recursive.c:1674
#, c-format
msgid "Adding as %s instead"
msgstr "Ajout plutôt comme %s"
-#: merge-recursive.c:1524
+#: merge-recursive.c:1523
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-recursive.c:1527
+#: merge-recursive.c:1526
#, c-format
msgid "object %s is not a blob"
msgstr "l'objet %s n'est pas un blob"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modified"
msgstr "modifié"
-#: merge-recursive.c:1585
+#: merge-recursive.c:1588
msgid "content"
msgstr "contenu"
-#: merge-recursive.c:1592
+#: merge-recursive.c:1595
msgid "add/add"
msgstr "ajout/ajout"
-#: merge-recursive.c:1626
+#: merge-recursive.c:1629
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:1640
+#: merge-recursive.c:1643
#, c-format
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-recursive.c:1644 git-submodule.sh:1150
+#: merge-recursive.c:1647 git-submodule.sh:1025
msgid "submodule"
msgstr "sous-module"
-#: merge-recursive.c:1645
+#: merge-recursive.c:1648
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1734
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:1756
+#: merge-recursive.c:1759
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1765
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:1767
+#: merge-recursive.c:1770
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
-#: merge-recursive.c:1777
+#: merge-recursive.c:1780
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:1794
+#: merge-recursive.c:1797
msgid "Fatal merge failure, shouldn't happen."
msgstr "Échec fatal de fusion, qui ne devrait jamais arriver."
-#: merge-recursive.c:1813
+#: merge-recursive.c:1816
msgid "Already up-to-date!"
msgstr "Déjà à jour !"
-#: merge-recursive.c:1822
+#: merge-recursive.c:1825
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:1852
+#: merge-recursive.c:1855
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Chemin non traité ??? %s"
-#: merge-recursive.c:1900
+#: merge-recursive.c:1903
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:1913
+#: merge-recursive.c:1916
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u ancêtre commun trouvé :"
msgstr[1] "%u ancêtres communs trouvés :"
-#: merge-recursive.c:1950
+#: merge-recursive.c:1953
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:2007
+#: merge-recursive.c:2010
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:2018 builtin/merge.c:645
+#: merge-recursive.c:2021 builtin/merge.c:645
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
@@ -1025,31 +1025,41 @@ msgstr "Mauvaise valeur de %s : '%s'"
msgid "unable to parse object: %s"
msgstr "impossible d'analyser l'objet : %s"
-#: parse-options.c:563
+#: parse-options.c:570
msgid "..."
msgstr "..."
-#: parse-options.c:581
+#: parse-options.c:588
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:585
+#: parse-options.c:592
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:588
+#: parse-options.c:595
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:622
+#: parse-options.c:629
msgid "-NUM"
msgstr "-NUM"
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nom d'objet malformé '%s'"
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Impossible de rendre %s inscriptible pour le groupe"
+
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
@@ -1122,11 +1132,11 @@ msgstr ""
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
-#: progress.c:236
+#: progress.c:235
msgid "done"
msgstr "fait"
-#: read-cache.c:1296
+#: read-cache.c:1281
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -1135,7 +1145,7 @@ msgstr ""
"version d'index renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1306
+#: read-cache.c:1291
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1144,121 +1154,166 @@ msgstr ""
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
#: builtin/merge.c:983
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: refs.c:3001
+#: refs/files-backend.c:2359
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Impossible de supprimer la référence %s : %s"
-#: refs.c:3004
+#: refs/files-backend.c:2362
#, c-format
msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s"
-#: refs.c:3013
+#: refs/files-backend.c:2371
#, c-format
msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s"
-#: ref-filter.c:660
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "format : atome %%(end) utilisé sans atome correspondant"
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "valeur positive attendue contents:lines=%s"
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "format attendu : %%(color:<couleur>)"
+
+#: ref-filter.c:835
msgid "unable to parse format"
msgstr "impossible d'analyser le format"
-#: remote.c:792
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "format attendu : %%(align:<largeur>,<position>)"
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr "format non convenable align:%s"
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "valeur positive attendue avec l'atome %%(align)"
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "objet malformé à '%s'"
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: atome %%(end) manquant"
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr "nom d'objet malformé %s"
+
+#: remote.c:756
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Impossible de récupérer à la fois %s et %s pour %s"
-#: remote.c:796
+#: remote.c:760
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s suit habituellement %s, pas %s"
-#: remote.c:800
+#: remote.c:764
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s suit à la fois %s et %s"
-#: remote.c:808
+#: remote.c:772
msgid "Internal error"
msgstr "Erreur interne"
-#: remote.c:1723 remote.c:1766
+#: remote.c:1687 remote.c:1730
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: remote.c:1732
+#: remote.c:1696
#, c-format
msgid "no such branch: '%s'"
msgstr "pas de branche '%s'"
-#: remote.c:1735
+#: remote.c:1699
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "aucune branche amont configurée pour la branche '%s'"
-#: remote.c:1741
+#: remote.c:1705
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
-#: remote.c:1756
+#: remote.c:1720
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
"branche locale de suivi"
-#: remote.c:1771
+#: remote.c:1735
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branche '%s' n'a aucune branche distante de poussée"
-#: remote.c:1782
+#: remote.c:1746
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "les références de spec pour '%s' n'incluent pas '%s'"
-#: remote.c:1795
+#: remote.c:1759
msgid "push has no destination (push.default is 'nothing')"
msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
-#: remote.c:1817
+#: remote.c:1781
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
"impossible de résoudre une poussée 'simple' pour une destination unique"
-#: remote.c:2124
+#: remote.c:2083
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
-#: remote.c:2128
+#: remote.c:2087
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-#: remote.c:2131
+#: remote.c:2090
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Votre branche est à jour avec '%s'.\n"
-#: remote.c:2135
+#: remote.c:2094
#, 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] "Votre branche est en avance sur '%s' de %d commit.\n"
msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
-#: remote.c:2141
+#: remote.c:2100
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
-#: remote.c:2144
+#: remote.c:2103
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1270,11 +1325,11 @@ msgstr[1] ""
"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
"en avance rapide.\n"
-#: remote.c:2152
+#: remote.c:2111
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-#: remote.c:2155
+#: remote.c:2114
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1289,29 +1344,29 @@ msgstr[1] ""
"Votre branche et '%s' ont divergé,\n"
"et ont %d et %d commits différents chacune respectivement.\n"
-#: remote.c:2165
+#: remote.c:2124
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
-#: revision.c:2198
+#: revision.c:2193
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2201
+#: revision.c:2196
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
-#: revision.c:2395
+#: revision.c:2390
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent est incompatible avec --bisect"
-#: run-command.c:83
+#: run-command.c:90
msgid "open /dev/null failed"
msgstr "échec de l'ouverture de /dev/null"
-#: run-command.c:85
+#: run-command.c:92
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "échec de dup2(%d,%d)"
@@ -1531,7 +1586,7 @@ msgstr "impossible de résoudre HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:887 builtin/apply.c:4291
+#: sequencer.c:887 builtin/apply.c:4287
#, c-format
msgid "cannot open %s: %s"
msgstr "impossible d'ouvrir %s : %s"
@@ -1573,12 +1628,12 @@ msgstr "Impossible d'annuler en tant que commit initial"
msgid "Can't cherry-pick into empty head"
msgstr "Impossible de picorer vers une HEAD vide"
-#: setup.c:243
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
-#: sha1_name.c:453
+#: sha1_name.c:463
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1629,7 +1684,7 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
msgid "staging updated .gitmodules failed"
msgstr "échec de la mise en index du .gitmodules mis à jour"
-#: submodule.c:1045
+#: submodule.c:1040
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "Impossible de paramétrer core.worktree dans %s"
@@ -1640,7 +1695,7 @@ msgstr "Impossible de paramétrer core.worktree dans %s"
msgid "unknown value '%s' for key '%s'"
msgstr "valeur inconnue '%s' pour la clé '%s'"
-#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
#, c-format
msgid "more than one %s"
msgstr "plus d'un %s"
@@ -1707,8 +1762,8 @@ msgstr "impossible d'ouvrir '%s' en lecture/écriture"
msgid "could not open '%s' for writing"
msgstr "impossible d'ouvrir '%s' en écriture"
-#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
-#: builtin/merge.c:1076 builtin/pull.c:380
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
@@ -1723,32 +1778,21 @@ msgstr "impossible d'accéder à '%s' : %s"
msgid "unable to access '%s'"
msgstr "impossible d'accéder à '%s'"
-#: wrapper.c:611
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr ""
-"impossible de rechercher l'utilisateur actuel dans le fichier de mots de "
-"passe : %s"
-
-#: wrapper.c:612
-msgid "no such user"
-msgstr "utilisateur inconnu"
-
-#: wrapper.c:620
+#: wrapper.c:608
msgid "unable to get current working directory"
msgstr "impossible d'accéder au répertoire de travail courant"
-#: wrapper.c:631
+#: wrapper.c:635
#, c-format
msgid "could not open %s for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: wrapper.c:642 builtin/am.c:424
+#: wrapper.c:646 builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "Impossible d'écrire dans %s"
-#: wrapper.c:648
+#: wrapper.c:652
#, c-format
msgid "could not close %s"
msgstr "impossible de fermer %s"
@@ -1913,7 +1957,7 @@ msgid ""
"Everything below will be removed."
msgstr ""
"Ne touchez pas à la ligne ci-dessus\n"
-"Tout se qui suit sera éliminé."
+"Tout ce qui suit sera éliminé."
#: wt-status.c:948
msgid "You have unmerged paths."
@@ -2096,27 +2140,27 @@ msgstr "Vous êtes en cours de bissection."
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
-#: wt-status.c:1437
+#: wt-status.c:1438
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1445
+#: wt-status.c:1444
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1447
+#: wt-status.c:1446
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1452
+#: wt-status.c:1451
msgid "HEAD detached at "
msgstr "HEAD détachée sur "
-#: wt-status.c:1454
+#: wt-status.c:1453
msgid "HEAD detached from "
msgstr "HEAD détachée depuis "
-#: wt-status.c:1457
+#: wt-status.c:1456
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
@@ -2207,24 +2251,24 @@ msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
msgid "nothing to commit, working directory clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:1644
-msgid "HEAD (no branch)"
-msgstr "HEAD (aucune branche)"
-
-#: wt-status.c:1650
+#: wt-status.c:1642
msgid "Initial commit on "
msgstr "Validation initiale sur "
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
+msgstr "HEAD (aucune branche)"
+
# à priori on parle d'une branche ici
-#: wt-status.c:1677
+#: wt-status.c:1675
msgid "gone"
msgstr "disparue"
-#: wt-status.c:1679 wt-status.c:1687
+#: wt-status.c:1677 wt-status.c:1685
msgid "behind "
msgstr "derrière "
-#: compat/precompose_utf8.c:55 builtin/clone.c:403
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec lors de l'unlink de '%s'"
@@ -2238,7 +2282,7 @@ msgstr "git add [<options>] [--] <chemin>..."
msgid "unexpected diff status %c"
msgstr "status de diff inattendu %c"
-#: builtin/add.c:70 builtin/commit.c:277
+#: builtin/add.c:70 builtin/commit.c:278
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
@@ -2251,7 +2295,7 @@ msgstr "suppression de '%s'\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:194 builtin/rev-parse.c:799
+#: builtin/add.c:194 builtin/rev-parse.c:796
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
@@ -2287,15 +2331,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
-#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
-#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
-#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "mode verbeux"
@@ -2303,7 +2347,7 @@ msgstr "mode verbeux"
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
@@ -2364,149 +2408,150 @@ msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
-#: builtin/add.c:358
+#: builtin/add.c:352
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:359
+#: builtin/add.c:353
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
-#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
-#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: builtin/am.c:41
+#: builtin/am.c:42
#, c-format
msgid "could not stat %s"
msgstr "stat impossible de %s"
-#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737 builtin/merge.c:1079
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/am.c:444
+#: builtin/am.c:445
msgid "could not parse author script"
msgstr "impossible d'analyser le script author"
-#: builtin/am.c:521
+#: builtin/am.c:522
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:562 builtin/notes.c:300
+#: builtin/am.c:563 builtin/notes.c:300
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:599 builtin/notes.c:315
+#: builtin/am.c:600 builtin/notes.c:315
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:625
+#: builtin/am.c:626
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:786 builtin/am.c:874
+#: builtin/am.c:787 builtin/am.c:875
#, c-format
msgid "could not open '%s' for reading: %s"
msgstr "impossible d'ouvrir '%s' en lecture : %s"
-#: builtin/am.c:793
+#: builtin/am.c:794
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "impossible d'ouvrir '%s' en écriture : %s"
-#: builtin/am.c:802
+#: builtin/am.c:803
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:867
+#: builtin/am.c:868
msgid "Only one StGIT patch series can be applied at once"
msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"
-#: builtin/am.c:915
+#: builtin/am.c:916
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:918 builtin/am.c:926
+#: builtin/am.c:919 builtin/am.c:927
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:923
+#: builtin/am.c:924
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:1010
+#: builtin/am.c:1011
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:1015 builtin/clone.c:368
+#: builtin/am.c:1016 builtin/clone.c:373
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:1019
+#: builtin/am.c:1020
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1151 builtin/commit.c:362
+#: builtin/am.c:1152 builtin/commit.c:363
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1202
+#: builtin/am.c:1203
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
-#: builtin/am.c:1203
+#: builtin/am.c:1204
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
-#: builtin/am.c:1204
+#: builtin/am.c:1205
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
"abort\"."
-#: builtin/am.c:1339
+#: builtin/am.c:1343
msgid "Patch is empty. Was it split wrong?"
msgstr "Le patch est vide. Le découpage était-il bon ?"
-#: builtin/am.c:1413 builtin/log.c:1345
+#: builtin/am.c:1417 builtin/log.c:1347
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/am.c:1440
+#: builtin/am.c:1444
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: builtin/am.c:1614
+#: builtin/am.c:1646
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
"points."
-#: builtin/am.c:1616
+#: builtin/am.c:1648
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
-#: builtin/am.c:1635
+#: builtin/am.c:1667
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2514,38 +2559,38 @@ msgstr ""
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1641
+#: builtin/am.c:1673
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1666
+#: builtin/am.c:1688
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1691 builtin/merge.c:632
+#: builtin/am.c:1712 builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: builtin/am.c:1698
+#: builtin/am.c:1719
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
#: builtin/merge.c:854
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: builtin/am.c:1743 builtin/am.c:1747
+#: builtin/am.c:1764 builtin/am.c:1768
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1763
+#: builtin/am.c:1784
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"impossible d'être interactif sans entrée standard connectée à un terminal."
-#: builtin/am.c:1768
+#: builtin/am.c:1789
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
@@ -2553,35 +2598,35 @@ msgstr "Le corps de la validation est :"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1778
+#: builtin/am.c:1799
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
-#: builtin/am.c:1828
+#: builtin/am.c:1849
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1863 builtin/am.c:1934
+#: builtin/am.c:1884 builtin/am.c:1955
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1879
+#: builtin/am.c:1900
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1887
+#: builtin/am.c:1908
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1893
+#: builtin/am.c:1914
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La copie du patch qui a échoué se trouve dans : %s"
-#: builtin/am.c:1937
+#: builtin/am.c:1958
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2592,7 +2637,7 @@ msgstr ""
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1944
+#: builtin/am.c:1965
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2600,17 +2645,17 @@ msgstr ""
"Vous avez toujours des chemins non fusionnés dans votre index\n"
"Auriez-vous oublié de faire 'git add' ?"
-#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2104
+#: builtin/am.c:2125
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2138
+#: builtin/am.c:2159
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2618,152 +2663,154 @@ msgstr ""
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2199
+#: builtin/am.c:2220
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2221
-msgid "git am [options] [(<mbox>|<Maildir>)...]"
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<options>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2222
-msgid "git am [options] (--continue | --skip | --abort)"
-msgstr "git am [options] (--continue | --quit | -- abort)\""
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<options>] (--continue | --quit | --abort)"
-#: builtin/am.c:2228
+#: builtin/am.c:2260
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2230
+#: builtin/am.c:2262
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2232
+#: builtin/am.c:2264
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2235
+#: builtin/am.c:2267
msgid "add a Signed-off-by line to the commit message"
msgstr "ajouter une ligne Signed-off-by au message de validation"
-#: builtin/am.c:2238
+#: builtin/am.c:2270
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2240
+#: builtin/am.c:2272
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2242
+#: builtin/am.c:2274
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2244
+#: builtin/am.c:2276
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2246
+#: builtin/am.c:2278
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
-#: builtin/am.c:2249
+#: builtin/am.c:2281
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
-#: builtin/am.c:2252
+#: builtin/am.c:2284
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2253 builtin/apply.c:4563
+#: builtin/am.c:2285 builtin/apply.c:4554
msgid "action"
msgstr "action"
-#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2281
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2262 builtin/apply.c:4587
+#: builtin/am.c:2294 builtin/apply.c:4578
msgid "root"
msgstr "racine"
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525
-#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
-#: builtin/pull.c:167
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
msgid "path"
msgstr "chemin"
-#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
-#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
-#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
-#: parse-options.h:134 parse-options.h:243
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2274 builtin/apply.c:4531
+#: builtin/am.c:2306 builtin/apply.c:4522
msgid "num"
msgstr "num"
-#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
msgid "format"
msgstr "format"
-#: builtin/am.c:2278
+#: builtin/am.c:2310
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2284
+#: builtin/am.c:2316
msgid "override error message when patch failure occurs"
msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
-#: builtin/am.c:2286
+#: builtin/am.c:2318
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2289
+#: builtin/am.c:2321
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2292
+#: builtin/am.c:2324
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2295
+#: builtin/am.c:2327
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2299
+#: builtin/am.c:2331
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2301
+#: builtin/am.c:2333
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225
-#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "id de clé"
-#: builtin/am.c:2304
+#: builtin/am.c:2336
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2307
+#: builtin/am.c:2339
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2322
+#: builtin/am.c:2354
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -2771,17 +2818,17 @@ msgstr ""
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/am.c:2329
+#: builtin/am.c:2361
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2344
+#: builtin/am.c:2376
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
-#: builtin/am.c:2368
+#: builtin/am.c:2400
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2790,7 +2837,7 @@ msgstr ""
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2374
+#: builtin/am.c:2406
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
"Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
@@ -2800,69 +2847,69 @@ msgstr ""
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<options>] [<patch>...]"
-#: builtin/apply.c:112
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "option d'espace non reconnue '%s'"
-#: builtin/apply.c:127
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "option d'ignorance d'espace non reconnue '%s'"
-#: builtin/apply.c:822
+#: builtin/apply.c:818
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Impossible de préparer la regexp d'horodatage %s"
-#: builtin/apply.c:831
+#: builtin/apply.c:827
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec a retourné %d pour l'entrée : %s"
-#: builtin/apply.c:912
+#: builtin/apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "nom de fichier du patch introuvable à la ligne %d"
-#: builtin/apply.c:944
+#: builtin/apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
"ligne %d"
-#: builtin/apply.c:948
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
"à la ligne %d"
-#: builtin/apply.c:949
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
"à la ligne %d"
-#: builtin/apply.c:956
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
-#: builtin/apply.c:1419
+#: builtin/apply.c:1415
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recomptage : ligne inattendue : %.*s"
-#: builtin/apply.c:1476
+#: builtin/apply.c:1472
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
-#: builtin/apply.c:1493
+#: builtin/apply.c:1489
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2877,77 +2924,77 @@ msgstr[1] ""
"information de nom de fichier manquante dans l'en-tête de git diff lors de "
"la suppression de %d composants de préfixe de chemin (ligne %d)"
-#: builtin/apply.c:1659
+#: builtin/apply.c:1655
msgid "new file depends on old contents"
msgstr "le nouveau fichier dépend de contenus anciens"
-#: builtin/apply.c:1661
+#: builtin/apply.c:1657
msgid "deleted file still has contents"
msgstr "le fichier supprimé a encore du contenu"
-#: builtin/apply.c:1687
+#: builtin/apply.c:1683
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch corrompu à la ligne %d"
-#: builtin/apply.c:1723
+#: builtin/apply.c:1719
#, c-format
msgid "new file %s depends on old contents"
msgstr "le nouveau fichier %s dépend de contenus anciens"
-#: builtin/apply.c:1725
+#: builtin/apply.c:1721
#, c-format
msgid "deleted file %s still has contents"
msgstr "le fichier supprimé %s a encore du contenu"
-#: builtin/apply.c:1728
+#: builtin/apply.c:1724
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
-#: builtin/apply.c:1874
+#: builtin/apply.c:1870
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binaire corrompu à la ligne %d : %.*s"
-#: builtin/apply.c:1903
+#: builtin/apply.c:1899
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binaire non reconnu à la ligne %d"
-#: builtin/apply.c:2054
+#: builtin/apply.c:2050
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch totalement incompréhensible à la ligne %d"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2140
#, c-format
msgid "unable to read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: builtin/apply.c:2148
+#: builtin/apply.c:2144
#, c-format
msgid "unable to open or read %s"
msgstr "ouverture ou lecture de %s impossible"
-#: builtin/apply.c:2781
+#: builtin/apply.c:2777
#, c-format
msgid "invalid start of line: '%c'"
msgstr "début de ligne invalide : '%c'"
-#: builtin/apply.c:2900
+#: builtin/apply.c:2896
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."
msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."
-#: builtin/apply.c:2912
+#: builtin/apply.c:2908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
-#: builtin/apply.c:2918
+#: builtin/apply.c:2914
#, c-format
msgid ""
"while searching for:\n"
@@ -2956,330 +3003,330 @@ msgstr ""
"pendant la recherche de :\n"
"%.*s"
-#: builtin/apply.c:2938
+#: builtin/apply.c:2934
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3035
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: builtin/apply.c:3045
+#: builtin/apply.c:3041
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
"trouvé)"
-#: builtin/apply.c:3066
+#: builtin/apply.c:3062
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
-#: builtin/apply.c:3190
+#: builtin/apply.c:3186
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
#, c-format
msgid "read of %s failed"
msgstr "échec de la lecture de %s"
-#: builtin/apply.c:3243
+#: builtin/apply.c:3239
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-#: builtin/apply.c:3271 builtin/apply.c:3493
+#: builtin/apply.c:3267 builtin/apply.c:3489
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
-#: builtin/apply.c:3352 builtin/apply.c:3507
+#: builtin/apply.c:3348 builtin/apply.c:3503
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
#, c-format
msgid "%s: %s"
msgstr "%s : %s"
-#: builtin/apply.c:3361 builtin/apply.c:3515
+#: builtin/apply.c:3357 builtin/apply.c:3511
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
-#: builtin/apply.c:3463
+#: builtin/apply.c:3459
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: builtin/apply.c:3532
+#: builtin/apply.c:3528
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
-#: builtin/apply.c:3534
+#: builtin/apply.c:3530
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: builtin/apply.c:3693 builtin/apply.c:3695
+#: builtin/apply.c:3689 builtin/apply.c:3691
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
-#: builtin/apply.c:3750
+#: builtin/apply.c:3746
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: builtin/apply.c:3753
+#: builtin/apply.c:3749
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: builtin/apply.c:3773
+#: builtin/apply.c:3769
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
-#: builtin/apply.c:3778
+#: builtin/apply.c:3774
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3794
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-#: builtin/apply.c:3802
+#: builtin/apply.c:3798
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: builtin/apply.c:3816
+#: builtin/apply.c:3812
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
-#: builtin/apply.c:4052
+#: builtin/apply.c:4048
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4077
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: builtin/apply.c:4085
+#: builtin/apply.c:4081
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: builtin/apply.c:4090
+#: builtin/apply.c:4086
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"création du magasin de stockage pour le fichier nouvellement créé %s "
"impossible"
-#: builtin/apply.c:4093 builtin/apply.c:4201
+#: builtin/apply.c:4089 builtin/apply.c:4197
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: builtin/apply.c:4126
+#: builtin/apply.c:4122
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: builtin/apply.c:4175
+#: builtin/apply.c:4171
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: builtin/apply.c:4262
+#: builtin/apply.c:4258
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: builtin/apply.c:4270
+#: builtin/apply.c:4266
msgid "internal error"
msgstr "erreur interne"
-#: builtin/apply.c:4273
+#: builtin/apply.c:4269
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Application du patch %%s avec %d rejet..."
msgstr[1] "Application du patch %%s avec %d rejets..."
-#: builtin/apply.c:4283
+#: builtin/apply.c:4279
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: builtin/apply.c:4304
+#: builtin/apply.c:4300
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: builtin/apply.c:4307
+#: builtin/apply.c:4303
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: builtin/apply.c:4397
+#: builtin/apply.c:4393
msgid "unrecognized input"
msgstr "entrée non reconnue"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4404
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4517
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: builtin/apply.c:4529
+#: builtin/apply.c:4520
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4523
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: builtin/apply.c:4535
+#: builtin/apply.c:4526
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: builtin/apply.c:4537
+#: builtin/apply.c:4528
msgid "instead of applying the patch, output diffstat for the input"
msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
-#: builtin/apply.c:4541
+#: builtin/apply.c:4532
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4534
msgid "instead of applying the patch, output a summary for the input"
msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4536
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4538
msgid "make sure the patch is applicable to the current index"
msgstr "s'assurer que le patch est applicable sur l'index actuel"
-#: builtin/apply.c:4549
+#: builtin/apply.c:4540
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: builtin/apply.c:4551
+#: builtin/apply.c:4542
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: builtin/apply.c:4553
+#: builtin/apply.c:4544
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
-#: builtin/apply.c:4555
+#: builtin/apply.c:4546
msgid "attempt three-way merge if a patch does not apply"
msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
-#: builtin/apply.c:4557
+#: builtin/apply.c:4548
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4553
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: builtin/apply.c:4564
+#: builtin/apply.c:4555
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
"d'espace"
-#: builtin/apply.c:4567 builtin/apply.c:4570
+#: builtin/apply.c:4558 builtin/apply.c:4561
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: builtin/apply.c:4573
+#: builtin/apply.c:4564
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: builtin/apply.c:4575
+#: builtin/apply.c:4566
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: builtin/apply.c:4577
+#: builtin/apply.c:4568
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: builtin/apply.c:4579
+#: builtin/apply.c:4570
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: builtin/apply.c:4582
+#: builtin/apply.c:4573
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolérer des erreurs de détection de retours chariot manquants en fin de "
"fichier"
-#: builtin/apply.c:4585
+#: builtin/apply.c:4576
msgid "do not trust the line counts in the hunk headers"
msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
-#: builtin/apply.c:4588
+#: builtin/apply.c:4579
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
-#: builtin/apply.c:4610
+#: builtin/apply.c:4601
msgid "--3way outside a repository"
msgstr "--3way hors d'un dépôt"
-#: builtin/apply.c:4618
+#: builtin/apply.c:4609
msgid "--index outside a repository"
msgstr "--index hors d'un dépôt"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4612
msgid "--cached outside a repository"
msgstr "--cached hors d'un dépôt"
-#: builtin/apply.c:4640
+#: builtin/apply.c:4631
#, c-format
msgid "can't open patch '%s'"
msgstr "ouverture impossible du patch '%s'"
-#: builtin/apply.c:4654
+#: builtin/apply.c:4645
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d erreur d'espace ignorée"
msgstr[1] "%d erreurs d'espace ignorées"
-#: builtin/apply.c:4660 builtin/apply.c:4670
+#: builtin/apply.c:4651 builtin/apply.c:4661
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3341,100 +3388,100 @@ msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
-#: builtin/blame.c:2500
+#: builtin/blame.c:2519
msgid "Show blame entries as we find them, incrementally"
msgstr ""
"Montrer les éléments de blâme au fur et à mesure de leur découverte, de "
"manière incrémentale"
-#: builtin/blame.c:2501
+#: builtin/blame.c:2520
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"
-#: builtin/blame.c:2502
+#: builtin/blame.c:2521
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
-#: builtin/blame.c:2503
+#: builtin/blame.c:2522
msgid "Show work cost statistics"
msgstr "Montrer les statistiques de coût d'activité"
-#: builtin/blame.c:2504
+#: builtin/blame.c:2523
msgid "Show output score for blame entries"
msgstr "Montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:2505
+#: builtin/blame.c:2524
msgid "Show original filename (Default: auto)"
msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:2506
+#: builtin/blame.c:2525
msgid "Show original linenumber (Default: off)"
msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:2507
+#: builtin/blame.c:2526
msgid "Show in a format designed for machine consumption"
msgstr "Afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:2508
+#: builtin/blame.c:2527
msgid "Show porcelain format with per-line commit information"
msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:2509
+#: builtin/blame.c:2528
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"
-#: builtin/blame.c:2510
+#: builtin/blame.c:2529
msgid "Show raw timestamp (Default: off)"
msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:2511
+#: builtin/blame.c:2530
msgid "Show long commit SHA1 (Default: off)"
msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:2512
+#: builtin/blame.c:2531
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"
-#: builtin/blame.c:2513
+#: builtin/blame.c:2532
msgid "Show author email instead of name (Default: off)"
msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"
-#: builtin/blame.c:2514
+#: builtin/blame.c:2533
msgid "Ignore whitespace differences"
msgstr "Ignorer les différences d'espace"
-#: builtin/blame.c:2515
+#: builtin/blame.c:2534
msgid "Spend extra cycles to find better match"
msgstr ""
"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:2516
+#: builtin/blame.c:2535
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
"Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
-#: builtin/blame.c:2517
+#: builtin/blame.c:2536
msgid "Use <file>'s contents as the final image"
msgstr "Utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:2518 builtin/blame.c:2519
+#: builtin/blame.c:2537 builtin/blame.c:2538
msgid "score"
msgstr "score"
-#: builtin/blame.c:2518
+#: builtin/blame.c:2537
msgid "Find line copies within and across files"
msgstr "Trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:2519
+#: builtin/blame.c:2538
msgid "Find line movements within and across files"
msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "Process only line range n,m, counting from 1"
msgstr ""
"Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"
@@ -3445,28 +3492,32 @@ msgstr ""
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2601
+#: builtin/blame.c:2620
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
-#: builtin/branch.c:24
+#: builtin/branch.c:25
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
"git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
-#: builtin/branch.c:150
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<options>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:142
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3475,7 +3526,7 @@ msgstr ""
"suppression de la branche '%s' qui a été fusionnée dans\n"
" '%s', mais pas dans HEAD."
-#: builtin/branch.c:154
+#: builtin/branch.c:146
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3484,12 +3535,12 @@ msgstr ""
"branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
" '%s', même si elle est fusionnée dans HEAD."
-#: builtin/branch.c:168
+#: builtin/branch.c:160
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Impossible de rechercher l'objet commit pour '%s'"
-#: builtin/branch.c:172
+#: builtin/branch.c:164
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3498,309 +3549,301 @@ msgstr ""
"La branche '%s' n'est pas totalement fusionnée.\n"
"Si vous êtes sur que vous voulez la supprimer, lancez 'git branch -D %s'."
-#: builtin/branch.c:185
+#: builtin/branch.c:177
msgid "Update of config-file failed"
msgstr "Échec de la mise à jour du fichier de configuration"
-#: builtin/branch.c:213
+#: builtin/branch.c:205
msgid "cannot use -a with -d"
msgstr "impossible d'utiliser -a avec -d"
-#: builtin/branch.c:219
+#: builtin/branch.c:211
msgid "Couldn't look up commit object for HEAD"
msgstr "Impossible de rechercher l'objet commit pour HEAD"
-#: builtin/branch.c:227
+#: builtin/branch.c:219
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "Impossible de supprimer la branche '%s' sur laquelle vous êtes."
-#: builtin/branch.c:243
+#: builtin/branch.c:235
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "branche de suivi '%s' non trouvée."
-#: builtin/branch.c:244
+#: builtin/branch.c:236
#, c-format
msgid "branch '%s' not found."
msgstr "branche '%s' non trouvée."
-#: builtin/branch.c:259
+#: builtin/branch.c:251
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
-#: builtin/branch.c:260
+#: builtin/branch.c:252
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Erreur lors de la suppression de la branche '%s'"
-#: builtin/branch.c:267
+#: builtin/branch.c:259
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:268
+#: builtin/branch.c:260
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:369
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr "la branche '%s' ne pointe pas sur un commit"
-
# féminin pour une branche
-#: builtin/branch.c:452
+#: builtin/branch.c:303
#, c-format
msgid "[%s: gone]"
msgstr "[%s: disparue]"
-#: builtin/branch.c:457
+#: builtin/branch.c:308
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:462
+#: builtin/branch.c:313
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: en retard de %d]"
-#: builtin/branch.c:464
+#: builtin/branch.c:315
#, c-format
msgid "[behind %d]"
msgstr "[en retard de %d]"
-#: builtin/branch.c:468
+#: builtin/branch.c:319
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s : en avance de %d]"
-#: builtin/branch.c:470
+#: builtin/branch.c:321
#, c-format
msgid "[ahead %d]"
msgstr "[en avance de %d]"
-#: builtin/branch.c:473
+#: builtin/branch.c:324
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s : en avance de %d, en retard de %d]"
-#: builtin/branch.c:476
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[en avance de %d, en retard de %d]"
-#: builtin/branch.c:489
+#: builtin/branch.c:340
msgid " **** invalid ref ****"
msgstr " **** référence invalide ****"
-#: builtin/branch.c:580
+#: builtin/branch.c:366
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(aucune branche, rebasage de %s)"
-#: builtin/branch.c:583
+#: builtin/branch.c:369
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(aucune branche, bisect a démarré sur %s)"
-#: builtin/branch.c:589
+#: builtin/branch.c:375
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD détachée sur %s)"
-#: builtin/branch.c:592
+#: builtin/branch.c:378
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD détachée depuis %s)"
-#: builtin/branch.c:596
+#: builtin/branch.c:382
msgid "(no branch)"
msgstr "(aucune branche)"
-#: builtin/branch.c:643
-#, c-format
-msgid "object '%s' does not point to a commit"
-msgstr "l'objet '%s' ne pointe pas sur un commit"
-
-#: builtin/branch.c:691
-msgid "some refs could not be read"
-msgstr "des références n'ont pas pu être lues"
-
-#: builtin/branch.c:704
+#: builtin/branch.c:524
msgid "cannot rename the current branch while not on any."
msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:714
+#: builtin/branch.c:534
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:729
+#: builtin/branch.c:549
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:733
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Renommage d'un branche mal nommée '%s'"
-#: builtin/branch.c:737
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
-#: builtin/branch.c:744
+#: builtin/branch.c:564
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branche est renommée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:759
-#, c-format
-msgid "malformed object name %s"
-msgstr "nom d'objet malformé %s"
-
-#: builtin/branch.c:781
+#: builtin/branch.c:587
#, c-format
msgid "could not write branch description template: %s"
msgstr "impossible d'écrire le modèle de description de branche : %s"
-#: builtin/branch.c:811
+#: builtin/branch.c:616
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:813
+#: builtin/branch.c:618
msgid "show hash and subject, give twice for upstream branch"
msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
-#: builtin/branch.c:814
+#: builtin/branch.c:619
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:815
+#: builtin/branch.c:620
msgid "set up tracking mode (see git-pull(1))"
msgstr "régler le mode de suivi (voir git-pull(1))"
-#: builtin/branch.c:817
+#: builtin/branch.c:622
msgid "change upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:821
+#: builtin/branch.c:626
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:822
+#: builtin/branch.c:627
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
-#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
-#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
-#: builtin/tag.c:624
-msgid "commit"
-msgstr "commit"
-
-#: builtin/branch.c:826 builtin/branch.c:832
+#: builtin/branch.c:629 builtin/branch.c:630
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:838
+#: builtin/branch.c:633
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:839
+#: builtin/branch.c:634
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:841
+#: builtin/branch.c:636
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:842
+#: builtin/branch.c:637
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:843
+#: builtin/branch.c:638
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:844
+#: builtin/branch.c:639
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:845
+#: builtin/branch.c:640
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:846
+#: builtin/branch.c:641
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:848
+#: builtin/branch.c:643
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:849
+#: builtin/branch.c:644
msgid "force creation, move/rename, deletion"
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
-#: builtin/branch.c:852
-msgid "print only not merged branches"
-msgstr "afficher seulement les branches non fusionnées"
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
+msgstr "afficher seulement les branches qui sont fusionnées"
-#: builtin/branch.c:858
-msgid "print only merged branches"
-msgstr "afficher seulement les branches fusionnées"
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
+msgstr "afficher seulement les branches qui ne sont pas fusionnées"
-#: builtin/branch.c:862
+#: builtin/branch.c:647
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:875
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr "clé"
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr "nom du champ servant à trier"
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr "objet"
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr "afficher seulement les branches de l'objet"
+
+#: builtin/branch.c:670
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
-#: builtin/branch.c:879 builtin/clone.c:690
+#: builtin/branch.c:674 builtin/clone.c:697
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:901
+#: builtin/branch.c:694
msgid "--column and --verbose are incompatible"
msgstr "--column et --verbose sont incompatibles"
-#: builtin/branch.c:912 builtin/branch.c:951
+#: builtin/branch.c:705 builtin/branch.c:747
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:927
+#: builtin/branch.c:723
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:932
+#: builtin/branch.c:728
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:939
+#: builtin/branch.c:735
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:942
+#: builtin/branch.c:738
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:957
+#: builtin/branch.c:753
msgid "too many branches for a rename operation"
msgstr "trop de branches pour une opération de renommage"
-#: builtin/branch.c:962
+#: builtin/branch.c:758
msgid "too many branches to set new upstream"
msgstr "trop de branches pour spécifier une branche amont"
-#: builtin/branch.c:966
+#: builtin/branch.c:762
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3808,41 +3851,41 @@ msgstr ""
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
"aucune branche."
-#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:973
+#: builtin/branch.c:769
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:985
+#: builtin/branch.c:781
msgid "too many branches to unset upstream"
msgstr "trop de branches pour désactiver un amont"
-#: builtin/branch.c:989
+#: builtin/branch.c:785
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
"aucune branche."
-#: builtin/branch.c:995
+#: builtin/branch.c:791
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:1009
+#: builtin/branch.c:805
msgid "it does not make sense to create 'HEAD' manually"
msgstr "créer manuellement 'HEAD' n'a pas de sens"
-#: builtin/branch.c:1015
+#: builtin/branch.c:811
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
-#: builtin/branch.c:1018
+#: builtin/branch.c:814
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3851,7 +3894,7 @@ msgstr ""
"l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"
"track ou --set-upstream-to\n"
-#: builtin/branch.c:1035
+#: builtin/branch.c:831
#, c-format
msgid ""
"\n"
@@ -3862,12 +3905,12 @@ msgstr ""
"Si vous vouliez que '%s' suive '%s', faîtes ceci :\n"
"\n"
-#: builtin/branch.c:1036
+#: builtin/branch.c:832
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1037
+#: builtin/branch.c:833
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3894,11 +3937,8 @@ msgstr ""
"| <type> | --textconv) <objet>"
#: builtin/cat-file.c:429
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
-"objects>"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <liste-d-objets>"
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
#: builtin/cat-file.c:466
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -3956,9 +3996,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..."
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
-msgstr ""
-"git check-attr --stdin [-z] [-a | --all | <attr>...] < <liste-de-chemins>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@ -3977,7 +4016,7 @@ msgid "terminate input and output records by a NUL character"
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
@@ -4065,6 +4104,8 @@ msgid "write the content to temporary files"
msgstr "écrire le contenu dans des fichiers temporaires"
#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
msgid "string"
msgstr "chaîne"
@@ -4084,107 +4125,107 @@ msgstr "git checkout [<options>] <branche>"
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<options>] [<branche>] -- <fichier>..."
-#: builtin/checkout.c:133 builtin/checkout.c:166
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
msgid "path '%s' does not have our version"
msgstr "le chemin '%s' n'a pas notre version"
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have their version"
msgstr "le chemin '%s' n'a pas leur version"
-#: builtin/checkout.c:151
+#: builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "le chemin '%s' n'a aucune des versions nécessaires"
-#: builtin/checkout.c:195
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "le chemin '%s' n'a pas les versions nécessaires"
-#: builtin/checkout.c:212
+#: builtin/checkout.c:213
#, c-format
msgid "path '%s': cannot merge"
msgstr "chemin '%s' : impossible de fusionner"
-#: builtin/checkout.c:229
+#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:263 builtin/checkout.c:266
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' ne peut pas être utilisé avec %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:269
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
"même temps."
-#: builtin/checkout.c:279 builtin/checkout.c:473
+#: builtin/checkout.c:280 builtin/checkout.c:474
msgid "corrupt index file"
msgstr "fichier d'index corrompu"
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:496
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:623
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:661
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:667
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:670
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:676 builtin/checkout.c:1065
+#: builtin/checkout.c:677 builtin/checkout.c:1066
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:678
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:730
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4207,7 +4248,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:755
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4236,145 +4277,151 @@ msgstr[1] ""
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:791
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:822 builtin/checkout.c:1060
+#: builtin/checkout.c:823 builtin/checkout.c:1061
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:967
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1006 builtin/worktree.c:210
+#: builtin/checkout.c:1007 builtin/worktree.c:213
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1035
+#: builtin/checkout.c:1036
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1074
+#: builtin/checkout.c:1075
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1077 builtin/checkout.c:1081
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
-#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1102
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
-#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
-#: builtin/worktree.c:319
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1136
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1138
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1139
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1140
msgid "detach the HEAD at named commit"
msgstr "détacher la HEAD à la validation nommée"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1141
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1146
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1148
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1149
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1149 builtin/merge.c:227
+#: builtin/checkout.c:1150 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
+#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1152
msgid "conflict style (merge or diff3)"
msgstr "style de conflit (fusion ou diff3)"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1155
msgid "do not limit pathspecs to sparse entries only"
msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1157
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1159
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"ne pas vérifier si une autre copie de travail contient le référence fournie"
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr "forcer l'affichage de l'état d'avancement"
+
+#: builtin/checkout.c:1191
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1198
+#: builtin/checkout.c:1208
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1213
msgid "Missing branch name; try -b"
msgstr "Nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1239
+#: builtin/checkout.c:1249
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1256
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4384,12 +4431,12 @@ msgstr ""
"en même temps.\n"
"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1261
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1265
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4428,7 +4475,7 @@ msgstr "Ignorerait le dépôt %s\n"
msgid "failed to remove %s"
msgstr "échec de la suppression de %s"
-#: builtin/clean.c:317
+#: builtin/clean.c:315
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -4440,7 +4487,7 @@ msgstr ""
"foo - sélectionner un élément par un préfixe unique\n"
" - (vide) ne rien sélectionner"
-#: builtin/clean.c:321
+#: builtin/clean.c:319
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -4460,36 +4507,36 @@ msgstr ""
"* - choisir tous les éléments\n"
" - (vide) terminer la sélection"
-#: builtin/clean.c:537
+#: builtin/clean.c:535
#, c-format
msgid "Huh (%s)?"
msgstr "Hein (%s) ?"
-#: builtin/clean.c:679
+#: builtin/clean.c:677
#, c-format
msgid "Input ignore patterns>> "
msgstr "Entrez les motifs à ignorer>> "
-#: builtin/clean.c:716
+#: builtin/clean.c:714
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
-#: builtin/clean.c:737
+#: builtin/clean.c:735
msgid "Select items to delete"
msgstr "Sélectionner les éléments à supprimer"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:778
+#: builtin/clean.c:776
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Supprimer %s [y/N] ? "
-#: builtin/clean.c:803
+#: builtin/clean.c:801
msgid "Bye."
msgstr "Au revoir."
-#: builtin/clean.c:811
+#: builtin/clean.c:809
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -4507,62 +4554,62 @@ msgstr ""
"help - cet écran\n"
"? - aide pour la sélection en ligne"
-#: builtin/clean.c:838
+#: builtin/clean.c:836
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: builtin/clean.c:839
+#: builtin/clean.c:837
msgid "What now"
msgstr "Et maintenant ?"
-#: builtin/clean.c:847
+#: builtin/clean.c:845
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Supprimerait l'élément suivant :"
msgstr[1] "Supprimerait les éléments suivants :"
-#: builtin/clean.c:864
+#: builtin/clean.c:862
msgid "No more files to clean, exiting."
msgstr "Plus de fichier à nettoyer, sortie."
-#: builtin/clean.c:895
+#: builtin/clean.c:893
msgid "do not print names of files removed"
msgstr "ne pas afficher les noms des fichiers supprimés"
-#: builtin/clean.c:897
+#: builtin/clean.c:895
msgid "force"
msgstr "forcer"
-#: builtin/clean.c:898
+#: builtin/clean.c:896
msgid "interactive cleaning"
msgstr "nettoyage interactif"
-#: builtin/clean.c:900
+#: builtin/clean.c:898
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
msgid "pattern"
msgstr "motif"
-#: builtin/clean.c:902
+#: builtin/clean.c:900
msgid "add <pattern> to ignore rules"
msgstr "ajouter <motif> aux règles ignore"
-#: builtin/clean.c:903
+#: builtin/clean.c:901
msgid "remove ignored files, too"
msgstr "supprimer les fichiers ignorés, aussi"
-#: builtin/clean.c:905
+#: builtin/clean.c:903
msgid "remove only ignored files"
msgstr "supprimer seulement les fichiers ignorés"
-#: builtin/clean.c:923
+#: builtin/clean.c:921
msgid "-x and -X cannot be used together"
msgstr "-x et -X ne peuvent pas être utilisés ensemble"
-#: builtin/clean.c:927
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -4570,7 +4617,7 @@ msgstr ""
"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:930
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -4582,16 +4629,11 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
-#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
-msgid "force progress reporting"
-msgstr "forcer l'affichage de l'état d'avancement"
-
#: builtin/clone.c:59
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
msgid "create a bare repository"
msgstr "créer un dépôt nu"
@@ -4615,15 +4657,15 @@ msgstr "régler comme dépôt partagé"
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:75 builtin/init-db.c:501
+#: builtin/clone.c:75 builtin/init-db.c:466
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:76 builtin/init-db.c:502
+#: builtin/clone.c:76 builtin/init-db.c:467
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:78
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
msgid "reference repository"
msgstr "dépôt de référence"
@@ -4647,7 +4689,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659 builtin/pull.c:186
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186
msgid "depth"
msgstr "profondeur"
@@ -4659,11 +4701,11 @@ msgstr "créer un clone superficiel de cette profondeur"
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
-#: builtin/clone.c:91 builtin/init-db.c:510
+#: builtin/clone.c:91 builtin/init-db.c:475
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:92 builtin/init-db.c:511
+#: builtin/clone.c:92 builtin/init-db.c:476
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
@@ -4675,52 +4717,59 @@ msgstr "clé=valeur"
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:298
+#: builtin/clone.c:300
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
+"encore supporté"
+
+#: builtin/clone.c:302
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
-#: builtin/clone.c:302
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "le dépôt de référence '%s' est superficiel"
-#: builtin/clone.c:305
+#: builtin/clone.c:310
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
-#: builtin/clone.c:370 builtin/diff.c:84
+#: builtin/clone.c:375 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: builtin/clone.c:372
+#: builtin/clone.c:377
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:386
+#: builtin/clone.c:391
#, c-format
msgid "failed to stat %s\n"
msgstr "échec du stat de %s\n"
-#: builtin/clone.c:408
+#: builtin/clone.c:413
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:412
+#: builtin/clone.c:417
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:435 builtin/clone.c:619
+#: builtin/clone.c:442 builtin/clone.c:626
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:447
+#: builtin/clone.c:454
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4730,125 +4779,121 @@ msgstr ""
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
"et réessayer l'extraction avec 'git checkout -f HEAD'\n"
-#: builtin/clone.c:524
+#: builtin/clone.c:531
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:614
+#: builtin/clone.c:621
#, c-format
msgid "Checking connectivity... "
msgstr "Vérification de la connectivité... "
-#: builtin/clone.c:617
+#: builtin/clone.c:624
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: builtin/clone.c:681
+#: builtin/clone.c:688
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"la HEAD distante réfère à une référence non existante, impossible de "
"l'extraire.\n"
-#: builtin/clone.c:712
+#: builtin/clone.c:719
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:799
+#: builtin/clone.c:808
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:801
+#: builtin/clone.c:810
msgid "cannot unlink temporary alternates file"
msgstr "impossible de unlinker le fichier temporaire alternates"
-#: builtin/clone.c:831
+#: builtin/clone.c:842
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:835
+#: builtin/clone.c:846
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:846
+#: builtin/clone.c:857
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:849
+#: builtin/clone.c:860
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:862
+#: builtin/clone.c:873
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:868 builtin/fetch.c:1168
+#: builtin/clone.c:879 builtin/fetch.c:1166
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:878
+#: builtin/clone.c:889
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
-#: builtin/clone.c:888
+#: builtin/clone.c:899
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
-#: builtin/worktree.c:245
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
-#: builtin/clone.c:906
+#: builtin/clone.c:917
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "impossible de créer le répertoire de la copie de travail '%s'"
-#: builtin/clone.c:924
+#: builtin/clone.c:935
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:926
+#: builtin/clone.c:937
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:951
-msgid "--dissociate given, but there is no --reference"
-msgstr "--dissociate est spécifié, mais --reference est absent"
-
-#: builtin/clone.c:968
+#: builtin/clone.c:975
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
-#: builtin/clone.c:971
+#: builtin/clone.c:978
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:976
+#: builtin/clone.c:983
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:980
+#: builtin/clone.c:987
#, c-format
msgid "Don't know how to clone %s"
msgstr "Je ne sais pas cloner %s"
-#: builtin/clone.c:1029 builtin/clone.c:1037
+#: builtin/clone.c:1036 builtin/clone.c:1044
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"
-#: builtin/clone.c:1040
+#: builtin/clone.c:1047
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
@@ -4884,15 +4929,15 @@ msgstr "Remplissage d'espace entre les colonnes"
msgid "--command must be the first argument"
msgstr "--command doit être le premier argument"
-#: builtin/commit.c:37
+#: builtin/commit.c:38
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<options>] [--] <spécification-de-chemin>..."
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<options>] [--] <spécification-de-chemin>..."
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4919,7 +4964,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:60
+#: builtin/commit.c:61
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4945,7 +4990,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
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"
@@ -4956,7 +5001,7 @@ msgstr ""
"vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n"
"supprimer complètement le commit avec \"git reset HEAD^\".\n"
-#: builtin/commit.c:77
+#: builtin/commit.c:78
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4971,11 +5016,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:84
+#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
msgstr "Sinon, veuillez utiliser 'git reset'\n"
-#: builtin/commit.c:87
+#: builtin/commit.c:88
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4991,66 +5036,66 @@ msgstr ""
"Puis \"git cherry-pick --continue\" continuera le picorage \n"
"des commits restants.\n"
-#: builtin/commit.c:304
+#: builtin/commit.c:305
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:345
+#: builtin/commit.c:346
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:351
+#: builtin/commit.c:352
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:364
+#: builtin/commit.c:365
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:366
+#: builtin/commit.c:367
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:444
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:446
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:455
+#: builtin/commit.c:456
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:474
+#: builtin/commit.c:475
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:579
+#: builtin/commit.c:580
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
-#: builtin/commit.c:581
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
-#: builtin/commit.c:600
+#: builtin/commit.c:601
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:608
+#: builtin/commit.c:609
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
-#: builtin/commit.c:652
+#: builtin/commit.c:653
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5058,38 +5103,38 @@ msgstr ""
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:701 builtin/shortlog.c:273
+#: builtin/commit.c:702 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
-#: builtin/commit.c:703
+#: builtin/commit.c:704
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:707
+#: builtin/commit.c:708
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:729
+#: builtin/commit.c:730
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:733
+#: builtin/commit.c:734
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:784
+#: builtin/commit.c:785
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:802
+#: builtin/commit.c:803
#, c-format
msgid ""
"\n"
@@ -5104,7 +5149,7 @@ msgstr ""
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:807
+#: builtin/commit.c:808
#, c-format
msgid ""
"\n"
@@ -5119,7 +5164,7 @@ msgstr ""
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5129,7 +5174,7 @@ msgstr ""
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:827
+#: builtin/commit.c:828
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5140,149 +5185,150 @@ msgstr ""
"commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
"si vous le souhaitez. Un message vide abandonne la validation.\n"
-#: builtin/commit.c:847
+#: builtin/commit.c:848
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:855
+#: builtin/commit.c:856
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:862
+#: builtin/commit.c:863
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:937
+#: builtin/commit.c:938
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:952 builtin/tag.c:495
+#: builtin/commit.c:953 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
-#: builtin/commit.c:1054
+#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
"auteur existant"
-#: builtin/commit.c:1069 builtin/commit.c:1309
+#: builtin/commit.c:1070 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1106
+#: builtin/commit.c:1107
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1136
+#: builtin/commit.c:1137
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
-#: builtin/commit.c:1145
+#: builtin/commit.c:1146
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1150
+#: builtin/commit.c:1151
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
-#: builtin/commit.c:1153
+#: builtin/commit.c:1154
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
-#: builtin/commit.c:1163
+#: builtin/commit.c:1164
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."
-#: builtin/commit.c:1173
+#: builtin/commit.c:1174
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
-#: builtin/commit.c:1190
+#: builtin/commit.c:1191
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Une seule option parmi --include/--only/--all/--interactive/--patch peut "
"être utilisée."
-#: builtin/commit.c:1192
+#: builtin/commit.c:1193
msgid "No paths with --include/--only does not make sense."
msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
-#: builtin/commit.c:1194
+#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
msgstr "Malin... correction du dernier avec un index sale."
-#: builtin/commit.c:1196
+#: builtin/commit.c:1197
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
-#: builtin/commit.c:1208 builtin/tag.c:730
+#: builtin/commit.c:1209 builtin/tag.c:475
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
-#: builtin/commit.c:1213
+#: builtin/commit.c:1214
msgid "Paths with -a does not make sense."
msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
-#: builtin/commit.c:1323 builtin/commit.c:1602
+#: builtin/commit.c:1324 builtin/commit.c:1605
msgid "show status concisely"
msgstr "afficher le statut avec concision"
-#: builtin/commit.c:1325 builtin/commit.c:1604
+#: builtin/commit.c:1326 builtin/commit.c:1607
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
+#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1330 builtin/commit.c:1608
+#: builtin/commit.c:1331 builtin/commit.c:1611
msgid "show status in long format (default)"
msgstr "afficher le statut en format long (par défaut)"
-#: builtin/commit.c:1333 builtin/commit.c:1611
+#: builtin/commit.c:1334 builtin/commit.c:1614
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:604
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1336 builtin/commit.c:1614
+#: builtin/commit.c:1337 builtin/commit.c:1617
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
"no. (Défaut : all)"
-#: builtin/commit.c:1339
+#: builtin/commit.c:1340
msgid "show ignored files"
msgstr "afficher les fichiers ignorés"
-#: builtin/commit.c:1340 parse-options.h:155
+#: builtin/commit.c:1341 parse-options.h:155
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1341
+#: builtin/commit.c:1342
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5290,196 +5336,201 @@ msgstr ""
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1344
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1429
+#: builtin/commit.c:1430
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1432
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1477
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1480
msgid " (root-commit)"
msgstr " (commit racine)"
-#: builtin/commit.c:1572
+#: builtin/commit.c:1575
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1576
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1578
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1576 builtin/tag.c:602
+#: builtin/commit.c:1579 builtin/tag.c:351
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1578 builtin/gc.c:268
+#: builtin/commit.c:1581 builtin/gc.c:326
msgid "date"
msgstr "date"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1581
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
-#: builtin/notes.c:555 builtin/tag.c:600
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
msgid "message"
msgstr "message"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1582
msgid "commit message"
msgstr "message de validation"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr "commit"
+
+#: builtin/commit.c:1583
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1584
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1585
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"utiliser un message au format autosquash pour corriger le commit spécifié"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1586
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"utiliser un message au format autosquash pour compresser le commit spécifié"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1587
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
-#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1589
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1590
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1591
msgid "default"
msgstr "défaut"
-#: builtin/commit.c:1588 builtin/tag.c:605
+#: builtin/commit.c:1591 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1592
msgid "include status in commit message template"
msgstr "inclure le statut dans le modèle de message de validation"
-#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1597
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1598
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1599
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1600
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1601
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1602
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1603
msgid "bypass pre-commit hook"
msgstr "éviter d'utiliser le crochet pre-commit"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1604
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1615
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1616
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1621
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1623
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: builtin/commit.c:1695
+#: builtin/commit.c:1698
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1702
+#: builtin/commit.c:1705
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1721
+#: builtin/commit.c:1724
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1732
+#: builtin/commit.c:1735
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
-#: builtin/commit.c:1737
+#: builtin/commit.c:1740
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abandon de la validation du à un message de validation vide\n"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1788
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5618,11 +5669,11 @@ msgstr "n'afficher que les noms de variable"
msgid "respect include directives on lookup"
msgstr "respecter les directives d'inclusion lors de la recherche"
-#: builtin/config.c:311
+#: builtin/config.c:303
msgid "unable to parse default color value"
msgstr "impossible de lire la valeur de couleur par défaut"
-#: builtin/config.c:449
+#: builtin/config.c:441
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5637,16 +5688,16 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:583
+#: builtin/config.c:575
#, c-format
msgid "cannot create configuration file %s"
msgstr "création impossible du fichier de configuration '%s'"
-#: builtin/count-objects.c:55
+#: builtin/count-objects.c:77
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:65
+#: builtin/count-objects.c:87
msgid "print sizes in human readable format"
msgstr "affiche les tailles dans un format humainement lisible"
@@ -5768,7 +5819,7 @@ msgstr ""
msgid "only consider tags matching <pattern>"
msgstr "ne considérer que les étiquettes correspondant à <motif>"
-#: builtin/describe.c:410 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:314
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
@@ -5990,7 +6041,7 @@ msgstr "[à jour]"
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)"
-#: builtin/fetch.c:478 builtin/fetch.c:564
+#: builtin/fetch.c:478 builtin/fetch.c:566
msgid "[rejected]"
msgstr "[rejeté]"
@@ -6014,40 +6065,40 @@ msgstr "[nouvelle branche]"
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:566
+#: builtin/fetch.c:568
msgid "(non-fast-forward)"
msgstr "(pas d'avance rapide)"
-#: builtin/fetch.c:600 builtin/fetch.c:842
+#: builtin/fetch.c:602 builtin/fetch.c:843
#, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir %s : %s\n"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:611
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
-#: builtin/fetch.c:627
+#: builtin/fetch.c:629
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les racines superficielles ne sont pas mises à jour"
-#: builtin/fetch.c:715 builtin/fetch.c:807
+#: builtin/fetch.c:716 builtin/fetch.c:808
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:726
+#: builtin/fetch.c:727
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6056,55 +6107,55 @@ msgstr ""
"des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
" 'git remote prune %s' pour supprimer des branches anciennes en conflit"
-#: builtin/fetch.c:778
+#: builtin/fetch.c:779
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:811
+#: builtin/fetch.c:812
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:812 builtin/remote.c:1034
+#: builtin/fetch.c:813 builtin/remote.c:1040
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:832
+#: builtin/fetch.c:833
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
-#: builtin/fetch.c:854
+#: builtin/fetch.c:855
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:910
+#: builtin/fetch.c:911
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Je ne sais pas récupérer depuis %s"
-#: builtin/fetch.c:1071
+#: builtin/fetch.c:1072
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1073 builtin/remote.c:90
+#: builtin/fetch.c:1074 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1091
+#: builtin/fetch.c:1092
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6112,32 +6163,32 @@ msgstr ""
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
"distant depuis lesquels les nouvelles révisions devraient être récupérées."
-#: builtin/fetch.c:1114
+#: builtin/fetch.c:1115
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1156
+#: builtin/fetch.c:1157
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1159
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow sur un dépôt complet n'a pas de sens"
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1179
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1183
+#: builtin/fetch.c:1181
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all n'a pas de sens avec des spécifications de référence"
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1192
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1202
+#: builtin/fetch.c:1200
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"La récupération d'un groupe et les spécifications de référence n'ont pas de "
@@ -6149,23 +6200,23 @@ msgid ""
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:667
msgid "populate log with at most <n> entries from shortlog"
msgstr "peupler le journal avec au plus <n> éléments depuis le journal court"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:670
msgid "alias for --log (deprecated)"
msgstr "alias pour --log (obsolète)"
-#: builtin/fmt-merge-msg.c:676
+#: builtin/fmt-merge-msg.c:673
msgid "text"
msgstr "texte"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:674
msgid "use <text> as start of message"
msgstr "utiliser <texte> comme début de message"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:675
msgid "file to read from"
msgstr "fichier d'où lire"
@@ -6173,96 +6224,116 @@ msgstr "fichier d'où lire"
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<options>] [<motif>]"
-#: builtin/for-each-ref.c:24
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--point-at <objet>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<objet>]]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr "git for-each-ref [--contains [<objet>]]"
+
+#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr "échapper les champs réservés pour les interpréteurs de commandes"
-#: builtin/for-each-ref.c:26
+#: builtin/for-each-ref.c:29
msgid "quote placeholders suitably for perl"
msgstr "échapper les champs réservés pour perl"
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for python"
msgstr "échapper les champs réservés pour python"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for Tcl"
msgstr "échapper les champs réservés pour compatibilité avec Tcl"
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:36
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
msgid "format to use for the output"
msgstr "format à utiliser pour la sortie"
-#: builtin/for-each-ref.c:35
-msgid "key"
-msgstr "clé"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
+msgstr "afficher seulement les références pointant sur l'objet"
-#: builtin/for-each-ref.c:36
-msgid "field name to sort on"
-msgstr "nom du champ servant à trier"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr "afficher seulement les références qui sont fusionnées"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr "afficher seulement les références qui ne sont pas fusionnées"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr "afficher seulement les références qui contiennent le commit"
-#: builtin/fsck.c:163 builtin/prune.c:137
+#: builtin/fsck.c:156 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:486
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:553
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<options>] [<objet>...]"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:559
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:560
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:561
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:640
+#: builtin/fsck.c:562
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:641
+#: builtin/fsck.c:563
msgid "make index objects head nodes"
msgstr "considérer les objets de l'index comme nœuds tête"
# translated from man page
-#: builtin/fsck.c:642
+#: builtin/fsck.c:564
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:643
+#: builtin/fsck.c:565
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:566
msgid "check only connectivity"
msgstr "ne vérifier que la connectivité"
-#: builtin/fsck.c:645
+#: builtin/fsck.c:567
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:647
+#: builtin/fsck.c:569
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:648 builtin/prune.c:107
+#: builtin/fsck.c:570 builtin/prune.c:107
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:631
msgid "Checking objects"
msgstr "Vérification des objets"
@@ -6270,52 +6341,68 @@ msgstr "Vérification des objets"
msgid "git gc [<options>]"
msgstr "git gc [<options>]"
-#: builtin/gc.c:55
+#: builtin/gc.c:72
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: builtin/gc.c:100
+#: builtin/gc.c:139
#, c-format
msgid "insanely long object directory %.*s"
msgstr "objet répertoire démentiellement long %.*s"
-#: builtin/gc.c:269
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"Le dernier lancement de gc a rapporter l'erreur suivante. Veuillez corriger\n"
+"la cause et supprimer %s.\n"
+"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit "
+"supprimé.\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:327
msgid "prune unreferenced objects"
msgstr "éliminer les objets non référencés"
-#: builtin/gc.c:271
+#: builtin/gc.c:329
msgid "be more thorough (increased runtime)"
msgstr "être plus consciencieux (durée de traitement allongée)"
-#: builtin/gc.c:272
+#: builtin/gc.c:330
msgid "enable auto-gc mode"
msgstr "activer le mode auto-gc"
-#: builtin/gc.c:273
+#: builtin/gc.c:331
msgid "force running gc even if there may be another gc running"
msgstr ""
"forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
"tourne déjà"
-#: builtin/gc.c:315
+#: builtin/gc.c:373
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Compression automatique du dépôt en tâche de fond pour optimiser les "
"performances.\n"
-#: builtin/gc.c:317
+#: builtin/gc.c:375
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Compression du dépôt pour optimiser les performances.\n"
-#: builtin/gc.c:318
+#: builtin/gc.c:376
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
-#: builtin/gc.c:336
+#: builtin/gc.c:397
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -6323,7 +6410,7 @@ msgstr ""
"un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
"(utilisez --force si ce n'est pas le cas)"
-#: builtin/gc.c:364
+#: builtin/gc.c:441
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -6359,208 +6446,204 @@ msgstr "l'option '%c' attend un valeur numérique"
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: builtin/grep.c:638
+#: builtin/grep.c:633
msgid "search in index instead of in the work tree"
msgstr "rechercher dans l'index plutôt que dans la copie de travail"
-#: builtin/grep.c:640
+#: builtin/grep.c:635
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:642
+#: builtin/grep.c:637
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:644
+#: builtin/grep.c:639
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:647
+#: builtin/grep.c:642
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:649
+#: builtin/grep.c:644
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:651
+#: builtin/grep.c:646
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:653
+#: builtin/grep.c:648
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:655
+#: builtin/grep.c:650
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:658
+#: builtin/grep.c:653
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:660
+#: builtin/grep.c:655
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:664
+#: builtin/grep.c:659
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:667
+#: builtin/grep.c:662
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:670
+#: builtin/grep.c:665
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:673
+#: builtin/grep.c:668
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:676
+#: builtin/grep.c:671
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:677
+#: builtin/grep.c:672
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:678
+#: builtin/grep.c:673
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:680
+#: builtin/grep.c:675
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:682
+#: builtin/grep.c:677
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:684
+#: builtin/grep.c:679
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:687
+#: builtin/grep.c:682
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:689
+#: builtin/grep.c:684
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:691
+#: builtin/grep.c:686
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:692
+#: builtin/grep.c:687
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:694
+#: builtin/grep.c:689
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:696
+#: builtin/grep.c:691
msgid "show filename only once above matches from same file"
msgstr ""
"afficher le nom de fichier une fois au dessus des correspondances du même "
"fichier"
-#: builtin/grep.c:699
+#: builtin/grep.c:694
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:702
+#: builtin/grep.c:697
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:704
+#: builtin/grep.c:699
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:705
+#: builtin/grep.c:700
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:708
+#: builtin/grep.c:703
msgid "show a line with the function name before matches"
msgstr ""
"afficher une ligne avec le nom de la fonction avant les correspondances"
-#: builtin/grep.c:710
+#: builtin/grep.c:705
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:713
+#: builtin/grep.c:708
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:715
+#: builtin/grep.c:710
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:717
+#: builtin/grep.c:712
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:729
+#: builtin/grep.c:724
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:731
+#: builtin/grep.c:726
msgid "show only matches from files that match all patterns"
msgstr ""
"n'afficher que les correspondances de fichiers qui correspondent à tous les "
"motifs"
-#: builtin/grep.c:733
+#: builtin/grep.c:728
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:740
+#: builtin/grep.c:735
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:741 builtin/show-ref.c:189
-msgid "show usage"
-msgstr "afficher l'usage"
-
-#: builtin/grep.c:808
+#: builtin/grep.c:793
msgid "no pattern given."
msgstr "aucun motif fourni."
-#: builtin/grep.c:866
+#: builtin/grep.c:851
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
-#: builtin/grep.c:892
+#: builtin/grep.c:877
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."
-#: builtin/grep.c:897
+#: builtin/grep.c:882
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
"--no-index ou --untracked ne peuvent pas être utilisés avec des révisions."
-#: builtin/grep.c:900
+#: builtin/grep.c:885
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi."
-#: builtin/grep.c:908
+#: builtin/grep.c:893
msgid "both --cached and trees are given."
msgstr "--cached et des arbres sont fournis en même temps."
@@ -6573,10 +6656,10 @@ msgstr ""
"[--] <fichier>..."
#: builtin/hash-object.c:81
-msgid "git hash-object --stdin-paths < <list-of-paths>"
-msgstr "git hash-object --stdin-paths < <liste-de-chemins>"
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:92 builtin/tag.c:614
+#: builtin/hash-object.c:92
msgid "type"
msgstr "type"
@@ -6649,12 +6732,12 @@ msgstr "échec d'analyse de la version d'emacsclient."
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
msgid "failed to exec '%s': %s"
msgstr "échec de l'exécution de '%s' : %s"
-#: builtin/help.c:215
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -6663,7 +6746,7 @@ msgstr ""
"'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:227
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -6672,62 +6755,62 @@ msgstr ""
"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:354
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s' : visualiseur de manuel inconnu."
-#: builtin/help.c:371
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
-#: builtin/help.c:379
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:428
+#: builtin/help.c:411
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: builtin/help.c:429
+#: builtin/help.c:412
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git de tous les jours avec à peu près 20 commandes"
-#: builtin/help.c:430
+#: builtin/help.c:413
msgid "A Git glossary"
msgstr "Un glossaire Git"
-#: builtin/help.c:431
+#: builtin/help.c:414
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
-#: builtin/help.c:432
+#: builtin/help.c:415
msgid "Defining submodule properties"
msgstr "Définition des propriétés de sous-module"
-#: builtin/help.c:433
+#: builtin/help.c:416
msgid "Specifying revisions and ranges for Git"
msgstr "Spécification des révisions et portées pour Git"
-#: builtin/help.c:434
+#: builtin/help.c:417
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
"Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)"
-#: builtin/help.c:435
+#: builtin/help.c:418
msgid "An overview of recommended workflows with Git"
msgstr "Un aperçu des flux de travail recommandés avec Git"
-#: builtin/help.c:447
+#: builtin/help.c:430
msgid "The common Git guides are:\n"
msgstr "Les guides Git populaires sont : \n"
-#: builtin/help.c:468 builtin/help.c:485
+#: builtin/help.c:451 builtin/help.c:468
#, c-format
msgid "usage: %s%s"
msgstr "usage : %s%s"
-#: builtin/help.c:501
+#: builtin/help.c:484
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s\" est un alias de `%s'"
@@ -7021,88 +7104,63 @@ msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
-#: builtin/init-db.c:36
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Impossible de rendre %s inscriptible pour le groupe"
-
-#: builtin/init-db.c:63
-#, c-format
-msgid "insanely long template name %s"
-msgstr "nom de modèle démentiellement long %s"
-
-#: builtin/init-db.c:68
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "impossible de faire un stat de '%s'"
-#: builtin/init-db.c:74
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "impossible de faire un stat du modèle '%s'"
-#: builtin/init-db.c:81
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "impossible d'ouvrir (opendir) '%s'"
-#: builtin/init-db.c:98
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr "impossible de readlink '%s'"
-#: builtin/init-db.c:100
-#, c-format
-msgid "insanely long symlink %s"
-msgstr "lien symbolique démentiellement long %s"
-
-#: builtin/init-db.c:103
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "impossible de créer un lien symbolique de '%s' '%s'"
-#: builtin/init-db.c:107
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: builtin/init-db.c:111
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr "modèle %s ignoré"
-#: builtin/init-db.c:137
-#, c-format
-msgid "insanely long template path %s"
-msgstr "chemin de modèle %s démentiellement long"
-
-#: builtin/init-db.c:145
+#: builtin/init-db.c:118
#, c-format
msgid "templates not found %s"
msgstr "modèles non trouvés %s"
-#: builtin/init-db.c:158
+#: builtin/init-db.c:131
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr ""
"pas de copie des modèles étant dans une mauvaise version du format %d de '%s'"
-#: builtin/init-db.c:212
-#, c-format
-msgid "insane git directory %s"
-msgstr "répertoire git démentiel %s"
-
-#: builtin/init-db.c:344 builtin/init-db.c:347
+#: builtin/init-db.c:309 builtin/init-db.c:312
#, c-format
msgid "%s already exists"
msgstr "%s existe déjà"
-#: builtin/init-db.c:375
+#: builtin/init-db.c:340
#, c-format
msgid "unable to handle file type %d"
msgstr "impossible de traiter le fichier de type %d"
-#: builtin/init-db.c:378
+#: builtin/init-db.c:343
#, c-format
msgid "unable to move %s to %s"
msgstr "impossible de déplacer %s vers %s"
@@ -7110,24 +7168,24 @@ msgstr "impossible de déplacer %s vers %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:434
+#: builtin/init-db.c:399
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "Dépôt Git%2$s %1$s dans %3$s%4$s\n"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Reinitialized existing"
msgstr "existant réinitialisé"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Initialized empty"
msgstr "vide initialisé"
-#: builtin/init-db.c:436
+#: builtin/init-db.c:401
msgid " shared"
msgstr " partagé"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:448
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7135,25 +7193,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
"shared[=<permissions>]] [<répertoire>]"
-#: builtin/init-db.c:506
+#: builtin/init-db.c:471
msgid "permissions"
msgstr "permissions"
-#: builtin/init-db.c:507
+#: builtin/init-db.c:472
msgid "specify that the git repository is to be shared amongst several users"
msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"
-#: builtin/init-db.c:541 builtin/init-db.c:546
+#: builtin/init-db.c:506 builtin/init-db.c:511
#, c-format
msgid "cannot mkdir %s"
msgstr "impossible de créer le répertoire (mkdir) %s"
-#: builtin/init-db.c:550
+#: builtin/init-db.c:515
#, c-format
msgid "cannot chdir to %s"
msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:536
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7162,7 +7220,7 @@ msgstr ""
"%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
"git-dir=<répertoire>)"
-#: builtin/init-db.c:599
+#: builtin/init-db.c:564
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Impossible d'accéder à l'arbre de travail '%s'"
@@ -7250,33 +7308,33 @@ msgstr "format.headers sans valeur"
msgid "name of output directory is too long"
msgstr "le nom du répertoire de sortie est trop long"
-#: builtin/log.c:814
+#: builtin/log.c:813
#, c-format
msgid "Cannot open patch file %s"
msgstr "Impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:828
+#: builtin/log.c:827
msgid "Need exactly one range."
msgstr "Exactement une plage nécessaire."
-#: builtin/log.c:838
+#: builtin/log.c:837
msgid "Not a range."
msgstr "Ceci n'est pas une plage."
-#: builtin/log.c:944
+#: builtin/log.c:943
msgid "Cover letter needs email format"
msgstr "La lettre de motivation doit être au format e-mail"
-#: builtin/log.c:1023
+#: builtin/log.c:1022
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1051
+#: builtin/log.c:1050
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1096
+#: builtin/log.c:1095
msgid "Two output directories?"
msgstr "Deux répertoires de sortie ?"
@@ -7334,130 +7392,134 @@ msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr "écrire une empreinte à zéro dans l'entête From"
+
+#: builtin/log.c:1243
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1243
+#: builtin/log.c:1245
msgid "show patch format instead of default (patch + stat)"
msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
-#: builtin/log.c:1245
+#: builtin/log.c:1247
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1246
+#: builtin/log.c:1248
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1247
+#: builtin/log.c:1249
msgid "add email header"
msgstr "ajouter l'en-tête d'e-mail"
-#: builtin/log.c:1248 builtin/log.c:1250
+#: builtin/log.c:1250 builtin/log.c:1252
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1248
+#: builtin/log.c:1250
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1250
+#: builtin/log.c:1252
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1252
+#: builtin/log.c:1254
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1253
+#: builtin/log.c:1255
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
-#: builtin/log.c:1255
+#: builtin/log.c:1257
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1256
+#: builtin/log.c:1258
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1257 builtin/log.c:1260
+#: builtin/log.c:1259 builtin/log.c:1262
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1258
+#: builtin/log.c:1260
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1261
+#: builtin/log.c:1263
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1265
+#: builtin/log.c:1267
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1267
+#: builtin/log.c:1269
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1268
+#: builtin/log.c:1270
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1270
+#: builtin/log.c:1272
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1271
+#: builtin/log.c:1273
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1360
+#: builtin/log.c:1362
msgid "-n and -k are mutually exclusive."
msgstr "-n et -k sont mutuellement exclusifs."
-#: builtin/log.c:1362
+#: builtin/log.c:1364
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix et -k sont mutuellement exclusifs."
-#: builtin/log.c:1370
+#: builtin/log.c:1372
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1372
+#: builtin/log.c:1374
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1374
+#: builtin/log.c:1376
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1397
+#: builtin/log.c:1401
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1399
+#: builtin/log.c:1403
#, c-format
msgid "Could not create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: builtin/log.c:1496
+#: builtin/log.c:1500
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:1559
+#: builtin/log.c:1563
msgid "Failed to create output files"
msgstr "Échec de création des fichiers en sortie"
-#: builtin/log.c:1607
+#: builtin/log.c:1611
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:1661
+#: builtin/log.c:1665
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7465,7 +7527,7 @@ msgstr ""
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
+#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr "Commit inconnu %s"
@@ -7569,35 +7631,35 @@ msgstr "afficher les données de débogage"
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "afficher seulement les arbres"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "parcourir les sous-arbres"
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "afficher les arbres en les parcourant"
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "terminer les éléments avec un octet NUL"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "inclure la taille d'objet"
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "afficher seulement les noms de fichiers"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "utiliser les noms de chemins complets"
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"afficher l'arbre entier ; pas seulement le répertoire courant (implique --"
@@ -7838,16 +7900,16 @@ msgstr "Pas de branche amont par défaut définie pour la branche courante."
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:1081
+#: builtin/merge.c:1079
#, c-format
msgid "could not close '%s'"
msgstr "impossible de fermer '%s'"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1206
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
-#: builtin/merge.c:1224
+#: builtin/merge.c:1222
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7855,7 +7917,7 @@ msgstr ""
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1231
+#: builtin/merge.c:1229
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7863,53 +7925,53 @@ msgstr ""
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1234
+#: builtin/merge.c:1232
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
-#: builtin/merge.c:1243
+#: builtin/merge.c:1241
msgid "You cannot combine --squash with --no-ff."
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-#: builtin/merge.c:1251
+#: builtin/merge.c:1249
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
-#: builtin/merge.c:1268
+#: builtin/merge.c:1266
msgid "Squash commit into empty head not supported yet"
msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1268
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
-#: builtin/merge.c:1276
+#: builtin/merge.c:1274
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1278
+#: builtin/merge.c:1276
msgid "Can merge only exactly one commit into empty head"
msgstr ""
"Possible de fusionner exactement une seule validation dans une tête vide"
-#: builtin/merge.c:1333
+#: builtin/merge.c:1331
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."
-#: builtin/merge.c:1336
+#: builtin/merge.c:1334
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: builtin/merge.c:1342
+#: builtin/merge.c:1340
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La validation %s a une signature GPG correcte par %s\n"
@@ -7919,46 +7981,46 @@ msgstr "La validation %s a une signature GPG correcte par %s\n"
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1462
+#: builtin/merge.c:1460
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1469
+#: builtin/merge.c:1467
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1501
+#: builtin/merge.c:1499
msgid "Not possible to fast-forward, aborting."
msgstr "Pas possible d'avancer rapidement, abandon."
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1528
+#: builtin/merge.c:1526
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1592
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
-#: builtin/merge.c:1596
+#: builtin/merge.c:1594
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1603
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
-#: builtin/merge.c:1617
+#: builtin/merge.c:1615
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8149,49 +8211,49 @@ msgstr "%s, source=%s, destination=%s"
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
-#: builtin/name-rev.c:255
+#: builtin/name-rev.c:251
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<options>] <validation>..."
-#: builtin/name-rev.c:256
+#: builtin/name-rev.c:252
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<options>] --all"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:253
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<options>] --stdin"
-#: builtin/name-rev.c:309
+#: builtin/name-rev.c:305
msgid "print only names (no SHA-1)"
msgstr "afficher seulement les noms (pas de SHA-1)"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:306
msgid "only use tags to name the commits"
msgstr "utiliser seulement les étiquettes pour nommer les validations"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:308
msgid "only use refs matching <pattern>"
msgstr "utiliser seulement les références correspondant à <motif>"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:310
msgid "list all commits reachable from all refs"
msgstr ""
"afficher toutes les validations accessibles depuis toutes les références"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:311
msgid "read from stdin"
msgstr "lire depuis l'entrée standard"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:312
msgid "allow to print `undefined` names (default)"
msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
-#: builtin/name-rev.c:322
+#: builtin/name-rev.c:318
msgid "dereference tags in the input (internal use)"
msgstr "déréférencer les étiquettes en entrée (usage interne)"
@@ -8321,7 +8383,7 @@ msgstr "impossible de lire la sortie de 'show'"
msgid "failed to finish 'show' for object '%s'"
msgstr "impossible de finir 'show' pour l'objet '%s'"
-#: builtin/notes.c:174 builtin/tag.c:477
+#: builtin/notes.c:174 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
@@ -8339,12 +8401,12 @@ msgstr "impossible d'écrire l'objet note"
msgid "The note contents have been left in %s"
msgstr "Le contenu de la note a été laissé dans %s"
-#: builtin/notes.c:232 builtin/tag.c:695
+#: builtin/notes.c:232 builtin/tag.c:440
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/notes.c:234 builtin/tag.c:698
+#: builtin/notes.c:234 builtin/tag.c:443
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
@@ -8352,7 +8414,7 @@ msgstr "impossible d'ouvrir ou lire '%s'"
#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
-#: builtin/notes.c:877 builtin/tag.c:711
+#: builtin/notes.c:877 builtin/tag.c:456
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
@@ -8386,11 +8448,6 @@ msgstr "contenu de la note sous forme de chaîne"
msgid "note contents in a file"
msgstr "contenu de la note dans un fichier"
-#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
-#: builtin/notes.c:564 builtin/tag.c:630
-msgid "object"
-msgstr "objet"
-
#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr "réutiliser et éditer l'objet de note spécifié"
@@ -8521,7 +8578,7 @@ msgstr "références-notes"
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1012 builtin/remote.c:1588
+#: builtin/notes.c:1012 builtin/remote.c:1647
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sous-commande inconnue : %s"
@@ -8741,20 +8798,24 @@ msgstr "Suppression des objets dupliqués"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]"
-#: builtin/prune.c:105 builtin/worktree.c:121
+#: builtin/prune.c:105 builtin/worktree.c:124
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
-#: builtin/prune.c:106 builtin/worktree.c:122
+#: builtin/prune.c:106 builtin/worktree.c:125
msgid "report pruned objects"
msgstr "afficher les objets éliminés"
-#: builtin/prune.c:109 builtin/worktree.c:124
+#: builtin/prune.c:109 builtin/worktree.c:127
msgid "expire objects older than <time>"
msgstr "faire expirer les objets plus vieux que <heure>"
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
+
#: builtin/pull.c:69
-msgid "git pull [options] [<repository> [<refspec>...]]"
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
#: builtin/pull.c:113
@@ -8862,7 +8923,7 @@ msgstr ""
"Si vous souhaitez indiquer l'information de suivi distant pour cette "
"branche, vous pouvez le faire avec :\n"
"\n"
-"git branch --set-uptream-to=%s/<branche> %s\n"
+" git branch --set-upstream-to=%s/<branche> %s\n"
#: builtin/pull.c:476
#, c-format
@@ -8917,19 +8978,19 @@ msgstr "Impossible de fusionner de multiples branches sur une tête vide."
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
-#: builtin/push.c:15
+#: builtin/push.c:16
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/push.c:86
+#: builtin/push.c:88
msgid "tag shorthand without <tag>"
msgstr "raccourci d'étiquette sans <étiquette>"
-#: builtin/push.c:96
+#: builtin/push.c:98
msgid "--delete only accepts plain target ref names"
msgstr "--delete accepte seulement des noms entiers de références cibles"
-#: builtin/push.c:140
+#: builtin/push.c:142
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -8938,7 +8999,7 @@ msgstr ""
"Pour choisir l'option de manière permanente, voir push.default dans 'git "
"help config'."
-#: builtin/push.c:143
+#: builtin/push.c:145
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -8963,7 +9024,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:158
+#: builtin/push.c:160
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -8978,7 +9039,7 @@ msgstr ""
"\n"
" git push %s HEAD:<nom-de-la-branche-amont>\n"
-#: builtin/push.c:172
+#: builtin/push.c:174
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -8992,13 +9053,13 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:180
+#: builtin/push.c:182
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"La branche courante %s a de multiples branches amont, impossible de pousser."
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -9009,7 +9070,7 @@ msgstr ""
"pas une branche amont de votre branche courante '%s', sans me dire\n"
"quoi pousser pour mettre à jour quelle branche amont."
-#: builtin/push.c:206
+#: builtin/push.c:208
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -9060,14 +9121,14 @@ msgstr ""
"'current' au lieu de 'simple' si vous utilisez de temps en temps d'anciennes "
"versions de Git)"
-#: builtin/push.c:273
+#: builtin/push.c:275
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Vous n'avez pas spécifié de spécifications de référence à pousser, et push."
"default est \"nothing\"."
-#: builtin/push.c:280
+#: builtin/push.c:282
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -9082,7 +9143,7 @@ msgstr ""
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:286
+#: builtin/push.c:288
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -9097,7 +9158,7 @@ msgstr ""
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:292
+#: builtin/push.c:294
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -9115,13 +9176,13 @@ msgstr ""
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:299
+#: builtin/push.c:301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Les mises à jour ont été rejetées car l'étiquette existe déjà dans la "
"branche distante."
-#: builtin/push.c:302
+#: builtin/push.c:304
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -9133,22 +9194,22 @@ msgstr ""
"pointer\n"
"vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
-#: builtin/push.c:361
+#: builtin/push.c:363
#, c-format
msgid "Pushing to %s\n"
msgstr "Poussée vers %s\n"
-#: builtin/push.c:365
+#: builtin/push.c:367
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
-#: builtin/push.c:395
+#: builtin/push.c:397
#, c-format
msgid "bad repository '%s'"
msgstr "mauvais dépôt '%s'"
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9170,101 +9231,105 @@ msgstr ""
"\n"
" git push <nom>\n"
-#: builtin/push.c:411
+#: builtin/push.c:413
msgid "--all and --tags are incompatible"
msgstr "--all et --tags sont incompatibles"
-#: builtin/push.c:412
+#: builtin/push.c:414
msgid "--all can't be combined with refspecs"
msgstr "--all ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:417
+#: builtin/push.c:419
msgid "--mirror and --tags are incompatible"
msgstr "--mirror et --tags sont incompatibles"
-#: builtin/push.c:418
+#: builtin/push.c:420
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:423
+#: builtin/push.c:425
msgid "--all and --mirror are incompatible"
msgstr "--all et --mirror sont incompatibles"
-#: builtin/push.c:539
+#: builtin/push.c:537
msgid "repository"
msgstr "dépôt"
-#: builtin/push.c:540 builtin/send-pack.c:161
+#: builtin/push.c:538 builtin/send-pack.c:161
msgid "push all refs"
msgstr "pousser toutes les références"
-#: builtin/push.c:541 builtin/send-pack.c:163
+#: builtin/push.c:539 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "refléter toutes les références"
-#: builtin/push.c:543
+#: builtin/push.c:541
msgid "delete refs"
msgstr "supprimer les références"
-#: builtin/push.c:544
+#: builtin/push.c:542
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
-#: builtin/push.c:547 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:164
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:549 builtin/send-pack.c:175
+#: builtin/push.c:547 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "nom de référence>:<attendu"
-#: builtin/push.c:550 builtin/send-pack.c:176
+#: builtin/push.c:548 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"
-#: builtin/push.c:553
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr "check|on-demand|no"
+
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr "contrôler la poussée récursive des sous-modules"
-#: builtin/push.c:555 builtin/send-pack.c:169
+#: builtin/push.c:553 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
+#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
-#: builtin/push.c:558
+#: builtin/push.c:556
msgid "set upstream for git pull/status"
msgstr "définir la branche amont pour git pull/status"
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "prune locally removed refs"
msgstr "éliminer les références locales supprimées"
-#: builtin/push.c:563
+#: builtin/push.c:561
msgid "bypass pre-push hook"
msgstr "éviter d'utiliser le crochet pre-push"
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "push missing but relevant tags"
msgstr "pousser les étiquettes manquantes mais pertinentes"
-#: builtin/push.c:567 builtin/send-pack.c:166
+#: builtin/push.c:565 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "signer la poussée avec GPG"
-#: builtin/push.c:569 builtin/send-pack.c:170
+#: builtin/push.c:567 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "demande une transaction atomique sur le serveur distant"
-#: builtin/push.c:579
+#: builtin/push.c:577
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete est incompatible avec --all, --mirror et --tags"
-#: builtin/push.c:581
+#: builtin/push.c:579
msgid "--delete doesn't make sense without any refs"
msgstr "--delete n'a pas de sens sans aucune référence"
@@ -9343,12 +9408,12 @@ msgstr "sauter l'application du filtre d'extraction creuse"
msgid "debug unpack-trees"
msgstr "déboguer unpack-trees"
-#: builtin/reflog.c:432
+#: builtin/reflog.c:428
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' pour '%s' n'est pas un horodatage valide"
-#: builtin/reflog.c:549 builtin/reflog.c:554
+#: builtin/reflog.c:545 builtin/reflog.c:550
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' n'est pas un horodatage valide"
@@ -9365,15 +9430,15 @@ msgstr ""
"git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <nom> <url>"
-#: builtin/remote.c:14 builtin/remote.c:33
+#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
msgstr "git remote rename <ancienne> <nouvelle>"
-#: builtin/remote.c:15 builtin/remote.c:38
+#: builtin/remote.c:15 builtin/remote.c:39
msgid "git remote remove <name>"
msgstr "git remote remove <nom>"
-#: builtin/remote.c:16 builtin/remote.c:43
+#: builtin/remote.c:16 builtin/remote.c:44
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)"
@@ -9396,48 +9461,52 @@ msgstr ""
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <nom> <branche>..."
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <nom>"
+
+#: builtin/remote.c:22 builtin/remote.c:75
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]"
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <nom> <nouvelle-URL>"
-#: builtin/remote.c:23 builtin/remote.c:71
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <nom> <URL>"
-#: builtin/remote.c:28
+#: builtin/remote.c:29
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<options>] <nom> <URL>"
-#: builtin/remote.c:48
+#: builtin/remote.c:49
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <nom> <branche>..."
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <nom> <branche>..."
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<options>] <nom>"
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<options>] <nom>"
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<options>] [<groupe> | <distante>]..."
-#: builtin/remote.c:88
+#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
msgstr "Mise à jour de %s"
-#: builtin/remote.c:120
+#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -9445,102 +9514,102 @@ msgstr ""
"--mirror est dangereux et obsolète ; merci\n"
"\t d'utiliser --mirror=fetch ou --mirror=push à la place"
-#: builtin/remote.c:137
+#: builtin/remote.c:143
#, c-format
msgid "unknown mirror argument: %s"
msgstr "argument miroir inconnu : %s"
-#: builtin/remote.c:153
+#: builtin/remote.c:159
msgid "fetch the remote branches"
msgstr "rapatrier les branches distantes"
-#: builtin/remote.c:155
+#: builtin/remote.c:161
msgid "import all tags and associated objects when fetching"
msgstr ""
"importer toutes les étiquettes et les objets associés lors du rapatriement"
-#: builtin/remote.c:158
+#: builtin/remote.c:164
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "ou ne rapatrier aucune étiquette (--no-tags)"
-#: builtin/remote.c:160
+#: builtin/remote.c:166
msgid "branch(es) to track"
msgstr "branche(s) à suivre"
-#: builtin/remote.c:161
+#: builtin/remote.c:167
msgid "master branch"
msgstr "branche maîtresse"
-#: builtin/remote.c:162
+#: builtin/remote.c:168
msgid "push|fetch"
msgstr "push|fetch"
-#: builtin/remote.c:163
+#: builtin/remote.c:169
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
"paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis"
-#: builtin/remote.c:175
+#: builtin/remote.c:181
msgid "specifying a master branch makes no sense with --mirror"
msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror"
-#: builtin/remote.c:177
+#: builtin/remote.c:183
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
"rapatriement"
-#: builtin/remote.c:187 builtin/remote.c:637
+#: builtin/remote.c:193 builtin/remote.c:643
#, c-format
msgid "remote %s already exists."
msgstr "la distante %s existe déjà."
-#: builtin/remote.c:191 builtin/remote.c:641
+#: builtin/remote.c:197 builtin/remote.c:647
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' n'est pas un nom valide de distante"
-#: builtin/remote.c:235
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "Impossible de paramétrer la maîtresse '%s'"
-#: builtin/remote.c:335
+#: builtin/remote.c:341
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
"Impossible d'obtenir une correspondance distante pour la spécification de "
"référence %s"
-#: builtin/remote.c:436 builtin/remote.c:444
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr "(correspond)"
-#: builtin/remote.c:448
+#: builtin/remote.c:454
msgid "(delete)"
msgstr "(supprimer)"
-#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "Impossible d'ajouter '%s' à '%s'"
-#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
#, c-format
msgid "No such remote: %s"
msgstr "Distante inconnue : %s"
-#: builtin/remote.c:647
+#: builtin/remote.c:653
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Impossible de renommer la section de configuration '%s' en '%s'"
-#: builtin/remote.c:653 builtin/remote.c:821
+#: builtin/remote.c:659 builtin/remote.c:827
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Impossible de supprimer la section de configuration '%s'"
-#: builtin/remote.c:668
+#: builtin/remote.c:674
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9551,27 +9620,27 @@ msgstr ""
"\t%s\n"
"\tVeuillez mettre à jour la configuration manuellement si nécessaire."
-#: builtin/remote.c:674
+#: builtin/remote.c:680
#, c-format
msgid "Could not append '%s'"
msgstr "Impossible d'ajouter '%s'"
-#: builtin/remote.c:685
+#: builtin/remote.c:691
#, c-format
msgid "Could not set '%s'"
msgstr "Impossible de définir '%s'"
-#: builtin/remote.c:707
+#: builtin/remote.c:713
#, c-format
msgid "deleting '%s' failed"
msgstr "échec de suppression de '%s'"
-#: builtin/remote.c:741
+#: builtin/remote.c:747
#, c-format
msgid "creating '%s' failed"
msgstr "échec de création de '%s'"
-#: builtin/remote.c:807
+#: builtin/remote.c:813
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9586,120 +9655,120 @@ msgstr[1] ""
"supprimées ;\n"
"pour les supprimer, utilisez :"
-#: builtin/remote.c:922
+#: builtin/remote.c:928
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
-#: builtin/remote.c:925
+#: builtin/remote.c:931
msgid " tracked"
msgstr " suivi"
-#: builtin/remote.c:927
+#: builtin/remote.c:933
msgid " stale (use 'git remote prune' to remove)"
msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
-#: builtin/remote.c:929
+#: builtin/remote.c:935
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:970
+#: builtin/remote.c:976
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche"
-#: builtin/remote.c:977
+#: builtin/remote.c:983
#, c-format
msgid "rebases onto remote %s"
msgstr "rebase sur la distante %s"
-#: builtin/remote.c:980
+#: builtin/remote.c:986
#, c-format
msgid " merges with remote %s"
msgstr " fusionne avec la distante %s"
-#: builtin/remote.c:981
+#: builtin/remote.c:987
msgid " and with remote"
msgstr " et avec la distante"
-#: builtin/remote.c:983
+#: builtin/remote.c:989
#, c-format
msgid "merges with remote %s"
msgstr "fusionne avec la distante %s"
-#: builtin/remote.c:984
+#: builtin/remote.c:990
msgid " and with remote"
msgstr " et avec la distante"
-#: builtin/remote.c:1030
+#: builtin/remote.c:1036
msgid "create"
msgstr "créer"
-#: builtin/remote.c:1033
+#: builtin/remote.c:1039
msgid "delete"
msgstr "supprimer"
-#: builtin/remote.c:1037
+#: builtin/remote.c:1043
msgid "up to date"
msgstr "à jour"
-#: builtin/remote.c:1040
+#: builtin/remote.c:1046
msgid "fast-forwardable"
msgstr "peut être mis à jour en avance rapide"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1049
msgid "local out of date"
msgstr "le local n'est pas à jour"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s force vers %-*s (%s)"
-#: builtin/remote.c:1053
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s pousse vers %-*s (%s)"
-#: builtin/remote.c:1057
+#: builtin/remote.c:1063
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s force vers %s"
-#: builtin/remote.c:1060
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s pousse vers %s"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
msgid "do not query remotes"
msgstr "ne pas interroger les distantes"
-#: builtin/remote.c:1155
+#: builtin/remote.c:1161
#, c-format
msgid "* remote %s"
msgstr "* distante %s"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1162
#, c-format
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1157 builtin/remote.c:1308
+#: builtin/remote.c:1163 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(pas d'URL)"
-#: builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr " URL push : %s"
-#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr " Branche HEAD : %s"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1182
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -9707,145 +9776,158 @@ msgstr ""
" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
"suivantes) :\n"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1191 builtin/remote.c:1218
+#: builtin/remote.c:1197 builtin/remote.c:1224
msgid " (status not queried)"
msgstr " (statut non demandé)"
-#: builtin/remote.c:1200
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branche locale configurée pour 'git pull' :"
msgstr[1] " Branches locales configurées pour 'git pull' :"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr " Les références locales seront reflétées par 'git push'"
-#: builtin/remote.c:1215
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Référence locale configurée pour 'git push'%s :"
msgstr[1] " Références locales configurées pour 'git push'%s :"
-#: builtin/remote.c:1236
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1238
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
"explicitement avec :"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1273
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1275
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1294
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1304
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1305
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1321
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1369
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1435 builtin/remote.c:1509
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1455
+#: builtin/remote.c:1461
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1468
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1484
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr "interroger les URLs de poussée plutôt que les URLs de récupération"
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr "retourner toutes les URLs"
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "aucune URL configurée pour le dépôt distant '%s'"
+
+#: builtin/remote.c:1541
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1486
+#: builtin/remote.c:1543
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1488
+#: builtin/remote.c:1545
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1552
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1535
+#: builtin/remote.c:1592
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1543
+#: builtin/remote.c:1600
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1545
+#: builtin/remote.c:1602
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/remote.c:1559
+#: builtin/remote.c:1616
msgid "be verbose; must be placed before a subcommand"
msgstr "être verbeux : doit être placé avant une sous-commande"
@@ -9918,7 +10000,11 @@ msgstr "taille maximum de chaque fichier paquet"
msgid "repack objects in packs marked with .keep"
msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
-#: builtin/repack.c:378
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
+
+#: builtin/repack.c:381
#, c-format
msgid "removing '%s' failed"
msgstr "la suppression de '%s' a échoué"
@@ -10014,7 +10100,7 @@ msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
"git rerere [clear | forget <chemin>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:57
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "enregistrer des résolutions propres dans l'index"
@@ -10152,23 +10238,23 @@ msgstr "Impossible d'écrire le nouveau fichier d'index."
msgid "rev-list does not support display of notes"
msgstr "rev-list ne supporte l'affichage des notes"
-#: builtin/rev-parse.c:361
+#: builtin/rev-parse.c:358
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
msgstr "garder le `--` passé en argument"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option"
-#: builtin/rev-parse.c:371
+#: builtin/rev-parse.c:368
msgid "output in stuck long form"
msgstr "sortie en forme longue fixée"
-#: builtin/rev-parse.c:502
+#: builtin/rev-parse.c:499
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -10433,7 +10519,7 @@ msgstr "w[,i1[,i2]]"
msgid "Linewrap output"
msgstr "Couper les lignes"
-#: builtin/show-branch.c:9
+#: builtin/show-branch.c:10
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -10445,72 +10531,72 @@ msgstr ""
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
msgstr "afficher les branches de suivi distantes et les branches locales"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
msgstr "afficher les branches de suivi distantes"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
msgstr "couleur '*!+-' correspondant à la branche"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:646
msgid "show <n> more commits after the common ancestor"
msgstr "afficher <n> validations de plus après l'ancêtre commun"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:648
msgid "synonym to more=-1"
msgstr "synonyme de more=-1"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:649
msgid "suppress naming strings"
msgstr "supprimer les chaînes de nommage"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:651
msgid "include the current branch"
msgstr "inclure la branche courante"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:653
msgid "name commits with their object names"
msgstr "nommer les validations avec leurs noms d'objet"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:655
msgid "show possible merge bases"
msgstr "afficher les bases possibles de fusion"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
msgstr "afficher les références inaccessibles depuis toute autre référence"
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:659
msgid "show commits in topological order"
msgstr "afficher les validations dans l'ordre topologique"
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:662
msgid "show only commits not on the first branch"
msgstr ""
"afficher seulement les validations qui ne sont pas sur la première branche"
-#: builtin/show-branch.c:683
+#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
msgstr "afficher les fusions accessibles depuis une seule pointe"
-#: builtin/show-branch.c:685
+#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
msgstr "tri topologique, maintenant l'ordre par date si possible"
-#: builtin/show-branch.c:688
+#: builtin/show-branch.c:669
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:689
+#: builtin/show-branch.c:670
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
"afficher les <n> plus récents éléments de ref-log en commençant à la base"
@@ -10524,46 +10610,145 @@ msgstr ""
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]"
#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"
-msgstr "git show-ref --exclude-existing[=<motif>] < liste-références"
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<motif>]"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
msgstr "afficher seulement les étiquettes (peut être combiné avec des têtes)"
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
msgstr "afficher seulement les têtes (peut être combiné avec des étiquettes)"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
msgstr ""
"vérification de référence plus stricte, nécessite un chemin de référence "
"exact"
-#: builtin/show-ref.c:175 builtin/show-ref.c:177
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "afficher la référence HEAD, même si elle serait filtrée"
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:174
msgid "dereference tags into object IDs"
msgstr "déréférencer les étiquettes en IDs d'objet"
-#: builtin/show-ref.c:181
+#: builtin/show-ref.c:176
msgid "only show SHA1 hash using <n> digits"
msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres"
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:180
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"ne pas afficher les résultats sur la sortie standard (pratique avec --verify)"
-#: builtin/show-ref.c:187
+#: builtin/show-ref.c:182
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"afficher les références de l'entrée standard qui ne sont pas dans le dépôt "
"local"
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+"sauter et supprimer toutes les lignes commençant par le caractère de "
+"commentaire"
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr "ancre alternative pour les chemins relatifs"
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper <nom> <chemin>"
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr ""
+"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
+"chemin '%s'"
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr "emplacement où le sous-module sera cloné"
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr "nom du nouveau sous-module"
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr "URL depuis laquelle cloner le sous-module"
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr "profondeur de l'historique des clones superficiels"
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+msgstr ""
+"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
+"<dépôt>] [--name <nom>] [--url <url>][--depth <profondeur>] [--] "
+"[<chemin>...]"
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "impossible de créer le répertoire '%s'"
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr "impossible d'ouvrir le fichier '%s'"
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr "impossible de fermer le fichier %s"
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "impossible de créer le répertoire de sous-module pour '%s'"
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr ""
+"fatal : la sous-commande submodule--helper doit être appelée avec une sous-"
+"commande"
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr "fatal : '%s' n'est pas une sous-commande valide de submodule--helper"
+
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<options>] nom [<référence>]"
@@ -10593,7 +10778,7 @@ msgstr "raison"
msgid "reason of the update"
msgstr "raison de la mise à jour"
-#: builtin/tag.c:22
+#: builtin/tag.c:23
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
@@ -10601,48 +10786,43 @@ msgstr ""
"git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-"
"étiquette> [<head>]"
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nométiquette>..."
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[<pattern>...]"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <objet>]\n"
-"\t\t[<motif>...]"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -v <tagname>..."
msgstr "git tag -v <nométiquette>..."
-#: builtin/tag.c:69
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "objet malformé à '%s'"
-
-#: builtin/tag.c:301
+#: builtin/tag.c:80
#, c-format
msgid "tag name too long: %.*s..."
msgstr "nom d'étiquette trop long : %.*s..."
-#: builtin/tag.c:306
+#: builtin/tag.c:85
#, c-format
msgid "tag '%s' not found."
msgstr "étiquette '%s' non trouvée."
-#: builtin/tag.c:321
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
-#: builtin/tag.c:333
+#: builtin/tag.c:112
#, c-format
msgid "could not verify the tag '%s'"
msgstr "impossible de vérifier l'étiquette '%s'"
-#: builtin/tag.c:343
+#: builtin/tag.c:122
#, c-format
msgid ""
"\n"
@@ -10655,7 +10835,7 @@ msgstr ""
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/tag.c:347
+#: builtin/tag.c:126
#, c-format
msgid ""
"\n"
@@ -10670,153 +10850,138 @@ msgstr ""
"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
"même si vous le souhaitez.\n"
-#: builtin/tag.c:371
-#, c-format
-msgid "unsupported sort specification '%s'"
-msgstr "spécification de tri non supportée '%s'"
-
-#: builtin/tag.c:373
-#, c-format
-msgid "unsupported sort specification '%s' in variable '%s'"
-msgstr "spécification de tri non supportée '%s' dans le variable '%s'"
-
-#: builtin/tag.c:428
+#: builtin/tag.c:199
msgid "unable to sign the tag"
msgstr "impossible de signer l'étiquette"
-#: builtin/tag.c:430
+#: builtin/tag.c:201
msgid "unable to write tag file"
msgstr "impossible d'écrire le fichier d'étiquettes"
-#: builtin/tag.c:455
+#: builtin/tag.c:226
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:468
+#: builtin/tag.c:239
msgid "tag header too big."
msgstr "en-tête d'étiquette trop gros."
-#: builtin/tag.c:504
+#: builtin/tag.c:275
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:510
+#: builtin/tag.c:281
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Le message pour l'étiquette a été laissé dans %s\n"
-#: builtin/tag.c:559
-msgid "switch 'points-at' requires an object"
-msgstr "le commutateur 'points-at' a besoin d'un objet"
-
-#: builtin/tag.c:561
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nom d'objet malformé '%s'"
-
-#: builtin/tag.c:590
+#: builtin/tag.c:339
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
-#: builtin/tag.c:592
+#: builtin/tag.c:341
msgid "print <n> lines of each tag message"
msgstr "affiche <n> lignes de chaque message d'étiquette"
-#: builtin/tag.c:594
+#: builtin/tag.c:343
msgid "delete tags"
msgstr "supprimer des étiquettes"
-#: builtin/tag.c:595
+#: builtin/tag.c:344
msgid "verify tags"
msgstr "vérifier des étiquettes"
-#: builtin/tag.c:597
+#: builtin/tag.c:346
msgid "Tag creation options"
msgstr "Options de création de l'étiquette"
-#: builtin/tag.c:599
+#: builtin/tag.c:348
msgid "annotated tag, needs a message"
msgstr "étiquette annotée, nécessite un message"
-#: builtin/tag.c:601
+#: builtin/tag.c:350
msgid "tag message"
msgstr "message pour l'étiquette"
-#: builtin/tag.c:603
+#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
msgstr "étiquette annotée et signée avec GPG"
-#: builtin/tag.c:607
+#: builtin/tag.c:356
msgid "use another key to sign the tag"
msgstr "utiliser une autre clé pour signer l'étiquette"
-#: builtin/tag.c:608
+#: builtin/tag.c:357
msgid "replace the tag if exists"
msgstr "remplacer l'étiquette si elle existe"
-#: builtin/tag.c:609 builtin/update-ref.c:368
+#: builtin/tag.c:358 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "créer un reflog"
-#: builtin/tag.c:611
+#: builtin/tag.c:360
msgid "Tag listing options"
msgstr "Options d'affichage des étiquettes"
-#: builtin/tag.c:612
+#: builtin/tag.c:361
msgid "show tag list in columns"
msgstr "afficher la liste des étiquettes sous forme de colonnes"
-#: builtin/tag.c:614
-msgid "sort tags"
-msgstr "trier les étiquettes"
-
-#: builtin/tag.c:619 builtin/tag.c:625
+#: builtin/tag.c:362 builtin/tag.c:363
msgid "print only tags that contain the commit"
msgstr "afficher seulement les étiquettes qui contiennent la validation"
-#: builtin/tag.c:631
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
+msgstr "afficher seulement les étiquettes qui sont fusionnées"
+
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
+msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
+
+#: builtin/tag.c:370
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:657
+#: builtin/tag.c:399
msgid "--column and -n are incompatible"
msgstr "--column et -n sont incompatibles"
-#: builtin/tag.c:669
-msgid "--sort and -n are incompatible"
-msgstr "--sort et -n sont incompatibles"
-
-#: builtin/tag.c:676
+#: builtin/tag.c:419
msgid "-n option is only allowed with -l."
msgstr "l'option -n est autorisée seulement avec -l."
-#: builtin/tag.c:678
+#: builtin/tag.c:421
msgid "--contains option is only allowed with -l."
msgstr "l'option --contains est autorisée seulement avec -l."
-#: builtin/tag.c:680
+#: builtin/tag.c:423
msgid "--points-at option is only allowed with -l."
msgstr "l'option --points-at est autorisée seulement avec -l."
-#: builtin/tag.c:688
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr "les options --merged et --no-merged ne sont autorisées qu'avec -l."
+
+#: builtin/tag.c:433
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:708
+#: builtin/tag.c:453
msgid "too many params"
msgstr "trop de paramètres"
-#: builtin/tag.c:714
+#: builtin/tag.c:459
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:719
+#: builtin/tag.c:464
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:744
+#: builtin/tag.c:489
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
@@ -11090,81 +11255,85 @@ msgstr "git verify-tag [-v | --verbose] <étiquette>..."
msgid "print tag contents"
msgstr "afficher le contenu de l'étiquette"
-#: builtin/worktree.c:13
-msgid "git worktree add [<options>] <path> <branch>"
-msgstr "git worktree add [<options>] <chemin> <branche>"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<options>] <chemin> [<branche>]"
-#: builtin/worktree.c:14
+#: builtin/worktree.c:16
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<options>]"
-#: builtin/worktree.c:36
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr "git worktree prune [<options>]"
+
+#: builtin/worktree.c:39
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Suppression de worktrees/%s : répertoire invalide"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:45
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
-#: builtin/worktree.c:47
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
"Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
-#: builtin/worktree.c:74
+#: builtin/worktree.c:77
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
"inexistant"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:112
#, c-format
msgid "failed to remove: %s"
msgstr "échec de la suppression de %s"
-#: builtin/worktree.c:198
+#: builtin/worktree.c:201
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: builtin/worktree.c:232
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:268
+#: builtin/worktree.c:271
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Préparation de %s (identifiant %s)"
-#: builtin/worktree.c:316
+#: builtin/worktree.c:319
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"extraire la <branche> même si elle est déjà extraite dans une autre copie de "
"travail"
-#: builtin/worktree.c:318
+#: builtin/worktree.c:321
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:320
+#: builtin/worktree.c:323
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:324
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/worktree.c:328
+#: builtin/worktree.c:331
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
@@ -11315,49 +11484,49 @@ msgstr "date-d'expiration"
msgid "no-op (backward compatibility)"
msgstr "sans action (rétrocompatibilité)"
-#: parse-options.h:236
+#: parse-options.h:237
msgid "be more verbose"
msgstr "être plus verbeux"
-#: parse-options.h:238
+#: parse-options.h:239
msgid "be more quiet"
msgstr "être plus silencieux"
-#: parse-options.h:244
+#: parse-options.h:245
msgid "use <n> digits to display SHA-1s"
msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
-#: rerere.h:28
+#: rerere.h:38
msgid "update the index with reused conflict resolution if possible"
msgstr ""
"met à jour l'index avec les résolutions de conflit réutilisées si possible"
-#: git-bisect.sh:50
+#: git-bisect.sh:55
msgid "You need to start by \"git bisect start\""
msgstr "Vous devez démarrer avec \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:56
+#: git-bisect.sh:61
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? "
-#: git-bisect.sh:99
+#: git-bisect.sh:122
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "option inconnue : '$arg'"
-#: git-bisect.sh:103
+#: git-bisect.sh:126
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' ne semble être une révision valide"
-#: git-bisect.sh:132
+#: git-bisect.sh:155
msgid "Bad HEAD - I need a HEAD"
msgstr "Mauvaise HEAD - j'ai besoin d'une HEAD"
-#: git-bisect.sh:145
+#: git-bisect.sh:168
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
@@ -11365,39 +11534,39 @@ msgstr ""
"L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branche-"
"valide>'."
-#: git-bisect.sh:155
+#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
msgstr "refus de bissecter sur un arbre 'cg-seeked'"
-#: git-bisect.sh:159
+#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
msgstr "Mauvaise HEAD - référence symbolique douteuse"
-#: git-bisect.sh:211
+#: git-bisect.sh:234
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Mauvais argument pour bisect_write : $state"
-#: git-bisect.sh:240
+#: git-bisect.sh:263
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Mauvaise révision en entrée : $arg"
-#: git-bisect.sh:255
+#: git-bisect.sh:278
msgid "Please call 'bisect_state' with at least one argument."
msgstr "Veuillez appeler 'bisect_state' avec au moins un argument."
-#: git-bisect.sh:267
+#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Mauvaise révision en entrée : $rev"
-#: git-bisect.sh:276
+#: git-bisect.sh:299
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' n'accepte qu'un seul argument."
-#: git-bisect.sh:299
+#: git-bisect.sh:322
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "Attention : bissection avec seulement une validation $TERM_BAD."
@@ -11405,11 +11574,11 @@ msgstr "Attention : bissection avec seulement une validation $TERM_BAD."
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:305
+#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
msgstr "Êtes-vous sûr [Y/n] ? "
-#: git-bisect.sh:317
+#: git-bisect.sh:340
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -11420,7 +11589,7 @@ msgstr ""
"(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" "
"pour cela.)"
-#: git-bisect.sh:320
+#: git-bisect.sh:343
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11433,16 +11602,16 @@ msgstr ""
"(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" "
"pour cela.)"
-#: git-bisect.sh:391 git-bisect.sh:521
+#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
msgstr "Pas de bissection en cours."
-#: git-bisect.sh:398
+#: git-bisect.sh:421
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' n'est pas une validation valide"
-#: git-bisect.sh:407
+#: git-bisect.sh:430
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -11451,25 +11620,25 @@ msgstr ""
"Échec d'extraction de la HEAD d'origine '$branch'.\n"
"Essayez 'git bisect reset <commit>'."
-#: git-bisect.sh:435
+#: git-bisect.sh:458
msgid "No logfile given"
msgstr "Pas de fichier de log donné"
-#: git-bisect.sh:436
+#: git-bisect.sh:459
#, sh-format
msgid "cannot read $file for replaying"
msgstr "impossible de lire $file pour rejouer"
-#: git-bisect.sh:455
+#: git-bisect.sh:480
msgid "?? what are you talking about?"
msgstr "?? de quoi parlez-vous ?"
-#: git-bisect.sh:467
+#: git-bisect.sh:492
#, sh-format
msgid "running $command"
msgstr "lancement de $command"
-#: git-bisect.sh:474
+#: git-bisect.sh:499
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11478,11 +11647,11 @@ msgstr ""
"la bissection a échoué :\n"
"le code retour $res de '$command' est < 0 ou >= 128"
-#: git-bisect.sh:500
+#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
msgstr "la bissection ne peut plus continuer"
-#: git-bisect.sh:506
+#: git-bisect.sh:531
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11491,17 +11660,50 @@ msgstr ""
"la bissection a échoué :\n"
"'bisect_state $state' a retourné le code erreur $res"
-#: git-bisect.sh:513
+#: git-bisect.sh:538
msgid "bisect run success"
msgstr "succès de la bissection"
-#: git-bisect.sh:548
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "veuillez utiliser deux termes différents"
+
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "'$term' n'est pas un terme valide"
+
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr "impossible d'utiliser la commande incluse '$term' comme terme"
+
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "impossible de modifier la signification du terme '$term'"
+
+#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
"Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/"
"$TERM_GOOD."
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "aucun terme défini"
+
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"argument invalide $arg pour 'git bisect terms'.\n"
+"Les options supportées sont : --term-good|--term-old et --term-bad|--term-"
+"new."
+
#: git-rebase.sh:57
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
@@ -11541,25 +11743,25 @@ msgstr "Le crochet pre-rebase a refusé de rebaser."
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Il semble que git-am soit en cours. Impossible de rebaser."
-#: git-rebase.sh:351
+#: git-rebase.sh:354
msgid "The --exec option must be used with the --interactive option"
msgstr "L'option --exec doit être utilisée avec l'option --interactive"
-#: git-rebase.sh:356
+#: git-rebase.sh:359
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: git-rebase.sh:367
+#: git-rebase.sh:370
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
"interactif."
-#: git-rebase.sh:374
+#: git-rebase.sh:377
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: git-rebase.sh:377
+#: git-rebase.sh:380
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11567,12 +11769,12 @@ msgstr ""
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: git-rebase.sh:395
+#: git-rebase.sh:398
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Impossible de revenir à $head_name"
-#: git-rebase.sh:414
+#: git-rebase.sh:417
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11594,65 +11796,65 @@ msgstr ""
"chose\n"
"d'important ici."
-#: git-rebase.sh:465
+#: git-rebase.sh:468
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "invalide $upstream_name en amont"
-#: git-rebase.sh:489
+#: git-rebase.sh:492
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name : il y a plus d'une base de fusion"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:495 git-rebase.sh:499
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name : il n'y a pas de base de fusion"
-#: git-rebase.sh:501
+#: git-rebase.sh:504
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Ne pointe pas sur une validation valide : $onto_name"
-#: git-rebase.sh:524
+#: git-rebase.sh:527
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal : pas de branche : $branch_name"
-#: git-rebase.sh:557
+#: git-rebase.sh:560
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: git-rebase.sh:562
+#: git-rebase.sh:565
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Autoremisage créé : $stash_abbrev"
-#: git-rebase.sh:566
+#: git-rebase.sh:569
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: git-rebase.sh:586
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branche courante $branch_name est à jour."
-#: git-rebase.sh:590
+#: git-rebase.sh:593
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branche courante $branch_name est à jour, rebasage forcé."
-#: git-rebase.sh:601
+#: git-rebase.sh:604
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Changements de $mb sur $onto :"
-#: git-rebase.sh:610
+#: git-rebase.sh:613
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
-#: git-rebase.sh:620
+#: git-rebase.sh:623
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
@@ -11725,118 +11927,99 @@ msgstr "Impossible de sauver le statut courant"
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: git-stash.sh:387
+#: git-stash.sh:405
#, sh-format
msgid "unknown option: $opt"
msgstr "option inconnue : $opt"
-#: git-stash.sh:397
+#: git-stash.sh:415
msgid "No stash found."
msgstr "Pas de remisage trouvé."
-#: git-stash.sh:404
+#: git-stash.sh:422
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Trop de révisions spécifiées : $REV"
-#: git-stash.sh:410
+#: git-stash.sh:428
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference n'est pas une référence valide"
-#: git-stash.sh:438
+#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' n'est pas une validation de type remisage"
-#: git-stash.sh:449
+#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' n'est pas une référence de remisage"
-#: git-stash.sh:457
+#: git-stash.sh:475
msgid "unable to refresh index"
msgstr "impossible de rafraîchir l'index"
-#: git-stash.sh:461
+#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Impossible d'appliquer un remisage en cours de fusion"
-#: git-stash.sh:469
+#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
msgstr "Conflits dans l'index. Essayez sans --index."
-#: git-stash.sh:471
+#: git-stash.sh:489
msgid "Could not save index tree"
msgstr "Impossible de sauvegarder l'arbre d'index"
-#: git-stash.sh:505
+#: git-stash.sh:523
msgid "Cannot unstage modified files"
msgstr "Impossible de désindexer les fichiers modifiés"
-#: git-stash.sh:520
+#: git-stash.sh:538
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: git-stash.sh:543
+#: git-stash.sh:561
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} supprimé ($s)"
-#: git-stash.sh:544
+#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Impossible de supprimer l'élément de stash"
-#: git-stash.sh:552
+#: git-stash.sh:570
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: git-stash.sh:624
+#: git-stash.sh:642
msgid "(To restore them type \"git stash apply\")"
msgstr "(Pour les restaurer tapez \"git stash apply\")"
-#: git-submodule.sh:95
+#: git-submodule.sh:104
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "impossible de supprimer un composant de l'URL '$remoteurl'"
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr ""
-"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
-"chemin '$sm_path'"
-
-#: git-submodule.sh:287
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr "Le clonage de '$url' dans le chemin de sous-module '$sm_path' a échoué"
-
-#: git-submodule.sh:296
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr ""
-"Le répertoire Git '$a' fait partie du chemin de sous-module '$b' ou vice-"
-"versa"
-
-#: git-submodule.sh:406
+#: git-submodule.sh:281
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
"travail"
-#: git-submodule.sh:416
+#: git-submodule.sh:291
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../"
-#: git-submodule.sh:433
+#: git-submodule.sh:308
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' existe déjà dans l'index"
-#: git-submodule.sh:437
+#: git-submodule.sh:312
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11847,24 +12030,24 @@ msgstr ""
"$sm_path\n"
"Utilisez -f si vous voulez vraiment l'ajouter."
-#: git-submodule.sh:455
+#: git-submodule.sh:330
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Ajout du dépôt existant à '$sm_path' dans l'index"
-#: git-submodule.sh:457
+#: git-submodule.sh:332
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide"
-#: git-submodule.sh:465
+#: git-submodule.sh:340
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) "
"distant(s) :"
-#: git-submodule.sh:467
+#: git-submodule.sh:342
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
@@ -11872,7 +12055,7 @@ msgstr ""
"Si vous voulez réutiliser ce répertoire git local au lieu de cloner à "
"nouveau depuis"
-#: git-submodule.sh:469
+#: git-submodule.sh:344
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
@@ -11880,7 +12063,7 @@ msgstr ""
"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt "
"correct"
-#: git-submodule.sh:470
+#: git-submodule.sh:345
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
@@ -11889,74 +12072,74 @@ msgstr ""
"ou vous ne savez pas ce que cela signifie de choisir un autre nom avec "
"l'option '--name'."
-#: git-submodule.sh:472
+#: git-submodule.sh:347
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'."
-#: git-submodule.sh:484
+#: git-submodule.sh:359
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Impossible d'extraire le sous-module '$sm_path'"
-#: git-submodule.sh:489
+#: git-submodule.sh:364
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Échec d'ajout du sous-module '$sm_path'"
-#: git-submodule.sh:498
+#: git-submodule.sh:373
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-#: git-submodule.sh:542
+#: git-submodule.sh:417
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr "Entrée dans '$prefix$displaypath'"
-#: git-submodule.sh:562
+#: git-submodule.sh:437
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr ""
"Arrêt sur '$prefix$displaypath' ; le script a retourné un statut non nul."
-#: git-submodule.sh:608
+#: git-submodule.sh:483
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr ""
"URL non trouvée pour le chemin de sous-module '$displaypath' dans .gitmodules"
-#: git-submodule.sh:617
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
msgstr ""
"Échec d'enregistrement de l'URL pour le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:619
+#: git-submodule.sh:494
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr "Sous-module '$name' ($url) enregistré pour le chemin '$displaypath'"
-#: git-submodule.sh:636
+#: git-submodule.sh:511
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr ""
"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:674
+#: git-submodule.sh:549
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr ""
"Utilisez '.' si vous voulez vraiment réinitialiser tous les sous-modules"
-#: git-submodule.sh:691
+#: git-submodule.sh:566
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
"La copie de travail du sous-module '$displaypath' contient un répertoire .git"
-#: git-submodule.sh:692
+#: git-submodule.sh:567
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -11964,7 +12147,7 @@ msgstr ""
"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: git-submodule.sh:698
+#: git-submodule.sh:573
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -11973,30 +12156,30 @@ msgstr ""
"La copie de travail du sous-module '$displaypath' contient des modifications "
"locales ; utilisez '-f' pour les annuler"
-#: git-submodule.sh:701
+#: git-submodule.sh:576
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Répertoire '$displaypath' nettoyé"
-#: git-submodule.sh:702
+#: git-submodule.sh:577
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Impossible de supprimer la copie de travail du sous-module '$displaypath'"
-#: git-submodule.sh:705
+#: git-submodule.sh:580
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'"
-#: git-submodule.sh:714
+#: git-submodule.sh:589
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
"'$displaypath'"
-#: git-submodule.sh:830
+#: git-submodule.sh:705
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
@@ -12005,57 +12188,57 @@ msgstr ""
"Chemin de sous-module '$displaypath' non initialisé\n"
"Peut-être souhaitez-vous utiliser 'update --init' ?"
-#: git-submodule.sh:843
+#: git-submodule.sh:718
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Impossible de trouver la révision courante dans le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:852
+#: git-submodule.sh:727
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
-#: git-submodule.sh:876
+#: git-submodule.sh:751
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:890
+#: git-submodule.sh:765
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:891
+#: git-submodule.sh:766
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:895
+#: git-submodule.sh:770
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:896
+#: git-submodule.sh:771
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-#: git-submodule.sh:901
+#: git-submodule.sh:776
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:902
+#: git-submodule.sh:777
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-#: git-submodule.sh:907
+#: git-submodule.sh:782
#, sh-format
msgid ""
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
@@ -12063,56 +12246,114 @@ msgstr ""
"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
"'$prefix$sm_path'"
-#: git-submodule.sh:908
+#: git-submodule.sh:783
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr "Chemin de sous-module '$prefix$sm_path' : '$command $sha1'"
-#: git-submodule.sh:938
+#: git-submodule.sh:813
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-submodule.sh:1046
+#: git-submodule.sh:921
msgid "The --cached option cannot be used with the --files option"
msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
-#: git-submodule.sh:1098
+#: git-submodule.sh:973
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:1118
+#: git-submodule.sh:993
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Attention : $display_name ne contient pas la validation $sha1_src"
-#: git-submodule.sh:1121
+#: git-submodule.sh:996
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Attention : $display_name ne contient pas la validation $sha1_dst"
-#: git-submodule.sh:1124
+#: git-submodule.sh:999
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Attention : $display_name ne contient pas les validations $sha1_src et "
"$sha1_dst"
-#: git-submodule.sh:1149
+#: git-submodule.sh:1024
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1267
+#: git-submodule.sh:1142
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
-#: git-submodule.sh:1331
+#: git-submodule.sh:1206
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
+#~ msgid "unable to look up current user in the passwd file: %s"
+#~ msgstr ""
+#~ "impossible de rechercher l'utilisateur actuel dans le fichier de mots de "
+#~ "passe : %s"
+
+#~ msgid "no such user"
+#~ msgstr "utilisateur inconnu"
+
+#~ msgid "branch '%s' does not point at a commit"
+#~ msgstr "la branche '%s' ne pointe pas sur un commit"
+
+#~ msgid "object '%s' does not point to a commit"
+#~ msgstr "l'objet '%s' ne pointe pas sur un commit"
+
+#~ msgid "some refs could not be read"
+#~ msgstr "des références n'ont pas pu être lues"
+
+#~ msgid "print only merged branches"
+#~ msgstr "afficher seulement les branches fusionnées"
+
+#~ msgid "--dissociate given, but there is no --reference"
+#~ msgstr "--dissociate est spécifié, mais --reference est absent"
+
+#~ msgid "show usage"
+#~ msgstr "afficher l'usage"
+
+#~ msgid "insanely long template name %s"
+#~ msgstr "nom de modèle démentiellement long %s"
+
+#~ msgid "insanely long symlink %s"
+#~ msgstr "lien symbolique démentiellement long %s"
+
+#~ msgid "insanely long template path %s"
+#~ msgstr "chemin de modèle %s démentiellement long"
+
+#~ msgid "insane git directory %s"
+#~ msgstr "répertoire git démentiel %s"
+
+#~ msgid "unsupported sort specification '%s'"
+#~ msgstr "spécification de tri non supportée '%s'"
+
+#~ msgid "unsupported sort specification '%s' in variable '%s'"
+#~ msgstr "spécification de tri non supportée '%s' dans le variable '%s'"
+
+#~ msgid "switch 'points-at' requires an object"
+#~ msgstr "le commutateur 'points-at' a besoin d'un objet"
+
+#~ msgid "sort tags"
+#~ msgstr "trier les étiquettes"
+
+#~ msgid "--sort and -n are incompatible"
+#~ msgstr "--sort et -n sont incompatibles"
+
+#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
+#~ msgstr ""
+#~ "Le répertoire Git '$a' fait partie du chemin de sous-module '$b' ou vice-"
+#~ "versa"
+
#~ msgid "false|true|preserve"
#~ msgstr "false|true|preserve"
diff --git a/po/git.pot b/po/git.pot
index d275f40..068f4bb 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-09-15 06:45+0800\n"
+"POT-Creation-Date: 2015-12-22 22:50+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,12 +29,12 @@ msgid ""
"as appropriate to mark resolution and make a commit."
msgstr ""
-#: advice.c:101 builtin/merge.c:1227
+#: advice.c:101 builtin/merge.c:1225
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
#: advice.c:103
-msgid "Please, commit your changes before you can merge."
+msgid "Please, commit your changes before merging."
msgstr ""
#: advice.c:104
@@ -58,76 +58,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:428
+#: archive.c:429
msgid "fmt"
msgstr ""
-#: archive.c:428
+#: archive.c:429
msgid "archive format"
msgstr ""
-#: archive.c:429 builtin/log.c:1229
+#: archive.c:430 builtin/log.c:1229
msgid "prefix"
msgstr ""
-#: archive.c:430
+#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516
-#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535
+#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99
#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr ""
-#: archive.c:432 builtin/archive.c:89
+#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
msgstr ""
-#: archive.c:434
+#: archive.c:435
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:435
+#: archive.c:436
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:436
+#: archive.c:437
msgid "store only"
msgstr ""
-#: archive.c:437
+#: archive.c:438
msgid "compress faster"
msgstr ""
-#: archive.c:445
+#: archive.c:446
msgid "compress better"
msgstr ""
-#: archive.c:448
+#: archive.c:449
msgid "list supported archive formats"
msgstr ""
-#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr ""
-#: archive.c:451 builtin/archive.c:91
+#: archive.c:452 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr ""
-#: archive.c:453 builtin/archive.c:93
+#: archive.c:454 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr ""
@@ -137,81 +137,81 @@ msgid ""
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: branch.c:60
+#: branch.c:61
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr ""
-#: branch.c:83
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
-#: branch.c:84
+#: branch.c:85
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr ""
-#: branch.c:88
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr ""
-#: branch.c:89
+#: branch.c:90
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr ""
-#: branch.c:94
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr ""
-#: branch.c:95
+#: branch.c:96
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr ""
-#: branch.c:99
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
-#: branch.c:100
+#: branch.c:101
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr ""
-#: branch.c:133
+#: branch.c:134
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:162
+#: branch.c:163
#, c-format
msgid "'%s' is not a valid branch name."
msgstr ""
-#: branch.c:167
+#: branch.c:168
#, c-format
msgid "A branch named '%s' already exists."
msgstr ""
-#: branch.c:175
+#: branch.c:176
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:195
+#: branch.c:196
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:197
+#: branch.c:198
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:199
+#: branch.c:200
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -223,22 +223,22 @@ msgid ""
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:243
+#: branch.c:244
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:263
+#: branch.c:264
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:268
+#: branch.c:269
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:399
+#: branch.c:322
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
@@ -253,7 +253,7 @@ msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:87 builtin/commit.c:765
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr ""
@@ -262,9 +262,9 @@ msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708
-#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
-#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr ""
@@ -304,7 +304,7 @@ msgstr ""
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
@@ -322,13 +322,13 @@ msgstr ""
msgid "index-pack died"
msgstr ""
-#: color.c:260
+#: color.c:275
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
-#: builtin/am.c:2128
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
#, c-format
msgid "could not parse %s"
msgstr ""
@@ -486,54 +486,54 @@ msgstr ""
msgid "Performing inexact rename detection"
msgstr ""
-#: diff.c:116
+#: diff.c:115
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:121
+#: diff.c:120
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:216
+#: diff.c:215
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:268
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:2998
+#: diff.c:3000
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:3394
+#: diff.c:3396
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:3557
+#: diff.c:3559
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3571
+#: diff.c:3573
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: dir.c:1853
+#: dir.c:1915
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:1936
+#: dir.c:1998
msgid "Untracked cache is disabled on this system."
msgstr ""
@@ -634,8 +634,8 @@ msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:715
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
msgid "unable to write new index file"
msgstr ""
@@ -653,233 +653,233 @@ msgstr ""
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:687
+#: merge-recursive.c:686
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:698
+#: merge-recursive.c:697
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:712 merge-recursive.c:733
+#: merge-recursive.c:711 merge-recursive.c:732
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:723
+#: merge-recursive.c:722
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:763
+#: merge-recursive.c:762
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:765
+#: merge-recursive.c:764
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:788 builtin/clone.c:364
+#: merge-recursive.c:787 builtin/clone.c:369
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: merge-recursive.c:796
+#: merge-recursive.c:795
#, c-format
msgid "failed to symlink '%s'"
msgstr ""
-#: merge-recursive.c:799
+#: merge-recursive.c:798
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:937
+#: merge-recursive.c:936
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:941
+#: merge-recursive.c:940
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:957
+#: merge-recursive.c:956
msgid "unsupported object type in the tree"
msgstr ""
-#: merge-recursive.c:1032 merge-recursive.c:1046
+#: merge-recursive.c:1031 merge-recursive.c:1045
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
-#: merge-recursive.c:1038 merge-recursive.c:1051
+#: merge-recursive.c:1037 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "rename"
msgstr ""
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1148
+#: merge-recursive.c:1147
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1170
+#: merge-recursive.c:1169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1175
+#: merge-recursive.c:1174
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1229
+#: merge-recursive.c:1228
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1259
+#: merge-recursive.c:1258
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:1458
+#: merge-recursive.c:1457
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:1468
+#: merge-recursive.c:1467
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:1473 merge-recursive.c:1671
+#: merge-recursive.c:1472 merge-recursive.c:1674
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:1524
+#: merge-recursive.c:1523
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:1527
+#: merge-recursive.c:1526
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modify"
msgstr ""
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modified"
msgstr ""
-#: merge-recursive.c:1585
+#: merge-recursive.c:1588
msgid "content"
msgstr ""
-#: merge-recursive.c:1592
+#: merge-recursive.c:1595
msgid "add/add"
msgstr ""
-#: merge-recursive.c:1626
+#: merge-recursive.c:1629
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:1640
+#: merge-recursive.c:1643
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1644 git-submodule.sh:1150
+#: merge-recursive.c:1647 git-submodule.sh:1025
msgid "submodule"
msgstr ""
-#: merge-recursive.c:1645
+#: merge-recursive.c:1648
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:1731
+#: merge-recursive.c:1734
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:1756
+#: merge-recursive.c:1759
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:1762
+#: merge-recursive.c:1765
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:1767
+#: merge-recursive.c:1770
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:1777
+#: merge-recursive.c:1780
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1794
+#: merge-recursive.c:1797
msgid "Fatal merge failure, shouldn't happen."
msgstr ""
-#: merge-recursive.c:1813
+#: merge-recursive.c:1816
msgid "Already up-to-date!"
msgstr ""
-#: merge-recursive.c:1822
+#: merge-recursive.c:1825
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:1852
+#: merge-recursive.c:1855
#, c-format
msgid "Unprocessed path??? %s"
msgstr ""
-#: merge-recursive.c:1900
+#: merge-recursive.c:1903
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:1913
+#: merge-recursive.c:1916
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:1950
+#: merge-recursive.c:1953
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:2007
+#: merge-recursive.c:2010
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2018 builtin/merge.c:645
+#: merge-recursive.c:2021 builtin/merge.c:645
msgid "Unable to write index."
msgstr ""
@@ -909,31 +909,41 @@ msgstr ""
msgid "unable to parse object: %s"
msgstr ""
-#: parse-options.c:563
+#: parse-options.c:570
msgid "..."
msgstr ""
-#: parse-options.c:581
+#: parse-options.c:588
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:585
+#: parse-options.c:592
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:588
+#: parse-options.c:595
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:622
+#: parse-options.c:629
msgid "-NUM"
msgstr ""
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr ""
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr ""
+
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
@@ -998,136 +1008,181 @@ msgstr ""
msgid "unable to parse --pretty format"
msgstr ""
-#: progress.c:236
+#: progress.c:235
msgid "done"
msgstr ""
-#: read-cache.c:1296
+#: read-cache.c:1281
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1306
+#: read-cache.c:1291
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
#: builtin/merge.c:983
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: refs.c:3001
+#: refs/files-backend.c:2359
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs.c:3004
+#: refs/files-backend.c:2362
#, c-format
msgid "could not delete references: %s"
msgstr ""
-#: refs.c:3013
+#: refs/files-backend.c:2371
#, c-format
msgid "could not remove reference %s"
msgstr ""
-#: ref-filter.c:660
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr ""
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr ""
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr ""
+
+#: ref-filter.c:835
msgid "unable to parse format"
msgstr ""
-#: remote.c:792
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr ""
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr ""
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr ""
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr ""
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr ""
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr ""
+
+#: remote.c:756
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:796
+#: remote.c:760
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:800
+#: remote.c:764
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:808
+#: remote.c:772
msgid "Internal error"
msgstr ""
-#: remote.c:1723 remote.c:1766
+#: remote.c:1687 remote.c:1730
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1732
+#: remote.c:1696
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1735
+#: remote.c:1699
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1741
+#: remote.c:1705
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1756
+#: remote.c:1720
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1771
+#: remote.c:1735
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1782
+#: remote.c:1746
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1795
+#: remote.c:1759
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1817
+#: remote.c:1781
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:2124
+#: remote.c:2083
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:2128
+#: remote.c:2087
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:2131
+#: remote.c:2090
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr ""
-#: remote.c:2135
+#: remote.c:2094
#, 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] ""
-#: remote.c:2141
+#: remote.c:2100
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:2144
+#: remote.c:2103
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1135,11 +1190,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2152
+#: remote.c:2111
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:2155
+#: remote.c:2114
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1150,28 +1205,28 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2165
+#: remote.c:2124
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: revision.c:2198
+#: revision.c:2193
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2201
+#: revision.c:2196
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2395
+#: revision.c:2390
msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: run-command.c:83
+#: run-command.c:90
msgid "open /dev/null failed"
msgstr ""
-#: run-command.c:85
+#: run-command.c:92
#, c-format
msgid "dup2(%d,%d) failed"
msgstr ""
@@ -1382,7 +1437,7 @@ msgstr ""
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:887 builtin/apply.c:4291
+#: sequencer.c:887 builtin/apply.c:4287
#, c-format
msgid "cannot open %s: %s"
msgstr ""
@@ -1424,12 +1479,12 @@ msgstr ""
msgid "Can't cherry-pick into empty head"
msgstr ""
-#: setup.c:243
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr ""
-#: sha1_name.c:453
+#: sha1_name.c:463
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1465,7 +1520,7 @@ msgstr ""
msgid "staging updated .gitmodules failed"
msgstr ""
-#: submodule.c:1045
+#: submodule.c:1040
#, c-format
msgid "Could not set core.worktree in %s"
msgstr ""
@@ -1476,7 +1531,7 @@ msgstr ""
msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
#, c-format
msgid "more than one %s"
msgstr ""
@@ -1543,8 +1598,8 @@ msgstr ""
msgid "could not open '%s' for writing"
msgstr ""
-#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
-#: builtin/merge.c:1076 builtin/pull.c:380
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
@@ -1559,30 +1614,21 @@ msgstr ""
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:611
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr ""
-
-#: wrapper.c:612
-msgid "no such user"
-msgstr ""
-
-#: wrapper.c:620
+#: wrapper.c:608
msgid "unable to get current working directory"
msgstr ""
-#: wrapper.c:631
+#: wrapper.c:635
#, c-format
msgid "could not open %s for writing"
msgstr ""
-#: wrapper.c:642 builtin/am.c:424
+#: wrapper.c:646 builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr ""
-#: wrapper.c:648
+#: wrapper.c:652
#, c-format
msgid "could not close %s"
msgstr ""
@@ -1909,27 +1955,27 @@ msgstr ""
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1437
+#: wt-status.c:1438
msgid "On branch "
msgstr ""
-#: wt-status.c:1445
+#: wt-status.c:1444
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1447
+#: wt-status.c:1446
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1452
+#: wt-status.c:1451
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1454
+#: wt-status.c:1453
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1457
+#: wt-status.c:1456
msgid "Not currently on any branch."
msgstr ""
@@ -2008,23 +2054,23 @@ msgstr ""
msgid "nothing to commit, working directory clean\n"
msgstr ""
-#: wt-status.c:1644
-msgid "HEAD (no branch)"
+#: wt-status.c:1642
+msgid "Initial commit on "
msgstr ""
-#: wt-status.c:1650
-msgid "Initial commit on "
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1677
+#: wt-status.c:1675
msgid "gone"
msgstr ""
-#: wt-status.c:1679 wt-status.c:1687
+#: wt-status.c:1677 wt-status.c:1685
msgid "behind "
msgstr ""
-#: compat/precompose_utf8.c:55 builtin/clone.c:403
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
@@ -2038,7 +2084,7 @@ msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:70 builtin/commit.c:277
+#: builtin/add.c:70 builtin/commit.c:278
msgid "updating files failed"
msgstr ""
@@ -2051,7 +2097,7 @@ msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:194 builtin/rev-parse.c:799
+#: builtin/add.c:194 builtin/rev-parse.c:796
msgid "Could not read the index"
msgstr ""
@@ -2086,15 +2132,15 @@ msgstr ""
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
-#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr ""
-#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
-#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
-#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr ""
@@ -2102,7 +2148,7 @@ msgstr ""
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
msgid "select hunks interactively"
msgstr ""
@@ -2159,181 +2205,181 @@ msgstr ""
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:358
+#: builtin/add.c:352
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:359
+#: builtin/add.c:353
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
-#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr ""
-#: builtin/am.c:41
+#: builtin/am.c:42
#, c-format
msgid "could not stat %s"
msgstr ""
-#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737
-#: builtin/merge.c:1079
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: builtin/am.c:444
+#: builtin/am.c:445
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:521
+#: builtin/am.c:522
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:562 builtin/notes.c:300
+#: builtin/am.c:563 builtin/notes.c:300
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:599 builtin/notes.c:315
+#: builtin/am.c:600 builtin/notes.c:315
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:625
+#: builtin/am.c:626
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:786 builtin/am.c:874
+#: builtin/am.c:787 builtin/am.c:875
#, c-format
msgid "could not open '%s' for reading: %s"
msgstr ""
-#: builtin/am.c:793
+#: builtin/am.c:794
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr ""
-#: builtin/am.c:802
+#: builtin/am.c:803
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:867
+#: builtin/am.c:868
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:915
+#: builtin/am.c:916
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:918 builtin/am.c:926
+#: builtin/am.c:919 builtin/am.c:927
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:923
+#: builtin/am.c:924
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:1010
+#: builtin/am.c:1011
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:1015 builtin/clone.c:368
+#: builtin/am.c:1016 builtin/clone.c:373
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:1019
+#: builtin/am.c:1020
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1151 builtin/commit.c:362
+#: builtin/am.c:1152 builtin/commit.c:363
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1202
+#: builtin/am.c:1203
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1203
+#: builtin/am.c:1204
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1204
+#: builtin/am.c:1205
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1339
+#: builtin/am.c:1343
msgid "Patch is empty. Was it split wrong?"
msgstr ""
-#: builtin/am.c:1413 builtin/log.c:1345
+#: builtin/am.c:1417 builtin/log.c:1347
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/am.c:1440
+#: builtin/am.c:1444
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:1614
+#: builtin/am.c:1646
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1616
+#: builtin/am.c:1648
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1635
+#: builtin/am.c:1667
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1641
+#: builtin/am.c:1673
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1666
+#: builtin/am.c:1688
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1691 builtin/merge.c:632
+#: builtin/am.c:1712 builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/am.c:1698
+#: builtin/am.c:1719
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
#: builtin/merge.c:854
msgid "failed to write commit object"
msgstr ""
-#: builtin/am.c:1743 builtin/am.c:1747
+#: builtin/am.c:1764 builtin/am.c:1768
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1763
+#: builtin/am.c:1784
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/am.c:1768
+#: builtin/am.c:1789
msgid "Commit Body is:"
msgstr ""
@@ -2341,229 +2387,231 @@ msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1778
+#: builtin/am.c:1799
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1828
+#: builtin/am.c:1849
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1863 builtin/am.c:1934
+#: builtin/am.c:1884 builtin/am.c:1955
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1879
+#: builtin/am.c:1900
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1887
+#: builtin/am.c:1908
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1893
+#: builtin/am.c:1914
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr ""
-#: builtin/am.c:1937
+#: builtin/am.c:1958
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 ""
-#: builtin/am.c:1944
+#: builtin/am.c:1965
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
msgstr ""
-#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2104
+#: builtin/am.c:2125
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2138
+#: builtin/am.c:2159
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2199
+#: builtin/am.c:2220
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2221
-msgid "git am [options] [(<mbox>|<Maildir>)...]"
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr ""
-#: builtin/am.c:2222
-msgid "git am [options] (--continue | --skip | --abort)"
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2228
+#: builtin/am.c:2260
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2230
+#: builtin/am.c:2262
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2232
+#: builtin/am.c:2264
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2235
+#: builtin/am.c:2267
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2238
+#: builtin/am.c:2270
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2240
+#: builtin/am.c:2272
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2242
+#: builtin/am.c:2274
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2244
+#: builtin/am.c:2276
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2246
+#: builtin/am.c:2278
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2249
+#: builtin/am.c:2281
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2252
+#: builtin/am.c:2284
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2253 builtin/apply.c:4563
+#: builtin/am.c:2285 builtin/apply.c:4554
msgid "action"
msgstr ""
-#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2281
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2262 builtin/apply.c:4587
+#: builtin/am.c:2294 builtin/apply.c:4578
msgid "root"
msgstr ""
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525
-#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
-#: builtin/pull.c:167
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
msgid "path"
msgstr ""
-#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
-#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
-#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
-#: parse-options.h:134 parse-options.h:243
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr ""
-#: builtin/am.c:2274 builtin/apply.c:4531
+#: builtin/am.c:2306 builtin/apply.c:4522
msgid "num"
msgstr ""
-#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
msgid "format"
msgstr ""
-#: builtin/am.c:2278
+#: builtin/am.c:2310
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2284
+#: builtin/am.c:2316
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2286
+#: builtin/am.c:2318
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2289
+#: builtin/am.c:2321
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2292
+#: builtin/am.c:2324
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2295
+#: builtin/am.c:2327
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2299
+#: builtin/am.c:2331
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2301
+#: builtin/am.c:2333
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225
-#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr ""
-#: builtin/am.c:2304
+#: builtin/am.c:2336
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2307
+#: builtin/am.c:2339
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2322
+#: builtin/am.c:2354
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/am.c:2329
+#: builtin/am.c:2361
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2344
+#: builtin/am.c:2376
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2368
+#: builtin/am.c:2400
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2374
+#: builtin/am.c:2406
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
@@ -2571,62 +2619,62 @@ msgstr ""
msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/apply.c:112
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: builtin/apply.c:127
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: builtin/apply.c:822
+#: builtin/apply.c:818
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: builtin/apply.c:831
+#: builtin/apply.c:827
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: builtin/apply.c:912
+#: builtin/apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: builtin/apply.c:944
+#: builtin/apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: builtin/apply.c:948
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: builtin/apply.c:949
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: builtin/apply.c:956
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: builtin/apply.c:1419
+#: builtin/apply.c:1415
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: builtin/apply.c:1476
+#: builtin/apply.c:1472
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1493
+#: builtin/apply.c:1489
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2637,396 +2685,396 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:1659
+#: builtin/apply.c:1655
msgid "new file depends on old contents"
msgstr ""
-#: builtin/apply.c:1661
+#: builtin/apply.c:1657
msgid "deleted file still has contents"
msgstr ""
-#: builtin/apply.c:1687
+#: builtin/apply.c:1683
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: builtin/apply.c:1723
+#: builtin/apply.c:1719
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: builtin/apply.c:1725
+#: builtin/apply.c:1721
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: builtin/apply.c:1728
+#: builtin/apply.c:1724
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: builtin/apply.c:1874
+#: builtin/apply.c:1870
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1903
+#: builtin/apply.c:1899
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: builtin/apply.c:2054
+#: builtin/apply.c:2050
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: builtin/apply.c:2144
+#: builtin/apply.c:2140
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: builtin/apply.c:2148
+#: builtin/apply.c:2144
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: builtin/apply.c:2781
+#: builtin/apply.c:2777
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: builtin/apply.c:2900
+#: builtin/apply.c:2896
#, 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] ""
-#: builtin/apply.c:2912
+#: builtin/apply.c:2908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: builtin/apply.c:2918
+#: builtin/apply.c:2914
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: builtin/apply.c:2938
+#: builtin/apply.c:2934
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: builtin/apply.c:3039
+#: builtin/apply.c:3035
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: builtin/apply.c:3045
+#: builtin/apply.c:3041
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: builtin/apply.c:3066
+#: builtin/apply.c:3062
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: builtin/apply.c:3190
+#: builtin/apply.c:3186
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
#, c-format
msgid "read of %s failed"
msgstr ""
-#: builtin/apply.c:3243
+#: builtin/apply.c:3239
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: builtin/apply.c:3271 builtin/apply.c:3493
+#: builtin/apply.c:3267 builtin/apply.c:3489
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: builtin/apply.c:3352 builtin/apply.c:3507
+#: builtin/apply.c:3348 builtin/apply.c:3503
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
#, c-format
msgid "%s: %s"
msgstr ""
-#: builtin/apply.c:3361 builtin/apply.c:3515
+#: builtin/apply.c:3357 builtin/apply.c:3511
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: builtin/apply.c:3463
+#: builtin/apply.c:3459
msgid "removal patch leaves file contents"
msgstr ""
-#: builtin/apply.c:3532
+#: builtin/apply.c:3528
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: builtin/apply.c:3534
+#: builtin/apply.c:3530
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: builtin/apply.c:3693 builtin/apply.c:3695
+#: builtin/apply.c:3689 builtin/apply.c:3691
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: builtin/apply.c:3750
+#: builtin/apply.c:3746
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: builtin/apply.c:3753
+#: builtin/apply.c:3749
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: builtin/apply.c:3773
+#: builtin/apply.c:3769
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: builtin/apply.c:3778
+#: builtin/apply.c:3774
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: builtin/apply.c:3798
+#: builtin/apply.c:3794
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: builtin/apply.c:3802
+#: builtin/apply.c:3798
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: builtin/apply.c:3816
+#: builtin/apply.c:3812
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: builtin/apply.c:4052
+#: builtin/apply.c:4048
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: builtin/apply.c:4081
+#: builtin/apply.c:4077
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: builtin/apply.c:4085
+#: builtin/apply.c:4081
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: builtin/apply.c:4090
+#: builtin/apply.c:4086
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: builtin/apply.c:4093 builtin/apply.c:4201
+#: builtin/apply.c:4089 builtin/apply.c:4197
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: builtin/apply.c:4126
+#: builtin/apply.c:4122
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: builtin/apply.c:4175
+#: builtin/apply.c:4171
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: builtin/apply.c:4262
+#: builtin/apply.c:4258
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: builtin/apply.c:4270
+#: builtin/apply.c:4266
msgid "internal error"
msgstr ""
-#: builtin/apply.c:4273
+#: builtin/apply.c:4269
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4283
+#: builtin/apply.c:4279
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: builtin/apply.c:4304
+#: builtin/apply.c:4300
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: builtin/apply.c:4307
+#: builtin/apply.c:4303
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: builtin/apply.c:4397
+#: builtin/apply.c:4393
msgid "unrecognized input"
msgstr ""
-#: builtin/apply.c:4408
+#: builtin/apply.c:4404
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:4526
+#: builtin/apply.c:4517
msgid "don't apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4529
+#: builtin/apply.c:4520
msgid "apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4532
+#: builtin/apply.c:4523
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: builtin/apply.c:4535
+#: builtin/apply.c:4526
msgid "ignore additions made by the patch"
msgstr ""
-#: builtin/apply.c:4537
+#: builtin/apply.c:4528
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: builtin/apply.c:4541
+#: builtin/apply.c:4532
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: builtin/apply.c:4543
+#: builtin/apply.c:4534
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: builtin/apply.c:4545
+#: builtin/apply.c:4536
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: builtin/apply.c:4547
+#: builtin/apply.c:4538
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: builtin/apply.c:4549
+#: builtin/apply.c:4540
msgid "apply a patch without touching the working tree"
msgstr ""
-#: builtin/apply.c:4551
+#: builtin/apply.c:4542
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: builtin/apply.c:4553
+#: builtin/apply.c:4544
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: builtin/apply.c:4555
+#: builtin/apply.c:4546
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: builtin/apply.c:4557
+#: builtin/apply.c:4548
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr ""
-#: builtin/apply.c:4562
+#: builtin/apply.c:4553
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: builtin/apply.c:4564
+#: builtin/apply.c:4555
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: builtin/apply.c:4567 builtin/apply.c:4570
+#: builtin/apply.c:4558 builtin/apply.c:4561
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: builtin/apply.c:4573
+#: builtin/apply.c:4564
msgid "apply the patch in reverse"
msgstr ""
-#: builtin/apply.c:4575
+#: builtin/apply.c:4566
msgid "don't expect at least one line of context"
msgstr ""
-#: builtin/apply.c:4577
+#: builtin/apply.c:4568
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: builtin/apply.c:4579
+#: builtin/apply.c:4570
msgid "allow overlapping hunks"
msgstr ""
-#: builtin/apply.c:4582
+#: builtin/apply.c:4573
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: builtin/apply.c:4585
+#: builtin/apply.c:4576
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: builtin/apply.c:4588
+#: builtin/apply.c:4579
msgid "prepend <root> to all filenames"
msgstr ""
-#: builtin/apply.c:4610
+#: builtin/apply.c:4601
msgid "--3way outside a repository"
msgstr ""
-#: builtin/apply.c:4618
+#: builtin/apply.c:4609
msgid "--index outside a repository"
msgstr ""
-#: builtin/apply.c:4621
+#: builtin/apply.c:4612
msgid "--cached outside a repository"
msgstr ""
-#: builtin/apply.c:4640
+#: builtin/apply.c:4631
#, c-format
msgid "can't open patch '%s'"
msgstr ""
-#: builtin/apply.c:4654
+#: builtin/apply.c:4645
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4660 builtin/apply.c:4670
+#: builtin/apply.c:4651 builtin/apply.c:4661
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3088,95 +3136,95 @@ msgstr ""
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:2500
+#: builtin/blame.c:2519
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:2501
+#: builtin/blame.c:2520
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:2502
+#: builtin/blame.c:2521
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:2503
+#: builtin/blame.c:2522
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:2504
+#: builtin/blame.c:2523
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:2505
+#: builtin/blame.c:2524
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:2506
+#: builtin/blame.c:2525
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:2507
+#: builtin/blame.c:2526
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:2508
+#: builtin/blame.c:2527
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:2509
+#: builtin/blame.c:2528
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:2510
+#: builtin/blame.c:2529
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2511
+#: builtin/blame.c:2530
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:2512
+#: builtin/blame.c:2531
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2513
+#: builtin/blame.c:2532
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:2514
+#: builtin/blame.c:2533
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:2515
+#: builtin/blame.c:2534
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:2516
+#: builtin/blame.c:2535
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:2517
+#: builtin/blame.c:2536
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:2518 builtin/blame.c:2519
+#: builtin/blame.c:2537 builtin/blame.c:2538
msgid "score"
msgstr ""
-#: builtin/blame.c:2518
+#: builtin/blame.c:2537
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:2519
+#: builtin/blame.c:2538
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "n,m"
msgstr ""
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "Process only line range n,m, counting from 1"
msgstr ""
@@ -3186,396 +3234,392 @@ msgstr ""
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2601
+#: builtin/blame.c:2620
msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/branch.c:24
+#: builtin/branch.c:25
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/branch.c:150
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr ""
+
+#: builtin/branch.c:142
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:154
+#: builtin/branch.c:146
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/branch.c:168
+#: builtin/branch.c:160
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:172
+#: builtin/branch.c:164
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/branch.c:185
+#: builtin/branch.c:177
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:213
+#: builtin/branch.c:205
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:219
+#: builtin/branch.c:211
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:227
+#: builtin/branch.c:219
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr ""
-#: builtin/branch.c:243
+#: builtin/branch.c:235
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:244
+#: builtin/branch.c:236
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:259
+#: builtin/branch.c:251
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/branch.c:260
+#: builtin/branch.c:252
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/branch.c:267
+#: builtin/branch.c:259
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:268
+#: builtin/branch.c:260
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:369
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr ""
-
-#: builtin/branch.c:452
+#: builtin/branch.c:303
#, c-format
msgid "[%s: gone]"
msgstr ""
-#: builtin/branch.c:457
+#: builtin/branch.c:308
#, c-format
msgid "[%s]"
msgstr ""
-#: builtin/branch.c:462
+#: builtin/branch.c:313
#, c-format
msgid "[%s: behind %d]"
msgstr ""
-#: builtin/branch.c:464
+#: builtin/branch.c:315
#, c-format
msgid "[behind %d]"
msgstr ""
-#: builtin/branch.c:468
+#: builtin/branch.c:319
#, c-format
msgid "[%s: ahead %d]"
msgstr ""
-#: builtin/branch.c:470
+#: builtin/branch.c:321
#, c-format
msgid "[ahead %d]"
msgstr ""
-#: builtin/branch.c:473
+#: builtin/branch.c:324
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:476
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:489
+#: builtin/branch.c:340
msgid " **** invalid ref ****"
msgstr ""
-#: builtin/branch.c:580
+#: builtin/branch.c:366
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: builtin/branch.c:583
+#: builtin/branch.c:369
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
-#: builtin/branch.c:589
+#: builtin/branch.c:375
#, c-format
msgid "(HEAD detached at %s)"
msgstr ""
-#: builtin/branch.c:592
+#: builtin/branch.c:378
#, c-format
msgid "(HEAD detached from %s)"
msgstr ""
-#: builtin/branch.c:596
+#: builtin/branch.c:382
msgid "(no branch)"
msgstr ""
-#: builtin/branch.c:643
-#, c-format
-msgid "object '%s' does not point to a commit"
-msgstr ""
-
-#: builtin/branch.c:691
-msgid "some refs could not be read"
-msgstr ""
-
-#: builtin/branch.c:704
+#: builtin/branch.c:524
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:714
+#: builtin/branch.c:534
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:729
+#: builtin/branch.c:549
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:733
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:737
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:744
+#: builtin/branch.c:564
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:759
-#, c-format
-msgid "malformed object name %s"
-msgstr ""
-
-#: builtin/branch.c:781
+#: builtin/branch.c:587
#, c-format
msgid "could not write branch description template: %s"
msgstr ""
-#: builtin/branch.c:811
+#: builtin/branch.c:616
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:813
+#: builtin/branch.c:618
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:814
+#: builtin/branch.c:619
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:815
+#: builtin/branch.c:620
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:817
+#: builtin/branch.c:622
msgid "change upstream info"
msgstr ""
-#: builtin/branch.c:821
+#: builtin/branch.c:626
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:822
+#: builtin/branch.c:627
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
-#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
-#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
-#: builtin/tag.c:624
-msgid "commit"
-msgstr ""
-
-#: builtin/branch.c:826 builtin/branch.c:832
+#: builtin/branch.c:629 builtin/branch.c:630
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:838
+#: builtin/branch.c:633
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:839
+#: builtin/branch.c:634
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:841
+#: builtin/branch.c:636
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:842
+#: builtin/branch.c:637
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:843
+#: builtin/branch.c:638
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:844
+#: builtin/branch.c:639
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:845
+#: builtin/branch.c:640
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:846
+#: builtin/branch.c:641
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:848
+#: builtin/branch.c:643
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:849
+#: builtin/branch.c:644
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:852
-msgid "print only not merged branches"
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:858
-msgid "print only merged branches"
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:862
+#: builtin/branch.c:647
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:875
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr ""
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr ""
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr ""
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr ""
+
+#: builtin/branch.c:670
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:879 builtin/clone.c:690
+#: builtin/branch.c:674 builtin/clone.c:697
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:901
+#: builtin/branch.c:694
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:912 builtin/branch.c:951
+#: builtin/branch.c:705 builtin/branch.c:747
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:927
+#: builtin/branch.c:723
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:932
+#: builtin/branch.c:728
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:939
+#: builtin/branch.c:735
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:942
+#: builtin/branch.c:738
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:957
+#: builtin/branch.c:753
msgid "too many branches for a rename operation"
msgstr ""
-#: builtin/branch.c:962
+#: builtin/branch.c:758
msgid "too many branches to set new upstream"
msgstr ""
-#: builtin/branch.c:966
+#: builtin/branch.c:762
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:973
+#: builtin/branch.c:769
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:985
+#: builtin/branch.c:781
msgid "too many branches to unset upstream"
msgstr ""
-#: builtin/branch.c:989
+#: builtin/branch.c:785
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:995
+#: builtin/branch.c:791
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:1009
+#: builtin/branch.c:805
msgid "it does not make sense to create 'HEAD' manually"
msgstr ""
-#: builtin/branch.c:1015
+#: builtin/branch.c:811
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:1018
+#: builtin/branch.c:814
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"track or --set-upstream-to\n"
msgstr ""
-#: builtin/branch.c:1035
+#: builtin/branch.c:831
#, c-format
msgid ""
"\n"
@@ -3583,12 +3627,12 @@ msgid ""
"\n"
msgstr ""
-#: builtin/branch.c:1036
+#: builtin/branch.c:832
#, c-format
msgid " git branch -d %s\n"
msgstr ""
-#: builtin/branch.c:1037
+#: builtin/branch.c:833
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr ""
@@ -3613,9 +3657,7 @@ msgid ""
msgstr ""
#: builtin/cat-file.c:429
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
-"objects>"
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
msgstr ""
#: builtin/cat-file.c:466
@@ -3671,7 +3713,7 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr ""
#: builtin/check-attr.c:19
@@ -3690,7 +3732,7 @@ msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr ""
@@ -3776,6 +3818,8 @@ msgid "write the content to temporary files"
msgstr ""
#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
msgid "string"
msgstr ""
@@ -3795,105 +3839,105 @@ msgstr ""
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:133 builtin/checkout.c:166
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:151
+#: builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:195
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:212
+#: builtin/checkout.c:213
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:229
+#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:263 builtin/checkout.c:266
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:268
+#: builtin/checkout.c:269
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:279 builtin/checkout.c:473
+#: builtin/checkout.c:280 builtin/checkout.c:474
msgid "corrupt index file"
msgstr ""
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:495
+#: builtin/checkout.c:496
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:622
+#: builtin/checkout.c:623
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:660
+#: builtin/checkout.c:661
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:667
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:670
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:674
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:676 builtin/checkout.c:1065
+#: builtin/checkout.c:677 builtin/checkout.c:1066
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:678
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:730
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:736
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -3908,7 +3952,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:755
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -3925,156 +3969,162 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:791
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:795
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:822 builtin/checkout.c:1060
+#: builtin/checkout.c:823 builtin/checkout.c:1061
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:967
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1006 builtin/worktree.c:210
+#: builtin/checkout.c:1007 builtin/worktree.c:213
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1035
+#: builtin/checkout.c:1036
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1074
+#: builtin/checkout.c:1075
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1077 builtin/checkout.c:1081
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1102
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
-#: builtin/worktree.c:319
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1136
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1138
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1139
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1140
msgid "detach the HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1141
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1146
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1148
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1149
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1149 builtin/merge.c:227
+#: builtin/checkout.c:1150 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
+#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
msgid "style"
msgstr ""
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1152
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1155
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1157
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1159
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr ""
+
+#: builtin/checkout.c:1191
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1198
+#: builtin/checkout.c:1208
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1213
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1239
+#: builtin/checkout.c:1249
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1256
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1261
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1265
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4110,7 +4160,7 @@ msgstr ""
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:317
+#: builtin/clean.c:315
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -4118,7 +4168,7 @@ msgid ""
" - (empty) select nothing"
msgstr ""
-#: builtin/clean.c:321
+#: builtin/clean.c:319
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -4130,36 +4180,36 @@ msgid ""
" - (empty) finish selecting"
msgstr ""
-#: builtin/clean.c:537
+#: builtin/clean.c:535
#, c-format
msgid "Huh (%s)?"
msgstr ""
-#: builtin/clean.c:679
+#: builtin/clean.c:677
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:716
+#: builtin/clean.c:714
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:737
+#: builtin/clean.c:735
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:778
+#: builtin/clean.c:776
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:803
+#: builtin/clean.c:801
msgid "Bye."
msgstr ""
-#: builtin/clean.c:811
+#: builtin/clean.c:809
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -4170,68 +4220,68 @@ msgid ""
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:838
+#: builtin/clean.c:836
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:839
+#: builtin/clean.c:837
msgid "What now"
msgstr ""
-#: builtin/clean.c:847
+#: builtin/clean.c:845
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:864
+#: builtin/clean.c:862
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:895
+#: builtin/clean.c:893
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:897
+#: builtin/clean.c:895
msgid "force"
msgstr ""
-#: builtin/clean.c:898
+#: builtin/clean.c:896
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:900
+#: builtin/clean.c:898
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
msgid "pattern"
msgstr ""
-#: builtin/clean.c:902
+#: builtin/clean.c:900
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:903
+#: builtin/clean.c:901
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:905
+#: builtin/clean.c:903
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:923
+#: builtin/clean.c:921
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:927
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:930
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -4241,16 +4291,11 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
-#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
-msgid "force progress reporting"
-msgstr ""
-
#: builtin/clone.c:59
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
msgid "create a bare repository"
msgstr ""
@@ -4274,15 +4319,15 @@ msgstr ""
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:75 builtin/init-db.c:501
+#: builtin/clone.c:75 builtin/init-db.c:466
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:76 builtin/init-db.c:502
+#: builtin/clone.c:76 builtin/init-db.c:467
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:78
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
msgid "reference repository"
msgstr ""
@@ -4306,7 +4351,7 @@ msgstr ""
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
#: builtin/pull.c:186
msgid "depth"
msgstr ""
@@ -4319,11 +4364,11 @@ msgstr ""
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:91 builtin/init-db.c:510
+#: builtin/clone.c:91 builtin/init-db.c:475
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:92 builtin/init-db.c:511
+#: builtin/clone.c:92 builtin/init-db.c:476
msgid "separate git dir from working tree"
msgstr ""
@@ -4335,173 +4380,174 @@ msgstr ""
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:298
+#: builtin/clone.c:300
#, c-format
-msgid "reference repository '%s' is not a local repository."
+msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
#: builtin/clone.c:302
#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr ""
+
+#: builtin/clone.c:307
+#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: builtin/clone.c:305
+#: builtin/clone.c:310
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: builtin/clone.c:370 builtin/diff.c:84
+#: builtin/clone.c:375 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: builtin/clone.c:372
+#: builtin/clone.c:377
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:386
+#: builtin/clone.c:391
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:408
+#: builtin/clone.c:413
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:412
+#: builtin/clone.c:417
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:435 builtin/clone.c:619
+#: builtin/clone.c:442 builtin/clone.c:626
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:447
+#: builtin/clone.c:454
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/clone.c:524
+#: builtin/clone.c:531
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:614
+#: builtin/clone.c:621
#, c-format
msgid "Checking connectivity... "
msgstr ""
-#: builtin/clone.c:617
+#: builtin/clone.c:624
msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/clone.c:681
+#: builtin/clone.c:688
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:712
+#: builtin/clone.c:719
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:799
+#: builtin/clone.c:808
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:801
+#: builtin/clone.c:810
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:831
+#: builtin/clone.c:842
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:835
+#: builtin/clone.c:846
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:846
+#: builtin/clone.c:857
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:849
+#: builtin/clone.c:860
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:862
+#: builtin/clone.c:873
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:868 builtin/fetch.c:1168
+#: builtin/clone.c:879 builtin/fetch.c:1166
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:878
+#: builtin/clone.c:889
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:888
+#: builtin/clone.c:899
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
-#: builtin/worktree.c:245
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:906
+#: builtin/clone.c:917
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:924
+#: builtin/clone.c:935
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:926
+#: builtin/clone.c:937
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:951
-msgid "--dissociate given, but there is no --reference"
-msgstr ""
-
-#: builtin/clone.c:968
+#: builtin/clone.c:975
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:971
+#: builtin/clone.c:978
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:976
+#: builtin/clone.c:983
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:980
+#: builtin/clone.c:987
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:1029 builtin/clone.c:1037
+#: builtin/clone.c:1036 builtin/clone.c:1044
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1040
+#: builtin/clone.c:1047
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -4537,15 +4583,15 @@ msgstr ""
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit.c:37
+#: builtin/commit.c:38
msgid "git commit [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4560,7 +4606,7 @@ msgid ""
" git commit --amend --reset-author\n"
msgstr ""
-#: builtin/commit.c:60
+#: builtin/commit.c:61
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4574,14 +4620,14 @@ msgid ""
" git commit --amend --reset-author\n"
msgstr ""
-#: builtin/commit.c:72
+#: builtin/commit.c:73
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:77
+#: builtin/commit.c:78
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4590,11 +4636,11 @@ msgid ""
"\n"
msgstr ""
-#: builtin/commit.c:84
+#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/commit.c:87
+#: builtin/commit.c:88
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4604,103 +4650,103 @@ msgid ""
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:304
+#: builtin/commit.c:305
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:345
+#: builtin/commit.c:346
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:351
+#: builtin/commit.c:352
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:364
+#: builtin/commit.c:365
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:366
+#: builtin/commit.c:367
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:444
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:446
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:455
+#: builtin/commit.c:456
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:474
+#: builtin/commit.c:475
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:579
+#: builtin/commit.c:580
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:581
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:600
+#: builtin/commit.c:601
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:608
+#: builtin/commit.c:609
#, c-format
msgid "invalid date format: %s"
msgstr ""
-#: builtin/commit.c:652
+#: builtin/commit.c:653
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:701 builtin/shortlog.c:273
+#: builtin/commit.c:702 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:703
+#: builtin/commit.c:704
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:707
+#: builtin/commit.c:708
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:729
+#: builtin/commit.c:730
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:733
+#: builtin/commit.c:734
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:784
+#: builtin/commit.c:785
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:802
+#: builtin/commit.c:803
#, c-format
msgid ""
"\n"
@@ -4710,7 +4756,7 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:807
+#: builtin/commit.c:808
#, c-format
msgid ""
"\n"
@@ -4720,14 +4766,14 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:820
+#: builtin/commit.c:821
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:827
+#: builtin/commit.c:828
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4735,335 +4781,341 @@ msgid ""
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:847
+#: builtin/commit.c:848
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:855
+#: builtin/commit.c:856
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:862
+#: builtin/commit.c:863
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:937
+#: builtin/commit.c:938
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:952 builtin/tag.c:495
+#: builtin/commit.c:953 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1054
+#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1069 builtin/commit.c:1309
+#: builtin/commit.c:1070 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1106
+#: builtin/commit.c:1107
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1136
+#: builtin/commit.c:1137
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1145
+#: builtin/commit.c:1146
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1150
+#: builtin/commit.c:1151
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1153
+#: builtin/commit.c:1154
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1163
+#: builtin/commit.c:1164
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1173
+#: builtin/commit.c:1174
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1190
+#: builtin/commit.c:1191
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1192
+#: builtin/commit.c:1193
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1194
+#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1196
+#: builtin/commit.c:1197
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1208 builtin/tag.c:730
+#: builtin/commit.c:1209 builtin/tag.c:475
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1213
+#: builtin/commit.c:1214
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1323 builtin/commit.c:1602
+#: builtin/commit.c:1324 builtin/commit.c:1605
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1325 builtin/commit.c:1604
+#: builtin/commit.c:1326 builtin/commit.c:1607
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
+#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1330 builtin/commit.c:1608
+#: builtin/commit.c:1331 builtin/commit.c:1611
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1333 builtin/commit.c:1611
+#: builtin/commit.c:1334 builtin/commit.c:1614
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:604
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr ""
-#: builtin/commit.c:1336 builtin/commit.c:1614
+#: builtin/commit.c:1337 builtin/commit.c:1617
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1339
+#: builtin/commit.c:1340
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1340 parse-options.h:155
+#: builtin/commit.c:1341 parse-options.h:155
msgid "when"
msgstr ""
-#: builtin/commit.c:1341
+#: builtin/commit.c:1342
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1343
+#: builtin/commit.c:1344
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1429
+#: builtin/commit.c:1430
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1431
+#: builtin/commit.c:1432
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1476
+#: builtin/commit.c:1477
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1479
+#: builtin/commit.c:1480
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1572
+#: builtin/commit.c:1575
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1573
+#: builtin/commit.c:1576
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1575
+#: builtin/commit.c:1578
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1576 builtin/tag.c:602
+#: builtin/commit.c:1579 builtin/tag.c:351
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "author"
msgstr ""
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1578 builtin/gc.c:268
+#: builtin/commit.c:1581 builtin/gc.c:326
msgid "date"
msgstr ""
-#: builtin/commit.c:1578
+#: builtin/commit.c:1581
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
-#: builtin/notes.c:555 builtin/tag.c:600
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
msgid "message"
msgstr ""
-#: builtin/commit.c:1579
+#: builtin/commit.c:1582
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1580
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr ""
+
+#: builtin/commit.c:1583
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1581
+#: builtin/commit.c:1584
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1582
+#: builtin/commit.c:1585
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1583
+#: builtin/commit.c:1586
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1584
+#: builtin/commit.c:1587
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1586
+#: builtin/commit.c:1589
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1587
+#: builtin/commit.c:1590
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1588
+#: builtin/commit.c:1591
msgid "default"
msgstr ""
-#: builtin/commit.c:1588 builtin/tag.c:605
+#: builtin/commit.c:1591 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1589
+#: builtin/commit.c:1592
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr ""
-#: builtin/commit.c:1594
+#: builtin/commit.c:1597
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1595
+#: builtin/commit.c:1598
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1596
+#: builtin/commit.c:1599
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1597
+#: builtin/commit.c:1600
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1598
+#: builtin/commit.c:1601
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1599
+#: builtin/commit.c:1602
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1600
+#: builtin/commit.c:1603
msgid "bypass pre-commit hook"
msgstr ""
-#: builtin/commit.c:1601
+#: builtin/commit.c:1604
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1612
+#: builtin/commit.c:1615
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1613
+#: builtin/commit.c:1616
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1618
+#: builtin/commit.c:1621
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1620
+#: builtin/commit.c:1623
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1695
+#: builtin/commit.c:1698
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1702
+#: builtin/commit.c:1705
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1721
+#: builtin/commit.c:1724
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1732
+#: builtin/commit.c:1735
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1737
+#: builtin/commit.c:1740
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1785
+#: builtin/commit.c:1788
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5198,11 +5250,11 @@ msgstr ""
msgid "respect include directives on lookup"
msgstr ""
-#: builtin/config.c:311
+#: builtin/config.c:303
msgid "unable to parse default color value"
msgstr ""
-#: builtin/config.c:449
+#: builtin/config.c:441
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5212,16 +5264,16 @@ msgid ""
"#\temail = %s\n"
msgstr ""
-#: builtin/config.c:583
+#: builtin/config.c:575
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/count-objects.c:55
+#: builtin/count-objects.c:77
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/count-objects.c:65
+#: builtin/count-objects.c:87
msgid "print sizes in human readable format"
msgstr ""
@@ -5335,7 +5387,7 @@ msgstr ""
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:410 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:314
msgid "show abbreviated commit object as fallback"
msgstr ""
@@ -5554,7 +5606,7 @@ msgstr ""
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
-#: builtin/fetch.c:478 builtin/fetch.c:564
+#: builtin/fetch.c:478 builtin/fetch.c:566
msgid "[rejected]"
msgstr ""
@@ -5578,125 +5630,125 @@ msgstr ""
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:566
+#: builtin/fetch.c:568
msgid "(non-fast-forward)"
msgstr ""
-#: builtin/fetch.c:600 builtin/fetch.c:842
+#: builtin/fetch.c:602 builtin/fetch.c:843
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: builtin/fetch.c:609
+#: builtin/fetch.c:611
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:627
+#: builtin/fetch.c:629
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:715 builtin/fetch.c:807
+#: builtin/fetch.c:716 builtin/fetch.c:808
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:726
+#: builtin/fetch.c:727
#, 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:778
+#: builtin/fetch.c:779
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:811
+#: builtin/fetch.c:812
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:812 builtin/remote.c:1034
+#: builtin/fetch.c:813 builtin/remote.c:1040
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:832
+#: builtin/fetch.c:833
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:854
+#: builtin/fetch.c:855
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:910
+#: builtin/fetch.c:911
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:1071
+#: builtin/fetch.c:1072
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1073 builtin/remote.c:90
+#: builtin/fetch.c:1074 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1091
+#: builtin/fetch.c:1092
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:1114
+#: builtin/fetch.c:1115
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1156
+#: builtin/fetch.c:1157
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1159
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1179
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1183
+#: builtin/fetch.c:1181
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1192
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1202
+#: builtin/fetch.c:1200
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
@@ -5705,23 +5757,23 @@ msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:667
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:670
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:676
+#: builtin/fmt-merge-msg.c:673
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:674
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:675
msgid "file to read from"
msgstr ""
@@ -5729,95 +5781,115 @@ msgstr ""
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr ""
-#: builtin/for-each-ref.c:24
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/for-each-ref.c:26
+#: builtin/for-each-ref.c:29
msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:36
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
msgid "format to use for the output"
msgstr ""
-#: builtin/for-each-ref.c:35
-msgid "key"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/for-each-ref.c:36
-msgid "field name to sort on"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/fsck.c:163 builtin/prune.c:137
+#: builtin/fsck.c:156 builtin/prune.c:140
msgid "Checking connectivity"
msgstr ""
-#: builtin/fsck.c:568
+#: builtin/fsck.c:486
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:631
+#: builtin/fsck.c:553
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:637
+#: builtin/fsck.c:559
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:638
+#: builtin/fsck.c:560
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:639
+#: builtin/fsck.c:561
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:640
+#: builtin/fsck.c:562
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:641
+#: builtin/fsck.c:563
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:642
+#: builtin/fsck.c:564
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:643
+#: builtin/fsck.c:565
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:644
+#: builtin/fsck.c:566
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:645
+#: builtin/fsck.c:567
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:647
+#: builtin/fsck.c:569
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:648 builtin/prune.c:107
+#: builtin/fsck.c:570 builtin/prune.c:107
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:707
+#: builtin/fsck.c:631
msgid "Checking objects"
msgstr ""
@@ -5825,54 +5897,64 @@ msgstr ""
msgid "git gc [<options>]"
msgstr ""
-#: builtin/gc.c:55
+#: builtin/gc.c:72
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: builtin/gc.c:100
+#: builtin/gc.c:139
#, c-format
msgid "insanely long object directory %.*s"
msgstr ""
-#: builtin/gc.c:269
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: builtin/gc.c:327
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:271
+#: builtin/gc.c:329
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:272
+#: builtin/gc.c:330
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:273
+#: builtin/gc.c:331
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:315
+#: builtin/gc.c:373
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:317
+#: builtin/gc.c:375
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:318
+#: builtin/gc.c:376
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:336
+#: builtin/gc.c:397
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:364
+#: builtin/gc.c:441
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -5906,199 +5988,195 @@ msgstr ""
msgid "cannot open '%s'"
msgstr ""
-#: builtin/grep.c:638
+#: builtin/grep.c:633
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:640
+#: builtin/grep.c:635
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:642
+#: builtin/grep.c:637
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:644
+#: builtin/grep.c:639
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:647
+#: builtin/grep.c:642
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:649
+#: builtin/grep.c:644
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:651
+#: builtin/grep.c:646
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:653
+#: builtin/grep.c:648
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:655
+#: builtin/grep.c:650
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:658
+#: builtin/grep.c:653
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:660
+#: builtin/grep.c:655
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:664
+#: builtin/grep.c:659
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:667
+#: builtin/grep.c:662
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:670
+#: builtin/grep.c:665
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:673
+#: builtin/grep.c:668
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:676
+#: builtin/grep.c:671
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:677
+#: builtin/grep.c:672
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:678
+#: builtin/grep.c:673
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:680
+#: builtin/grep.c:675
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:682
+#: builtin/grep.c:677
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:684
+#: builtin/grep.c:679
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:687
+#: builtin/grep.c:682
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:689
+#: builtin/grep.c:684
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:691
+#: builtin/grep.c:686
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:692
+#: builtin/grep.c:687
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:694
+#: builtin/grep.c:689
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:696
+#: builtin/grep.c:691
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:699
+#: builtin/grep.c:694
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:702
+#: builtin/grep.c:697
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:704
+#: builtin/grep.c:699
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:705
+#: builtin/grep.c:700
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:708
+#: builtin/grep.c:703
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:710
+#: builtin/grep.c:705
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:713
+#: builtin/grep.c:708
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:715
+#: builtin/grep.c:710
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:717
+#: builtin/grep.c:712
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:729
+#: builtin/grep.c:724
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:731
+#: builtin/grep.c:726
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:733
+#: builtin/grep.c:728
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "pager"
msgstr ""
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:740
+#: builtin/grep.c:735
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:741 builtin/show-ref.c:189
-msgid "show usage"
-msgstr ""
-
-#: builtin/grep.c:808
+#: builtin/grep.c:793
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:866
+#: builtin/grep.c:851
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:892
+#: builtin/grep.c:877
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:897
+#: builtin/grep.c:882
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
-#: builtin/grep.c:900
+#: builtin/grep.c:885
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:908
+#: builtin/grep.c:893
msgid "both --cached and trees are given."
msgstr ""
@@ -6109,10 +6187,10 @@ msgid ""
msgstr ""
#: builtin/hash-object.c:81
-msgid "git hash-object --stdin-paths < <list-of-paths>"
+msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/hash-object.c:92 builtin/tag.c:614
+#: builtin/hash-object.c:92
msgid "type"
msgstr ""
@@ -6183,80 +6261,80 @@ msgstr ""
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:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
msgid "failed to exec '%s': %s"
msgstr ""
-#: builtin/help.c:215
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:227
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:354
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:371
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:379
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:428
+#: builtin/help.c:411
msgid "Defining attributes per path"
msgstr ""
-#: builtin/help.c:429
+#: builtin/help.c:412
msgid "Everyday Git With 20 Commands Or So"
msgstr ""
-#: builtin/help.c:430
+#: builtin/help.c:413
msgid "A Git glossary"
msgstr ""
-#: builtin/help.c:431
+#: builtin/help.c:414
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: builtin/help.c:432
+#: builtin/help.c:415
msgid "Defining submodule properties"
msgstr ""
-#: builtin/help.c:433
+#: builtin/help.c:416
msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: builtin/help.c:434
+#: builtin/help.c:417
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
-#: builtin/help.c:435
+#: builtin/help.c:418
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: builtin/help.c:447
+#: builtin/help.c:430
msgid "The common Git guides are:\n"
msgstr ""
-#: builtin/help.c:468 builtin/help.c:485
+#: builtin/help.c:451 builtin/help.c:468
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/help.c:501
+#: builtin/help.c:484
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr ""
@@ -6549,87 +6627,62 @@ msgstr ""
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/init-db.c:36
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr ""
-
-#: builtin/init-db.c:63
-#, c-format
-msgid "insanely long template name %s"
-msgstr ""
-
-#: builtin/init-db.c:68
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/init-db.c:74
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr ""
-#: builtin/init-db.c:81
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/init-db.c:98
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/init-db.c:100
-#, c-format
-msgid "insanely long symlink %s"
-msgstr ""
-
-#: builtin/init-db.c:103
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/init-db.c:107
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/init-db.c:111
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr ""
-#: builtin/init-db.c:137
-#, c-format
-msgid "insanely long template path %s"
-msgstr ""
-
-#: builtin/init-db.c:145
+#: builtin/init-db.c:118
#, c-format
msgid "templates not found %s"
msgstr ""
-#: builtin/init-db.c:158
+#: builtin/init-db.c:131
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr ""
-#: builtin/init-db.c:212
-#, c-format
-msgid "insane git directory %s"
-msgstr ""
-
-#: builtin/init-db.c:344 builtin/init-db.c:347
+#: builtin/init-db.c:309 builtin/init-db.c:312
#, c-format
msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:375
+#: builtin/init-db.c:340
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:378
+#: builtin/init-db.c:343
#, c-format
msgid "unable to move %s to %s"
msgstr ""
@@ -6637,55 +6690,55 @@ msgstr ""
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:434
+#: builtin/init-db.c:399
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Reinitialized existing"
msgstr ""
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Initialized empty"
msgstr ""
-#: builtin/init-db.c:436
+#: builtin/init-db.c:401
msgid " shared"
msgstr ""
-#: builtin/init-db.c:483
+#: builtin/init-db.c:448
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:506
+#: builtin/init-db.c:471
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:507
+#: builtin/init-db.c:472
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:541 builtin/init-db.c:546
+#: builtin/init-db.c:506 builtin/init-db.c:511
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:550
+#: builtin/init-db.c:515
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:571
+#: builtin/init-db.c:536
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:599
+#: builtin/init-db.c:564
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
@@ -6769,33 +6822,33 @@ msgstr ""
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:814
+#: builtin/log.c:813
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:828
+#: builtin/log.c:827
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:838
+#: builtin/log.c:837
msgid "Not a range."
msgstr ""
-#: builtin/log.c:944
+#: builtin/log.c:943
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:1023
+#: builtin/log.c:1022
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1051
+#: builtin/log.c:1050
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1096
+#: builtin/log.c:1095
msgid "Two output directories?"
msgstr ""
@@ -6852,134 +6905,138 @@ msgid "don't output binary diffs"
msgstr ""
#: builtin/log.c:1241
-msgid "don't include a patch matching a commit upstream"
+msgid "output all-zero hash in From header"
msgstr ""
#: builtin/log.c:1243
-msgid "show patch format instead of default (patch + stat)"
+msgid "don't include a patch matching a commit upstream"
msgstr ""
#: builtin/log.c:1245
+msgid "show patch format instead of default (patch + stat)"
+msgstr ""
+
+#: builtin/log.c:1247
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1246
+#: builtin/log.c:1248
msgid "header"
msgstr ""
-#: builtin/log.c:1247
+#: builtin/log.c:1249
msgid "add email header"
msgstr ""
-#: builtin/log.c:1248 builtin/log.c:1250
+#: builtin/log.c:1250 builtin/log.c:1252
msgid "email"
msgstr ""
-#: builtin/log.c:1248
+#: builtin/log.c:1250
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1250
+#: builtin/log.c:1252
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1252
+#: builtin/log.c:1254
msgid "ident"
msgstr ""
-#: builtin/log.c:1253
+#: builtin/log.c:1255
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1255
+#: builtin/log.c:1257
msgid "message-id"
msgstr ""
-#: builtin/log.c:1256
+#: builtin/log.c:1258
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1257 builtin/log.c:1260
+#: builtin/log.c:1259 builtin/log.c:1262
msgid "boundary"
msgstr ""
-#: builtin/log.c:1258
+#: builtin/log.c:1260
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1261
+#: builtin/log.c:1263
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1265
+#: builtin/log.c:1267
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1267
+#: builtin/log.c:1269
msgid "signature"
msgstr ""
-#: builtin/log.c:1268
+#: builtin/log.c:1270
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1270
+#: builtin/log.c:1272
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1271
+#: builtin/log.c:1273
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1360
+#: builtin/log.c:1362
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1362
+#: builtin/log.c:1364
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1370
+#: builtin/log.c:1372
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1372
+#: builtin/log.c:1374
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1374
+#: builtin/log.c:1376
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1397
+#: builtin/log.c:1401
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1399
+#: builtin/log.c:1403
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1496
+#: builtin/log.c:1500
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1559
+#: builtin/log.c:1563
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1607
+#: builtin/log.c:1611
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1661
+#: builtin/log.c:1665
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
+#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr ""
@@ -7080,35 +7137,35 @@ msgstr ""
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr ""
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr ""
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr ""
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr ""
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr ""
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr ""
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr ""
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
@@ -7333,72 +7390,72 @@ msgstr ""
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1081
+#: builtin/merge.c:1079
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: builtin/merge.c:1208
+#: builtin/merge.c:1206
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1224
+#: builtin/merge.c:1222
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1231
+#: builtin/merge.c:1229
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1234
+#: builtin/merge.c:1232
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1243
+#: builtin/merge.c:1241
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1251
+#: builtin/merge.c:1249
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1268
+#: builtin/merge.c:1266
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1270
+#: builtin/merge.c:1268
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1276
+#: builtin/merge.c:1274
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1278
+#: builtin/merge.c:1276
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1333
+#: builtin/merge.c:1331
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: builtin/merge.c:1336
+#: builtin/merge.c:1334
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: builtin/merge.c:1339
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: builtin/merge.c:1342
+#: builtin/merge.c:1340
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
@@ -7408,46 +7465,46 @@ msgstr ""
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1462
+#: builtin/merge.c:1460
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1469
+#: builtin/merge.c:1467
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1501
+#: builtin/merge.c:1499
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1528
+#: builtin/merge.c:1526
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1594
+#: builtin/merge.c:1592
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1596
+#: builtin/merge.c:1594
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1605
+#: builtin/merge.c:1603
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1617
+#: builtin/merge.c:1615
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -7633,48 +7690,48 @@ msgstr ""
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:255
+#: builtin/name-rev.c:251
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:256
+#: builtin/name-rev.c:252
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:253
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:309
+#: builtin/name-rev.c:305
msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:306
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:308
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:310
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:311
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:312
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:322
+#: builtin/name-rev.c:318
msgid "dereference tags in the input (internal use)"
msgstr ""
@@ -7797,7 +7854,7 @@ msgstr ""
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:174 builtin/tag.c:477
+#: builtin/notes.c:174 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr ""
@@ -7815,12 +7872,12 @@ msgstr ""
msgid "The note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:232 builtin/tag.c:695
+#: builtin/notes.c:232 builtin/tag.c:440
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:234 builtin/tag.c:698
+#: builtin/notes.c:234 builtin/tag.c:443
#, c-format
msgid "could not open or read '%s'"
msgstr ""
@@ -7828,7 +7885,7 @@ msgstr ""
#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
-#: builtin/notes.c:877 builtin/tag.c:711
+#: builtin/notes.c:877 builtin/tag.c:456
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
@@ -7862,11 +7919,6 @@ msgstr ""
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
-#: builtin/notes.c:564 builtin/tag.c:630
-msgid "object"
-msgstr ""
-
#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr ""
@@ -7987,7 +8039,7 @@ msgstr ""
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1012 builtin/remote.c:1588
+#: builtin/notes.c:1012 builtin/remote.c:1647
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
@@ -8193,20 +8245,24 @@ msgstr ""
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:105 builtin/worktree.c:121
+#: builtin/prune.c:105 builtin/worktree.c:124
msgid "do not remove, show only"
msgstr ""
-#: builtin/prune.c:106 builtin/worktree.c:122
+#: builtin/prune.c:106 builtin/worktree.c:125
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:109 builtin/worktree.c:124
+#: builtin/prune.c:109 builtin/worktree.c:127
msgid "expire objects older than <time>"
msgstr ""
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr ""
+
#: builtin/pull.c:69
-msgid "git pull [options] [<repository> [<refspec>...]]"
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
#: builtin/pull.c:113
@@ -8337,25 +8393,25 @@ msgstr ""
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/push.c:15
+#: builtin/push.c:16
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/push.c:86
+#: builtin/push.c:88
msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/push.c:96
+#: builtin/push.c:98
msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/push.c:140
+#: builtin/push.c:142
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/push.c:143
+#: builtin/push.c:145
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -8370,7 +8426,7 @@ msgid ""
"%s"
msgstr ""
-#: builtin/push.c:158
+#: builtin/push.c:160
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -8380,7 +8436,7 @@ msgid ""
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/push.c:172
+#: builtin/push.c:174
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -8389,12 +8445,12 @@ msgid ""
" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/push.c:180
+#: builtin/push.c:182
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -8402,7 +8458,7 @@ msgid ""
"to update which remote branch."
msgstr ""
-#: builtin/push.c:206
+#: builtin/push.c:208
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -8427,12 +8483,12 @@ msgid ""
"'current' instead of 'simple' if you sometimes use older versions of Git)"
msgstr ""
-#: builtin/push.c:273
+#: builtin/push.c:275
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/push.c:280
+#: builtin/push.c:282
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -8440,7 +8496,7 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:286
+#: builtin/push.c:288
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -8448,7 +8504,7 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:292
+#: builtin/push.c:294
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -8457,33 +8513,33 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:299
+#: builtin/push.c:301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/push.c:302
+#: builtin/push.c:304
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr ""
-#: builtin/push.c:361
+#: builtin/push.c:363
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:365
+#: builtin/push.c:367
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:395
+#: builtin/push.c:397
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -8496,100 +8552,104 @@ msgid ""
" git push <name>\n"
msgstr ""
-#: builtin/push.c:411
+#: builtin/push.c:413
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:412
+#: builtin/push.c:414
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:417
+#: builtin/push.c:419
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:418
+#: builtin/push.c:420
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:423
+#: builtin/push.c:425
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:539
+#: builtin/push.c:537
msgid "repository"
msgstr ""
-#: builtin/push.c:540 builtin/send-pack.c:161
+#: builtin/push.c:538 builtin/send-pack.c:161
msgid "push all refs"
msgstr ""
-#: builtin/push.c:541 builtin/send-pack.c:163
+#: builtin/push.c:539 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:543
+#: builtin/push.c:541
msgid "delete refs"
msgstr ""
-#: builtin/push.c:544
+#: builtin/push.c:542
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:547 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:164
msgid "force updates"
msgstr ""
-#: builtin/push.c:549 builtin/send-pack.c:175
+#: builtin/push.c:547 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr ""
-#: builtin/push.c:550 builtin/send-pack.c:176
+#: builtin/push.c:548 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/push.c:553
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr ""
+
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:555 builtin/send-pack.c:169
+#: builtin/push.c:553 builtin/send-pack.c:169
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
+#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:558
+#: builtin/push.c:556
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:563
+#: builtin/push.c:561
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:567 builtin/send-pack.c:166
+#: builtin/push.c:565 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr ""
-#: builtin/push.c:569 builtin/send-pack.c:170
+#: builtin/push.c:567 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/push.c:579
+#: builtin/push.c:577
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:581
+#: builtin/push.c:579
msgid "--delete doesn't make sense without any refs"
msgstr ""
@@ -8664,12 +8724,12 @@ msgstr ""
msgid "debug unpack-trees"
msgstr ""
-#: builtin/reflog.c:432
+#: builtin/reflog.c:428
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: builtin/reflog.c:549 builtin/reflog.c:554
+#: builtin/reflog.c:545 builtin/reflog.c:550
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
@@ -8684,15 +8744,15 @@ msgid ""
"mirror=<fetch|push>] <name> <url>"
msgstr ""
-#: builtin/remote.c:14 builtin/remote.c:33
+#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
msgstr ""
-#: builtin/remote.c:15 builtin/remote.c:38
+#: builtin/remote.c:15 builtin/remote.c:39
msgid "git remote remove <name>"
msgstr ""
-#: builtin/remote.c:16 builtin/remote.c:43
+#: builtin/remote.c:16 builtin/remote.c:44
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr ""
@@ -8713,143 +8773,147 @@ msgstr ""
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr ""
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr ""
+
+#: builtin/remote.c:22 builtin/remote.c:75
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr ""
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url --add <name> <newurl>"
msgstr ""
-#: builtin/remote.c:23 builtin/remote.c:71
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --delete <name> <url>"
msgstr ""
-#: builtin/remote.c:28
+#: builtin/remote.c:29
msgid "git remote add [<options>] <name> <url>"
msgstr ""
-#: builtin/remote.c:48
+#: builtin/remote.c:49
msgid "git remote set-branches <name> <branch>..."
msgstr ""
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches --add <name> <branch>..."
msgstr ""
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote show [<options>] <name>"
msgstr ""
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote prune [<options>] <name>"
msgstr ""
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr ""
-#: builtin/remote.c:88
+#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
msgstr ""
-#: builtin/remote.c:120
+#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-#: builtin/remote.c:137
+#: builtin/remote.c:143
#, c-format
msgid "unknown mirror argument: %s"
msgstr ""
-#: builtin/remote.c:153
+#: builtin/remote.c:159
msgid "fetch the remote branches"
msgstr ""
-#: builtin/remote.c:155
+#: builtin/remote.c:161
msgid "import all tags and associated objects when fetching"
msgstr ""
-#: builtin/remote.c:158
+#: builtin/remote.c:164
msgid "or do not fetch any tag at all (--no-tags)"
msgstr ""
-#: builtin/remote.c:160
+#: builtin/remote.c:166
msgid "branch(es) to track"
msgstr ""
-#: builtin/remote.c:161
+#: builtin/remote.c:167
msgid "master branch"
msgstr ""
-#: builtin/remote.c:162
+#: builtin/remote.c:168
msgid "push|fetch"
msgstr ""
-#: builtin/remote.c:163
+#: builtin/remote.c:169
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
-#: builtin/remote.c:175
+#: builtin/remote.c:181
msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
-#: builtin/remote.c:177
+#: builtin/remote.c:183
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/remote.c:187 builtin/remote.c:637
+#: builtin/remote.c:193 builtin/remote.c:643
#, c-format
msgid "remote %s already exists."
msgstr ""
-#: builtin/remote.c:191 builtin/remote.c:641
+#: builtin/remote.c:197 builtin/remote.c:647
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
-#: builtin/remote.c:235
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr ""
-#: builtin/remote.c:335
+#: builtin/remote.c:341
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
-#: builtin/remote.c:436 builtin/remote.c:444
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr ""
-#: builtin/remote.c:448
+#: builtin/remote.c:454
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
#, c-format
msgid "No such remote: %s"
msgstr ""
-#: builtin/remote.c:647
+#: builtin/remote.c:653
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:653 builtin/remote.c:821
+#: builtin/remote.c:659 builtin/remote.c:827
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:668
+#: builtin/remote.c:674
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -8857,27 +8921,27 @@ msgid ""
"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/remote.c:674
+#: builtin/remote.c:680
#, c-format
msgid "Could not append '%s'"
msgstr ""
-#: builtin/remote.c:685
+#: builtin/remote.c:691
#, c-format
msgid "Could not set '%s'"
msgstr ""
-#: builtin/remote.c:707
+#: builtin/remote.c:713
#, c-format
msgid "deleting '%s' failed"
msgstr ""
-#: builtin/remote.c:741
+#: builtin/remote.c:747
#, c-format
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:807
+#: builtin/remote.c:813
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -8887,262 +8951,275 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:922
+#: builtin/remote.c:928
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:925
+#: builtin/remote.c:931
msgid " tracked"
msgstr ""
-#: builtin/remote.c:927
+#: builtin/remote.c:933
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:929
+#: builtin/remote.c:935
msgid " ???"
msgstr ""
-#: builtin/remote.c:970
+#: builtin/remote.c:976
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:977
+#: builtin/remote.c:983
#, c-format
msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:980
+#: builtin/remote.c:986
#, c-format
msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:981
+#: builtin/remote.c:987
msgid " and with remote"
msgstr ""
-#: builtin/remote.c:983
+#: builtin/remote.c:989
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:984
+#: builtin/remote.c:990
msgid " and with remote"
msgstr ""
-#: builtin/remote.c:1030
+#: builtin/remote.c:1036
msgid "create"
msgstr ""
-#: builtin/remote.c:1033
+#: builtin/remote.c:1039
msgid "delete"
msgstr ""
-#: builtin/remote.c:1037
+#: builtin/remote.c:1043
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1040
+#: builtin/remote.c:1046
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1043
+#: builtin/remote.c:1049
msgid "local out of date"
msgstr ""
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1053
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1057
+#: builtin/remote.c:1063
#, c-format
msgid " %-*s forces to %s"
msgstr ""
-#: builtin/remote.c:1060
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1155
+#: builtin/remote.c:1161
#, c-format
msgid "* remote %s"
msgstr ""
-#: builtin/remote.c:1156
+#: builtin/remote.c:1162
#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1157 builtin/remote.c:1308
+#: builtin/remote.c:1163 builtin/remote.c:1314
msgid "(no URL)"
msgstr ""
-#: builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1176
+#: builtin/remote.c:1182
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1188
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1191 builtin/remote.c:1218
+#: builtin/remote.c:1197 builtin/remote.c:1224
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1200
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1208
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1215
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1236
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1238
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1265
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1273
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1275
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1293
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1294
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1304
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1305
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1321
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1324
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1369
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1435 builtin/remote.c:1509
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1455
+#: builtin/remote.c:1461
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1462
+#: builtin/remote.c:1468
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1484
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr ""
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr ""
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1541
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1486
+#: builtin/remote.c:1543
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1488
+#: builtin/remote.c:1545
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1495
+#: builtin/remote.c:1552
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1535
+#: builtin/remote.c:1592
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1543
+#: builtin/remote.c:1600
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1545
+#: builtin/remote.c:1602
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1559
+#: builtin/remote.c:1616
msgid "be verbose; must be placed before a subcommand"
msgstr ""
@@ -9214,7 +9291,11 @@ msgstr ""
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:378
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr ""
+
+#: builtin/repack.c:381
#, c-format
msgid "removing '%s' failed"
msgstr ""
@@ -9307,7 +9388,7 @@ msgstr ""
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
-#: builtin/rerere.c:57
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr ""
@@ -9440,23 +9521,23 @@ msgstr ""
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-parse.c:361
+#: builtin/rev-parse.c:358
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/rev-parse.c:371
+#: builtin/rev-parse.c:368
msgid "output in stuck long form"
msgstr ""
-#: builtin/rev-parse.c:502
+#: builtin/rev-parse.c:499
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -9691,7 +9772,7 @@ msgstr ""
msgid "Linewrap output"
msgstr ""
-#: builtin/show-branch.c:9
+#: builtin/show-branch.c:10
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -9699,71 +9780,71 @@ msgid ""
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:646
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:648
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:649
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:651
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:653
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:655
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:659
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:662
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:683
+#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:685
+#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:688
+#: builtin/show-branch.c:669
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:689
+#: builtin/show-branch.c:670
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
@@ -9774,41 +9855,131 @@ msgid ""
msgstr ""
#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"
+msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr ""
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/show-ref.c:175 builtin/show-ref.c:177
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:174
msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/show-ref.c:181
+#: builtin/show-ref.c:176
msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:180
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/show-ref.c:187
+#: builtin/show-ref.c:182
msgid "show refs from stdin that aren't in local repository"
msgstr ""
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr ""
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr ""
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr ""
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr ""
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr ""
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr ""
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr ""
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr ""
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr ""
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr ""
+
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr ""
@@ -9837,52 +10008,47 @@ msgstr ""
msgid "reason of the update"
msgstr ""
-#: builtin/tag.c:22
+#: builtin/tag.c:23
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
msgstr ""
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[<pattern>...]"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -v <tagname>..."
msgstr ""
-#: builtin/tag.c:69
-#, c-format
-msgid "malformed object at '%s'"
-msgstr ""
-
-#: builtin/tag.c:301
+#: builtin/tag.c:80
#, c-format
msgid "tag name too long: %.*s..."
msgstr ""
-#: builtin/tag.c:306
+#: builtin/tag.c:85
#, c-format
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:321
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:333
+#: builtin/tag.c:112
#, c-format
msgid "could not verify the tag '%s'"
msgstr ""
-#: builtin/tag.c:343
+#: builtin/tag.c:122
#, c-format
msgid ""
"\n"
@@ -9891,7 +10057,7 @@ msgid ""
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:347
+#: builtin/tag.c:126
#, c-format
msgid ""
"\n"
@@ -9901,153 +10067,138 @@ msgid ""
"want to.\n"
msgstr ""
-#: builtin/tag.c:371
-#, c-format
-msgid "unsupported sort specification '%s'"
-msgstr ""
-
-#: builtin/tag.c:373
-#, c-format
-msgid "unsupported sort specification '%s' in variable '%s'"
-msgstr ""
-
-#: builtin/tag.c:428
+#: builtin/tag.c:199
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:430
+#: builtin/tag.c:201
msgid "unable to write tag file"
msgstr ""
-#: builtin/tag.c:455
+#: builtin/tag.c:226
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:468
+#: builtin/tag.c:239
msgid "tag header too big."
msgstr ""
-#: builtin/tag.c:504
+#: builtin/tag.c:275
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:510
+#: builtin/tag.c:281
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:559
-msgid "switch 'points-at' requires an object"
-msgstr ""
-
-#: builtin/tag.c:561
-#, c-format
-msgid "malformed object name '%s'"
-msgstr ""
-
-#: builtin/tag.c:590
+#: builtin/tag.c:339
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:592
+#: builtin/tag.c:341
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:594
+#: builtin/tag.c:343
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:595
+#: builtin/tag.c:344
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:597
+#: builtin/tag.c:346
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:599
+#: builtin/tag.c:348
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:601
+#: builtin/tag.c:350
msgid "tag message"
msgstr ""
-#: builtin/tag.c:603
+#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:607
+#: builtin/tag.c:356
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:608
+#: builtin/tag.c:357
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:609 builtin/update-ref.c:368
+#: builtin/tag.c:358 builtin/update-ref.c:368
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:611
+#: builtin/tag.c:360
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:612
+#: builtin/tag.c:361
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:614
-msgid "sort tags"
+#: builtin/tag.c:362 builtin/tag.c:363
+msgid "print only tags that contain the commit"
+msgstr ""
+
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:619 builtin/tag.c:625
-msgid "print only tags that contain the commit"
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:631
+#: builtin/tag.c:370
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:657
+#: builtin/tag.c:399
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:669
-msgid "--sort and -n are incompatible"
-msgstr ""
-
-#: builtin/tag.c:676
+#: builtin/tag.c:419
msgid "-n option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:678
+#: builtin/tag.c:421
msgid "--contains option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:680
+#: builtin/tag.c:423
msgid "--points-at option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:688
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr ""
+
+#: builtin/tag.c:433
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:708
+#: builtin/tag.c:453
msgid "too many params"
msgstr ""
-#: builtin/tag.c:714
+#: builtin/tag.c:459
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:719
+#: builtin/tag.c:464
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:744
+#: builtin/tag.c:489
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
@@ -10306,76 +10457,80 @@ msgstr ""
msgid "print tag contents"
msgstr ""
-#: builtin/worktree.c:13
-msgid "git worktree add [<options>] <path> <branch>"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
msgstr ""
-#: builtin/worktree.c:14
+#: builtin/worktree.c:16
msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/worktree.c:36
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:39
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/worktree.c:42
+#: builtin/worktree.c:45
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/worktree.c:47
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/worktree.c:74
+#: builtin/worktree.c:77
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/worktree.c:109
+#: builtin/worktree.c:112
#, c-format
msgid "failed to remove: %s"
msgstr ""
-#: builtin/worktree.c:198
+#: builtin/worktree.c:201
#, c-format
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:232
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:268
+#: builtin/worktree.c:271
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr ""
-#: builtin/worktree.c:316
+#: builtin/worktree.c:319
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:318
+#: builtin/worktree.c:321
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:320
+#: builtin/worktree.c:323
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:321
+#: builtin/worktree.c:324
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/worktree.c:328
+#: builtin/worktree.c:331
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
@@ -10518,86 +10673,86 @@ msgstr ""
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:236
+#: parse-options.h:237
msgid "be more verbose"
msgstr ""
-#: parse-options.h:238
+#: parse-options.h:239
msgid "be more quiet"
msgstr ""
-#: parse-options.h:244
+#: parse-options.h:245
msgid "use <n> digits to display SHA-1s"
msgstr ""
-#: rerere.h:28
+#: rerere.h:38
msgid "update the index with reused conflict resolution if possible"
msgstr ""
-#: git-bisect.sh:50
+#: git-bisect.sh:55
msgid "You need to start by \"git bisect start\""
msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:56
+#: git-bisect.sh:61
msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: git-bisect.sh:99
+#: git-bisect.sh:122
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr ""
-#: git-bisect.sh:103
+#: git-bisect.sh:126
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr ""
-#: git-bisect.sh:132
+#: git-bisect.sh:155
msgid "Bad HEAD - I need a HEAD"
msgstr ""
-#: git-bisect.sh:145
+#: git-bisect.sh:168
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr ""
-#: git-bisect.sh:155
+#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: git-bisect.sh:159
+#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
msgstr ""
-#: git-bisect.sh:211
+#: git-bisect.sh:234
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr ""
-#: git-bisect.sh:240
+#: git-bisect.sh:263
#, sh-format
msgid "Bad rev input: $arg"
msgstr ""
-#: git-bisect.sh:255
+#: git-bisect.sh:278
msgid "Please call 'bisect_state' with at least one argument."
msgstr ""
-#: git-bisect.sh:267
+#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
msgstr ""
-#: git-bisect.sh:276
+#: git-bisect.sh:299
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: git-bisect.sh:299
+#: git-bisect.sh:322
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr ""
@@ -10605,18 +10760,18 @@ msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:305
+#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
msgstr ""
-#: git-bisect.sh:317
+#: git-bisect.sh:340
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
-#: git-bisect.sh:320
+#: git-bisect.sh:343
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10624,67 +10779,97 @@ msgid ""
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
-#: git-bisect.sh:391 git-bisect.sh:521
+#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
msgstr ""
-#: git-bisect.sh:398
+#: git-bisect.sh:421
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr ""
-#: git-bisect.sh:407
+#: git-bisect.sh:430
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
-#: git-bisect.sh:435
+#: git-bisect.sh:458
msgid "No logfile given"
msgstr ""
-#: git-bisect.sh:436
+#: git-bisect.sh:459
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
-#: git-bisect.sh:455
+#: git-bisect.sh:480
msgid "?? what are you talking about?"
msgstr ""
-#: git-bisect.sh:467
+#: git-bisect.sh:492
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:474
+#: git-bisect.sh:499
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:500
+#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:506
+#: git-bisect.sh:531
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:513
+#: git-bisect.sh:538
msgid "bisect run success"
msgstr ""
-#: git-bisect.sh:548
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr ""
+
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr ""
+
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr ""
+
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr ""
+
+#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr ""
+
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+
#: git-rebase.sh:57
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
@@ -10717,34 +10902,34 @@ msgstr ""
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:351
+#: git-rebase.sh:354
msgid "The --exec option must be used with the --interactive option"
msgstr ""
-#: git-rebase.sh:356
+#: git-rebase.sh:359
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:367
+#: git-rebase.sh:370
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:374
+#: git-rebase.sh:377
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:377
+#: git-rebase.sh:380
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:395
+#: git-rebase.sh:398
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:414
+#: git-rebase.sh:417
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -10757,64 +10942,64 @@ msgid ""
"valuable there."
msgstr ""
-#: git-rebase.sh:465
+#: git-rebase.sh:468
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
-#: git-rebase.sh:489
+#: git-rebase.sh:492
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:495 git-rebase.sh:499
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:501
+#: git-rebase.sh:504
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:524
+#: git-rebase.sh:527
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: git-rebase.sh:557
+#: git-rebase.sh:560
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:562
+#: git-rebase.sh:565
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:566
+#: git-rebase.sh:569
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:586
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:590
+#: git-rebase.sh:593
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:601
+#: git-rebase.sh:604
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:610
+#: git-rebase.sh:613
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:620
+#: git-rebase.sh:623
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
@@ -10885,112 +11070,97 @@ msgstr ""
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:387
+#: git-stash.sh:405
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:397
+#: git-stash.sh:415
msgid "No stash found."
msgstr ""
-#: git-stash.sh:404
+#: git-stash.sh:422
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:410
+#: git-stash.sh:428
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:438
+#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:449
+#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:457
+#: git-stash.sh:475
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:461
+#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:469
+#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:471
+#: git-stash.sh:489
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:505
+#: git-stash.sh:523
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:520
+#: git-stash.sh:538
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:543
+#: git-stash.sh:561
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:544
+#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:552
+#: git-stash.sh:570
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:624
+#: git-stash.sh:642
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:95
+#: git-submodule.sh:104
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr ""
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:287
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr ""
-
-#: git-submodule.sh:296
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr ""
-
-#: git-submodule.sh:406
+#: git-submodule.sh:281
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:416
+#: git-submodule.sh:291
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:433
+#: git-submodule.sh:308
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:437
+#: git-submodule.sh:312
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -10998,235 +11168,235 @@ msgid ""
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:455
+#: git-submodule.sh:330
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:457
+#: git-submodule.sh:332
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:465
+#: git-submodule.sh:340
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:467
+#: git-submodule.sh:342
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr ""
-#: git-submodule.sh:469
+#: git-submodule.sh:344
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr ""
-#: git-submodule.sh:470
+#: git-submodule.sh:345
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-#: git-submodule.sh:472
+#: git-submodule.sh:347
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:484
+#: git-submodule.sh:359
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:489
+#: git-submodule.sh:364
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:498
+#: git-submodule.sh:373
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:542
+#: git-submodule.sh:417
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr ""
-#: git-submodule.sh:562
+#: git-submodule.sh:437
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr ""
-#: git-submodule.sh:608
+#: git-submodule.sh:483
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr ""
-#: git-submodule.sh:617
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:619
+#: git-submodule.sh:494
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:636
+#: git-submodule.sh:511
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:674
+#: git-submodule.sh:549
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr ""
-#: git-submodule.sh:691
+#: git-submodule.sh:566
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
-#: git-submodule.sh:692
+#: git-submodule.sh:567
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: git-submodule.sh:698
+#: git-submodule.sh:573
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr ""
-#: git-submodule.sh:701
+#: git-submodule.sh:576
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:702
+#: git-submodule.sh:577
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
-#: git-submodule.sh:705
+#: git-submodule.sh:580
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:714
+#: git-submodule.sh:589
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:830
+#: git-submodule.sh:705
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
-#: git-submodule.sh:843
+#: git-submodule.sh:718
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:852
+#: git-submodule.sh:727
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:876
+#: git-submodule.sh:751
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:890
+#: git-submodule.sh:765
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:891
+#: git-submodule.sh:766
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:895
+#: git-submodule.sh:770
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:896
+#: git-submodule.sh:771
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:901
+#: git-submodule.sh:776
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:902
+#: git-submodule.sh:777
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:907
+#: git-submodule.sh:782
#, sh-format
msgid ""
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
msgstr ""
-#: git-submodule.sh:908
+#: git-submodule.sh:783
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:938
+#: git-submodule.sh:813
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:1046
+#: git-submodule.sh:921
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:1098
+#: git-submodule.sh:973
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:1118
+#: git-submodule.sh:993
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:1121
+#: git-submodule.sh:996
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:1124
+#: git-submodule.sh:999
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1149
+#: git-submodule.sh:1024
msgid "blob"
msgstr ""
-#: git-submodule.sh:1267
+#: git-submodule.sh:1142
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:1331
+#: git-submodule.sh:1206
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""
diff --git a/po/ko.po b/po/ko.po
new file mode 100644
index 0000000..8ec0eac
--- /dev/null
+++ b/po/ko.po
@@ -0,0 +1,11859 @@
+# Git Korean translation
+# Copyright (C) 2015-2016 Changwoo Ryu and contributors
+# This file is distributed under the same license as the Git package.
+#
+# Contributors:
+# Hyunjun Kim <yoloseem AT users.noreply.github.com>, 2015.
+# Changwoo Ryu <cwryu@debian.org>, 2015-2016.
+#
+# - ìž‘ì—…ìžëŠ” 위 Contributors 목ë¡ì— 추가해 주세요.
+# - 번역하면서 80ì»¬ëŸ¼ì„ ë„˜ì–´ê°€ì§€ ì•Šë„ë¡ í•´ 주세요.
+# - 가능한한 ì›ë¬¸ì´ 1줄ì´ë©´ 1ì¤„ì— ë“¤ì–´ê°€ê²Œ 하고, 부ë“ì´í•˜ë©´ ê²½ìš°ì— ë”°ë¼
+# 알맞게 줄바꿈합니다. (커맨드ë¼ì¸ì´ë©´ 줄바꿈하고 ë‹¤ìŒ ì¤„ì— íƒ­ 2ê°œ)
+# - 용어는 ì¼ê´€ì„±ì„ 지켜 주십시오.
+# - ìš©ì–´ê°€ 바뀌어야 한다고 ìƒê°í•˜ë©´ 그렇게 번역하기 ì „ì— ì¶©ë¶„ížˆ ì˜ê²¬ êµí™˜ì„
+# 하십시오.
+# - ì¼ë°˜ì ì¸ 문장ì—ì„œ ì˜ì–´ 단어를 그대로 쓰지 않습니다. 최소한 ìŒì—­í•©ë‹ˆë‹¤.
+# - 예외ì ìœ¼ë¡œ 명령어 등 ë¬¸ìž ê·¸ëŒ€ë¡œ 가리키는 경우ì—만 ì›ë¬¸ 그대로 ì”니다.
+# - 예: 업스트림 추ì ì— 'origin' 대신 <ì´ë¦„>ì„ ì‚¬ìš©í•©ë‹ˆë‹¤
+# - ë²ˆì—­ëœ ìš©ì–´ê°€ 깃 명령어와 ì—°ê´€ë˜ëŠ” 경우ì—는 괄호 ì•ˆì— ì”니다.
+# - 예: ë˜ëŒë¦¬ê¸°(revert)ê°€ 진행 중입니다
+# - ìš©ì–´:
+# +--------------+----------------------------------------------+
+# | 3-way merge | 3-방향 병합 |
+# | author | ìž‘ì„±ìž |
+# | bisect | ì´ë“±ë¶„ |
+# | blob | 블롭 |
+# | bundle | 번들 |
+# | branch | 브랜치 |
+# | cherry-pick | (커밋) 빼오기 |
+# | commit | 커밋 |
+# | commit-ish | 커밋-따위 |
+# | committer | 커미터 |
+# | conflict | ì¶©ëŒ |
+# | fast-forward | 정방향 진행 |
+# | head | 헤드 |
+# | hook | í›… |
+# | history | (커밋) 내역 |
+# | Git | 깃 |
+# | log | ê¸°ë¡ |
+# | merge | 병합 |
+# | note | 노트 |
+# | pack | ë¬¶ìŒ |
+# | pathspec | 경로명세 |
+# | rebase | 리베ì´ìŠ¤ |
+# | ref | ë ˆí¼ëŸ°ìŠ¤ |
+# | repo | 저장소 |
+# | remote | 리모트 (저장소) |
+# | reset | 재지정 |
+# | revert | ë˜ëŒë¦¬ê¸° |
+# | subcommand | 하위 명령 |
+# | submodule | 하위 모듈 |
+# | tree-ish | 트리-따위 |
+# | working tree | ìž‘ì—… í´ë” |
+# +--------------+----------------------------------------------+
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2015-12-22 22:50+0800\n"
+"PO-Revision-Date: 2016-01-03 18:50+0900\n"
+"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
+"Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
+"ko>\n"
+"Language: ko\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: advice.c:55
+#, c-format
+msgid "hint: %.*s\n"
+msgstr "힌트: %.*s\n"
+
+#: advice.c:88
+msgid ""
+"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
+"as appropriate to mark resolution and make a commit."
+msgstr ""
+"ìž‘ì—… í´ë”ì—ì„œ 문제를 ë°”ë¡œìž¡ì€ ë‹¤ìŒ, 'git add/rm <파ì¼>'ì„ ì ì ˆížˆ\n"
+"사용해 해결 표시하고 커밋하십시오."
+
+#: advice.c:101 builtin/merge.c:1225
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "병합 ìž‘ì—…ì„ ë‹¤ 마치지 않았습니다 (MERGE_HEAD 파ì¼ì´ 있습니다)."
+
+#: advice.c:103
+msgid "Please, commit your changes before merging."
+msgstr "병합하기 ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ì‹­ì‹œì˜¤."
+
+#: advice.c:104
+msgid "Exiting because of unfinished merge."
+msgstr "ë³‘í•©ì„ ë§ˆì¹˜ì§€ 못했기 ë•Œë¬¸ì— ë납니다."
+
+#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<옵션>] <트리-따위> [<경로>...]"
+
+#: archive.c:13
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:14
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <저장소> [--exec <명령>] [<옵션>] <트리-따위> [<경로"
+">...]"
+
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <저장소> [--exec <명령>] --list"
+
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "'%s' 경로명세가 ì–´ë–¤ 파ì¼ê³¼ë„ ì¼ì¹˜í•˜ì§€ 않습니다"
+
+#: archive.c:429
+msgid "fmt"
+msgstr "형ì‹"
+
+#: archive.c:429
+msgid "archive format"
+msgstr "압축 형ì‹"
+
+#: archive.c:430 builtin/log.c:1229
+msgid "prefix"
+msgstr "ì ‘ë‘ì–´"
+
+#: archive.c:431
+msgid "prepend prefix to each pathname in the archive"
+msgstr "ì•„ì¹´ì´ë¸Œì˜ ê° ê²½ë¡œ ì´ë¦„ì˜ ì•žì— ì§€ì •í•œ 경로를 붙입니다"
+
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 builtin/blame.c:2536
+#: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989
+#: builtin/grep.c:707 builtin/hash-object.c:99 builtin/ls-files.c:446
+#: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558
+#: builtin/read-tree.c:109 parse-options.h:153
+msgid "file"
+msgstr "파ì¼"
+
+#: archive.c:433 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "ì•„ì¹´ì´ë¸Œë¥¼ ì´ íŒŒì¼ì— ì”니다"
+
+#: archive.c:435
+msgid "read .gitattributes in working directory"
+msgstr "ìž‘ì—… í´ë”ì˜ .gitattributes를 ì½ìŠµë‹ˆë‹¤"
+
+#: archive.c:436
+msgid "report archived files on stderr"
+msgstr "ì•„ì¹´ì´ë¸Œì— í¬í•¨ëœ 파ì¼ì„ 표준오류로 표시합니다"
+
+#: archive.c:437
+msgid "store only"
+msgstr "저장만 하기"
+
+#: archive.c:438
+msgid "compress faster"
+msgstr "ë” ë¹ ë¥´ê²Œ 압축"
+
+#: archive.c:446
+msgid "compress better"
+msgstr "ë” ìž‘ê²Œ 압축"
+
+#: archive.c:449
+msgid "list supported archive formats"
+msgstr "지ì›í•˜ëŠ” 압축 형ì‹ì˜ 목ë¡ì„ 표시합니다"
+
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
+msgid "repo"
+msgstr "저장소"
+
+#: archive.c:452 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "ì›ê²© 저장소 <저장소>ì—ì„œ ì•„ì¹´ì´ë¸Œë¥¼ 가져옵니다"
+
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
+msgid "command"
+msgstr "명령"
+
+#: archive.c:454 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "ì›ê²© git-upload-archive ëª…ë ¹ì˜ ê²½ë¡œ"
+
+#: attr.c:265
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"git attributesì—ì„œ 반대 íŒ¨í„´ì€ ë¬´ì‹œë©ë‹ˆë‹¤.\n"
+"ì•žì— ëŠë‚Œí‘œë¥¼ 쓰려면 '\\!'를 사용하십시오."
+
+#: branch.c:61
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr "%s 브랜치를 ìžì‹ ì˜ 업스트림으로 지정하지 ì•ŠìŒ."
+
+#: branch.c:84
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgstr ""
+"%s 브랜치가 리베ì´ìŠ¤ë¥¼ 통해 ë¦¬ëª¨íŠ¸ì˜ %s 브랜치를 (%sì—ì„œ) ë”°ë¼ê°€ë„ë¡ ì„¤ì •ë˜ì—ˆ"
+"습니다."
+
+#: branch.c:85
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr "%s 브랜치가 ë¦¬ëª¨íŠ¸ì˜ %s 브랜치를 (%sì—ì„œ) ë”°ë¼ê°€ë„ë¡ ì„¤ì •ë˜ì—ˆìŠµë‹ˆë‹¤."
+
+#: branch.c:89
+#, c-format
+msgid "Branch %s set up to track local branch %s by rebasing."
+msgstr ""
+"%s 브랜치가 리베ì´ìŠ¤ë¥¼ 통해 ë¦¬ëª¨íŠ¸ì˜ %s 브랜치를 ë”°ë¼ê°€ë„ë¡ ì„¤ì •ë˜ì—ˆìŠµë‹ˆë‹¤."
+
+#: branch.c:90
+#, c-format
+msgid "Branch %s set up to track local branch %s."
+msgstr "%s 브랜치가 %s 브랜치를 ë”°ë¼ê°€ë„ë¡ ì„¤ì •ë˜ì—ˆìŠµë‹ˆë‹¤."
+
+#: branch.c:95
+#, c-format
+msgid "Branch %s set up to track remote ref %s by rebasing."
+msgstr ""
+"%s 브랜치가 리베ì´ìŠ¤ë¥¼ 통해 ë¦¬ëª¨íŠ¸ì˜ %s ë ˆí¼ëŸ°ìŠ¤ë¥¼ ë”°ë¼ê°€ë„ë¡ ì„¤ì •ë˜ì—ˆìŠµë‹ˆë‹¤."
+
+#: branch.c:96
+#, c-format
+msgid "Branch %s set up to track remote ref %s."
+msgstr "%s 브랜치가 ë¦¬ëª¨íŠ¸ì˜ %s ë ˆí¼ëŸ°ìŠ¤ë¥¼ ë”°ë¼ê°€ë„ë¡ ì„¤ì •ë˜ì—ˆìŠµë‹ˆë‹¤."
+
+#: branch.c:100
+#, c-format
+msgid "Branch %s set up to track local ref %s by rebasing."
+msgstr ""
+"%s 브랜치가 리베ì´ìŠ¤ë¥¼ 통해 ë¡œì»¬ì˜ %s ë ˆí¼ëŸ°ìŠ¤ë¥¼ ë”°ë¼ê°€ë„ë¡ ì„¤ì •ë˜ì—ˆìŠµë‹ˆë‹¤."
+
+#: branch.c:101
+#, c-format
+msgid "Branch %s set up to track local ref %s."
+msgstr "%s 브랜치가 ë¡œì»¬ì˜ %s ë ˆí¼ëŸ°ìŠ¤ë¥¼ ë”°ë¼ê°€ë„ë¡ ì„¤ì •ë˜ì—ˆìŠµë‹ˆë‹¤."
+
+#: branch.c:134
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "ë”°ë¼ê°€ì§€ ì•ŠìŒ: %s ë ˆí¼ëŸ°ìŠ¤ì— 대해 애매한 ì •ë³´"
+
+#: branch.c:163
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "'%s'ì€(는) 올바른 브랜치 ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤."
+
+#: branch.c:168
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "ì´ë¦„ì´ '%s'ì¸ ë¸Œëžœì¹˜ê°€ ì´ë¯¸ 있습니다."
+
+#: branch.c:176
+msgid "Cannot force update the current branch."
+msgstr "현재 브랜치를 강제로 ì—…ë°ì´íŠ¸í•  수 없습니다."
+
+#: branch.c:196
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+"ë”°ë¼ê°€ê¸° 정보를 설정할 수 없습니다. 시작 위치 '%s'ì´(ê°€) 브랜치가 아닙니다."
+
+#: branch.c:198
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "요청한 업스트림 '%s' 브랜치가 없습니다"
+
+#: branch.c:200
+msgid ""
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+"\n"
+"ë¦¬ëª¨íŠ¸ì— ì´ë¯¸ 있는 업스트림 브랜치를 기반으로 작업하려면,\n"
+"먼저 \"git fetch\"로 가져 리모트 브랜치를 가져옵니다.\n"
+"\n"
+"새 로컬 브랜치를 ê±°ê¸°ì— í•´ë‹¹í•˜ëŠ” 리모트 브랜치로 push하려면,\n"
+"\"git push -u\"ë¡œ push하는 ì—…ìŠ¤íŠ¸ë¦¼ì„ ì„¤ì •í•  수 있습니다."
+
+#: branch.c:244
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "올바른 오브ì íŠ¸ ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤: '%s'."
+
+#: branch.c:264
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "애매한 오브ì íŠ¸ ì´ë¦„: '%s'."
+
+#: branch.c:269
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "올바른 브랜치 위치가 아닙니다: '%s'."
+
+#: branch.c:322
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s'ì€(는) ì´ë¯¸ '%s' ìœ„ì¹˜ì— ë°›ì•„ì ¸ 있습니다"
+
+#: bundle.c:34
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' 파ì¼ì´ 버전2 번들 파ì¼ë¡œ ë³´ì´ì§€ 않습니다"
+
+#: bundle.c:61
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "ì¸ì‹í•  수 없는 í—¤ë”: %s%s (%d)"
+
+#: bundle.c:87 builtin/commit.c:766
+#, c-format
+msgid "could not open '%s'"
+msgstr "'%s'ì„(를) ì—´ 수 없습니다"
+
+#: bundle.c:139
+msgid "Repository lacks these prerequisite commits:"
+msgstr "ì €ìž¥ì†Œì— í•„ìˆ˜ì ì¸ ë‹¤ìŒ ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤:"
+
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
+#: builtin/shortlog.c:158
+msgid "revision walk setup failed"
+msgstr "리비전 walk 준비가 실패했습니다"
+
+#: bundle.c:185
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "ë²ˆë“¤ì— ë‹¤ìŒ ë ˆí¼ëŸ°ìŠ¤ %d개가 있습니다:"
+
+#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "ë²ˆë“¤ì€ ì „ì²´ 커밋 ë‚´ì—­ì„ ê¸°ë¡í•©ë‹ˆë‹¤."
+
+#: bundle.c:194
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "ë²ˆë“¤ì— ë‹¤ìŒ ë ˆí¼ëŸ°ìŠ¤ %d개가 필요합니다:"
+
+#: bundle.c:253
+msgid "Could not spawn pack-objects"
+msgstr "pack-objects ëª…ë ¹ì„ ì‹¤í–‰í•  수 없습니다"
+
+#: bundle.c:264
+msgid "pack-objects died"
+msgstr "pack-objects ëª…ë ¹ì´ ì£½ì—ˆìŠµë‹ˆë‹¤"
+
+#: bundle.c:304
+msgid "rev-list died"
+msgstr "rev-list ëª…ë ¹ì´ ì£½ì—ˆìŠµë‹ˆë‹¤"
+
+#: bundle.c:353
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "rev-list 옵션ì—ì„œ '%s' ë ˆí¼ëŸ°ìŠ¤ê°€ 제외ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "ì•Œ 수 없는 ì¸ìž: %s"
+
+#: bundle.c:449
+msgid "Refusing to create empty bundle."
+msgstr "빈 ë²ˆë“¤ì€ ë§Œë“¤ì§€ 않습니다."
+
+#: bundle.c:459
+#, c-format
+msgid "cannot create '%s'"
+msgstr "'%s'ì„(를) 만들 수 없습니다"
+
+#: bundle.c:480
+msgid "index-pack died"
+msgstr "index-pack ëª…ë ¹ì´ ì£½ì—ˆìŠµë‹ˆë‹¤"
+
+#: color.c:275
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "ìž˜ëª»ëœ ìƒ‰ ê°’: %.*s"
+
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
+#, c-format
+msgid "could not parse %s"
+msgstr "parse %sì„(를) 파싱할 수 없습니다"
+
+#: commit.c:42
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s, ì»¤ë°‹ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "메모리 바닥남"
+
+#: config.c:474 config.c:476
+#, c-format
+msgid "bad config file line %d in %s"
+msgstr "%2$s íŒŒì¼ %1$d번 ì¤„ì— ìž˜ëª»ëœ ì„¤ì •"
+
+#: config.c:592
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', %s 파ì¼): %s"
+
+#: config.c:594
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s'): %s"
+
+#: config.c:679
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "다ìŒì— ì‚¬ìš©ìž ë””ë ‰í„°ë¦¬ í™•ìž¥ì— ì‹¤íŒ¨: '%s'"
+
+#: config.c:757 config.c:768
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "%dë²ˆì€ ì˜¬ë°”ë¥¸ zlib 압축 단계가 아닙니다"
+
+#: config.c:890
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "오브ì íŠ¸ ìƒì„± 모드가 올바르지 않습니다: %s"
+
+#: config.c:1216
+msgid "unable to parse command-line config"
+msgstr "명령행 ì„¤ì •ì„ íŒŒì‹±í•  수 없습니다"
+
+#: config.c:1277
+msgid "unknown error occured while reading the configuration files"
+msgstr "설정 파ì¼ì„ ì½ëŠ” 중 ì•Œ 수 없는 오류가 ìƒê²¼ìŠµë‹ˆë‹¤"
+
+#: config.c:1601
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "명령행 설정ì—ì„œ '%s'ì„(를) 설정할 수 없습니다"
+
+#: config.c:1603
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "'%2$s' 파ì¼ì˜ %3$d번 줄 '%1$s' 설정 변수가 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: config.c:1662
+#, c-format
+msgid "%s has multiple values"
+msgstr "%sì€(는) 여러 ê°œ ê°’ì´ ìžˆìŠµë‹ˆë‹¤"
+
+#: connected.c:69
+msgid "Could not run 'git rev-list'"
+msgstr "'git rev-list'를 실행할 수 없습니다"
+
+#: connected.c:89
+#, c-format
+msgid "failed write to rev-list: %s"
+msgstr "rev-list ì“°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: %s"
+
+#: connected.c:97
+#, c-format
+msgid "failed to close rev-list's stdin: %s"
+msgstr "rev-listì˜ í‘œì¤€ìž…ë ¥ì„ ë‹«ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: %s"
+
+#: date.c:95
+msgid "in the future"
+msgstr "미래ì—"
+
+#: date.c:101
+#, c-format
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] "%luì´ˆ ì „"
+
+#: date.c:108
+#, c-format
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] "%lu분 전"
+
+#: date.c:115
+#, c-format
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] "%lu시간 전"
+
+#: date.c:122
+#, c-format
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] "%luì¼ ì „"
+
+#: date.c:128
+#, c-format
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] "%lu주 전"
+
+#: date.c:135
+#, c-format
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] "%lu달 전"
+
+#: date.c:146
+#, c-format
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] "%luë…„"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:149
+#, c-format
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] "%s %lu달 전"
+
+#: date.c:154 date.c:159
+#, c-format
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] "%luë…„ ì „"
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "'%s' 순서 파ì¼ì„ ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr "부정확한 ì´ë¦„ 바꾸기 íƒìƒ‰ì„ 수행하는 중"
+
+#: diff.c:115
+#, c-format
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr " dirstat ìžë¦„ í¼ì„¼íŠ¸ ê°’ '%s' íŒŒì‹±ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤\n"
+
+#: diff.c:120
+#, c-format
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " ì•Œ 수 없는 dirstat 파ë¼ë¯¸í„° '%s'\n"
+
+#: diff.c:215
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "'diff.submodule' 설정 ë³€ìˆ˜ì— ì•Œ 수 없는 ê°’: '%s'"
+
+#: diff.c:267
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"'diff.submodule' 설정 ë³€ìˆ˜ì— ì˜¤ë¥˜:\n"
+"%s'"
+
+#: diff.c:3000
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "외부 diff í”„ë¡œê·¸ëž¨ì´ ì£½ìŒ, %s 위치ì—ì„œ 멈춤"
+
+#: diff.c:3396
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow 옵션ì—는 정확히 í•˜ë‚˜ì˜ ê²½ë¡œëª…ì„¸ê°€ 필요합니다"
+
+#: diff.c:3559
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"--dirstat/-X 옵션 파ë¼ë¯¸í„°ë¥¼ íŒŒì‹±í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤:\n"
+"%s"
+
+#: diff.c:3573
+#, c-format
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "--submodule 옵션 파ë¼ë¯¸í„° íŒŒì‹±ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: '%s'"
+
+#: dir.c:1915
+msgid "failed to get kernel name and information"
+msgstr "ì»¤ë„ ì´ë¦„ê³¼ 정보를 ê°€ì ¸ì˜¤ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: dir.c:1998
+msgid "Untracked cache is disabled on this system."
+msgstr "ì´ ì‹œìŠ¤í…œì—서는 추ì ë˜ì§€ 않는 ìºì‹œë¥¼ 사용하지 않습니다."
+
+#: gpg-interface.c:166 gpg-interface.c:237
+msgid "could not run gpg."
+msgstr "gpg를 실행할 수 없습니다."
+
+#: gpg-interface.c:178
+msgid "gpg did not accept the data"
+msgstr "gpgì—ì„œ ë°ì´í„°ë¥¼ 받아들ì´ì§€ 않습니다"
+
+#: gpg-interface.c:189
+msgid "gpg failed to sign the data"
+msgstr "gpgì—ì„œ ë°ì´í„°ë¥¼ ì„œëª…í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: gpg-interface.c:222
+#, c-format
+msgid "could not create temporary file '%s': %s"
+msgstr "ìž„ì‹œ íŒŒì¼ '%s'ì„(를) 만들 수 없습니다: %s"
+
+#: gpg-interface.c:225
+#, c-format
+msgid "failed writing detached signature to '%s': %s"
+msgstr "ë¶„ë¦¬ëœ ì„œëª…ì„ '%s'ì— ì“°ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: %s"
+
+#: grep.c:1718
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': %sì„(를) ì½ì„ 수 없습니다"
+
+#: grep.c:1735
+#, c-format
+msgid "'%s': %s"
+msgstr "'%s': %s"
+
+#: grep.c:1746
+#, c-format
+msgid "'%s': short read %s"
+msgstr "'%s': %sì—ì„œ ì½ë‹¤ê°€ 잘림"
+
+#: help.c:207
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "'%s'ì— ìžˆëŠ” 깃 명령"
+
+#: help.c:214
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "다른 $PATHì— ìžˆëŠ” 깃 명령"
+
+#: help.c:246
+msgid "These are common Git commands used in various situations:"
+msgstr "다ìŒì€ 여러가지 ìƒí™©ì—ì„œ ìžì£¼ 사용하는 깃 명령입니다:"
+
+#: help.c:311
+#, 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 ""
+"'%s'ì€(는) 깃 명령으로 ë³´ì´ì§€ë§Œ, 실행할 수\n"
+"없습니다. ì•„ë§ˆë„ git-%s ë§ê°€ì§„ 것 같습니다."
+
+#: help.c:368
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "ì–´ë¼ë¼. ì‹œìŠ¤í…œì— ê¹ƒ ëª…ë ¹ì´ í•˜ë‚˜ë„ ì—†ë‹¤ê³  나옵니다."
+
+#: help.c:390
+#, 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 ""
+"경고: ì´ë¦„ì´ '%s'ì¸ ê¹ƒ ëª…ë ¹ì„ ì‹¤í–‰í–ˆì§€ë§Œ, ê·¸ ëª…ë ¹ì´ ì—†ìŠµë‹ˆë‹¤.\n"
+"ìžë™ìœ¼ë¡œ '%s' 명령ì´ë¼ê³  가정하고 계ì†í•©ë‹ˆë‹¤"
+
+#: help.c:395
+#, c-format
+msgid "in %0.1f seconds automatically..."
+msgstr "(%0.1fì´ˆ ë’¤ì—)..."
+
+#: help.c:402
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s'ì€(는) 깃 ëª…ë ¹ì´ ì•„ë‹™ë‹ˆë‹¤. 'git --help'를 참고하십시오."
+
+#: help.c:406 help.c:466
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"다ìŒì„ ì˜ë„하신 것 아니었나요?"
+
+#: help.c:462
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "ìºì‹œë¥¼ ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
+msgid "unable to write new index file"
+msgstr "새 ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다"
+
+#: merge-recursive.c:189
+#, c-format
+msgid "(bad commit)\n"
+msgstr "(ìž˜ëª»ëœ ì»¤ë°‹)\n"
+
+#: merge-recursive.c:209
+#, c-format
+msgid "addinfo_cache failed for path '%s'"
+msgstr "'%s' ê²½ë¡œì— ëŒ€í•´ addinfo_cacheê°€ 실패했습니다"
+
+#: merge-recursive.c:270
+msgid "error building trees"
+msgstr "트리 ë¹Œë“œì— ì˜¤ë¥˜"
+
+#: merge-recursive.c:686
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "'%s' 경로 ë§Œë“¤ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤%s"
+
+#: merge-recursive.c:697
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "하위 ë””ë ‰í„°ë¦¬ì— ê³µê°„ì„ ë§Œë“œë ¤ê³  %sì„(를) 제거합니다\n"
+
+#: merge-recursive.c:711 merge-recursive.c:732
+msgid ": perhaps a D/F conflict?"
+msgstr ": ì•„ë§ˆë„ D/F 충ëŒ?"
+
+#: merge-recursive.c:722
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "'%s' ìœ„ì¹˜ì˜ ì¶”ì ë˜ì§€ 않는 파ì¼ì„ 잃기를 거부합니다"
+
+#: merge-recursive.c:762
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "%s '%s' 오브ì íŠ¸ë¥¼ ì½ì„ 수 ì—†ìŒ"
+
+#: merge-recursive.c:764
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s'ì— ëŒ€í•´ ë¸”ë¡­ì„ ì˜ˆìƒ"
+
+#: merge-recursive.c:787 builtin/clone.c:369
+#, c-format
+msgid "failed to open '%s'"
+msgstr "'%s'ì„(를) ì—¬ëŠ”ë° ì‹¤íŒ¨"
+
+#: merge-recursive.c:795
+#, c-format
+msgid "failed to symlink '%s'"
+msgstr "'%s' 심볼릭 ë§í¬ì— 실패"
+
+#: merge-recursive.c:798
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "다ìŒì„ 어떻게 할지 ì•Œ 수 없습니다: %06o %s '%s'"
+
+#: merge-recursive.c:936
+msgid "Failed to execute internal merge"
+msgstr "내부 병합 ì‹¤í–‰ì— ì‹¤íŒ¨"
+
+#: merge-recursive.c:940
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "%sì„(를) ë°ì´í„°ë² ì´ìŠ¤ì— 추가할 수 없습니다"
+
+#: merge-recursive.c:956
+msgid "unsupported object type in the tree"
+msgstr "트리ì—ì„œ 지ì›í•˜ì§€ 않는 오브ì íŠ¸ 종류"
+
+#: merge-recursive.c:1031 merge-recursive.c:1045
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"충ëŒ! (%s/ì‚­ì œ): %s (위치 %s) ë° %s (%sì—ì„œ) ì‚­ì œ. %s ë²„ì „ì˜ %s íŠ¸ë¦¬ì— ë‚¨ìŒ."
+
+#: merge-recursive.c:1037 merge-recursive.c:1050
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"충ëŒ! (%s/ì‚­ì œ): %s (위치 %s) ë° %s (위치 %s) ì‚­ì œ. %s ë²„ì „ì˜ %s íŠ¸ë¦¬ì— "
+"%s(으)ë¡œ 남ìŒ."
+
+#: merge-recursive.c:1091
+msgid "rename"
+msgstr "ì´ë¦„바꾸기"
+
+#: merge-recursive.c:1091
+msgid "renamed"
+msgstr "ì´ë¦„바꿈"
+
+#: merge-recursive.c:1147
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%sì€(는) %sì— ìžˆëŠ” 디렉터리로 %s(으)ë¡œ ì´ë¦„ì„ ë°”ê¿‰ë‹ˆë‹¤"
+
+#: merge-recursive.c:1169
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"충ëŒ! (ì´ë¦„바꾸기/ì´ë¦„바꾸기): \"%3$s\" 브랜치ì—ì„œ ì´ë¦„바꾸기 \"%1$s\"->"
+"\"%2$s\" \"%6$s\" 브랜치ì—ì„œ ì´ë¦„ 바꾸기 \"%4$s\"->\"%5$s\"%7$s"
+
+#: merge-recursive.c:1174
+msgid " (left unresolved)"
+msgstr " (í•´ê²°ë˜ì§€ ì•ŠìŒ)"
+
+#: merge-recursive.c:1228
+#, c-format
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr ""
+"충ëŒ! (rename/rename): ì´ë¦„ 바꾸기 %s->%s (위치 %s). ì´ë¦„ 바꾸기 %s->%s (위"
+"치 %s)"
+
+#: merge-recursive.c:1258
+#, c-format
+msgid "Renaming %s to %s and %s to %s instead"
+msgstr "대신 ì´ë¦„ì„ %sì—ì„œ %s(으)ë¡œ 바꾸고 %sì—ì„œ %s(으)ë¡œ 바꿉니다"
+
+#: merge-recursive.c:1457
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgstr "충ëŒ! (rename/add): ì´ë¦„ 바꾸기 %s->%s (위치 %s). %s 추가 (위치 %s)"
+
+#: merge-recursive.c:1467
+#, c-format
+msgid "Adding merged %s"
+msgstr "ë³‘í•©ëœ %sì„(를) 추가합니다"
+
+#: merge-recursive.c:1472 merge-recursive.c:1674
+#, c-format
+msgid "Adding as %s instead"
+msgstr "대신 %s(으)로 추가합니다"
+
+#: merge-recursive.c:1523
+#, c-format
+msgid "cannot read object %s"
+msgstr "%s 오브ì íŠ¸ë¥¼ ì½ì„ 수 없습니다"
+
+#: merge-recursive.c:1526
+#, c-format
+msgid "object %s is not a blob"
+msgstr "%s 오브ì íŠ¸ëŠ” ë¸”ë¡­ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: merge-recursive.c:1578
+msgid "modify"
+msgstr "수정"
+
+#: merge-recursive.c:1578
+msgid "modified"
+msgstr "수정ë¨"
+
+#: merge-recursive.c:1588
+msgid "content"
+msgstr "ë‚´ìš©"
+
+#: merge-recursive.c:1595
+msgid "add/add"
+msgstr "추가/추가"
+
+#: merge-recursive.c:1629
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "건너뛰기: %s (기존과 같게 병합)"
+
+#: merge-recursive.c:1643
+#, c-format
+msgid "Auto-merging %s"
+msgstr "ìžë™ 병합: %s"
+
+#: merge-recursive.c:1647 git-submodule.sh:1025
+msgid "submodule"
+msgstr "하위 모듈"
+
+#: merge-recursive.c:1648
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "충ëŒ! (%s): %sì— ë³‘í•© 충ëŒ"
+
+#: merge-recursive.c:1734
+#, c-format
+msgid "Removing %s"
+msgstr "제거: %s"
+
+#: merge-recursive.c:1759
+msgid "file/directory"
+msgstr "파ì¼/디렉터리"
+
+#: merge-recursive.c:1765
+msgid "directory/file"
+msgstr "디렉터리/파ì¼"
+
+#: merge-recursive.c:1770
+#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr ""
+"충ëŒ! (%s): ì´ë¦„ì´ %sì¸ ë””ë ‰í„°ë¦¬ê°€ %sì— ìžˆìŠµë‹ˆë‹¤. %sì„(를) %s(으)ë¡œ 추가합니"
+"다"
+
+#: merge-recursive.c:1780
+#, c-format
+msgid "Adding %s"
+msgstr "추가: %s"
+
+#: merge-recursive.c:1797
+msgid "Fatal merge failure, shouldn't happen."
+msgstr "치명ì ì¸ 병합 실패, ì¼ì–´ë‚  수 없는 ìƒí™©."
+
+#: merge-recursive.c:1816
+msgid "Already up-to-date!"
+msgstr "ì´ë¯¸ ì—…ë°ì´íŠ¸ ìƒíƒœìž…니다!"
+
+#: merge-recursive.c:1825
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "%s ë° %s íŠ¸ë¦¬ì˜ ë³‘í•©ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: merge-recursive.c:1855
+#, c-format
+msgid "Unprocessed path??? %s"
+msgstr "처리ë˜ì§€ ì•Šì€ ê²½ë¡œ??? %s"
+
+#: merge-recursive.c:1903
+msgid "Merging:"
+msgstr "병합:"
+
+#: merge-recursive.c:1916
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "ê³¼ê±°ì˜ ê³µí†µ 커밋 %uê°œ 발견:"
+
+#: merge-recursive.c:1953
+msgid "merge returned no commit"
+msgstr "병합 ê²°ê³¼ì— ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: merge-recursive.c:2010
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "'%s' 오브ì íŠ¸ë¥¼ 파싱할 수 없습니다"
+
+#: merge-recursive.c:2021 builtin/merge.c:645
+msgid "Unable to write index."
+msgstr "ì¸ë±ìŠ¤ë¥¼ 쓸 수 없습니다."
+
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "초기화하지 않았거나 ë ˆí¼ëŸ°ìŠ¤í•˜ì§€ ì•Šì€ notes 트리를 커밋할 수 없습니다"
+
+#: notes-utils.c:100
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "ìž˜ëª»ëœ notes.rewriteMode ê°’: '%s'"
+
+#: notes-utils.c:110
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "%sì—ì„œ 노트를 다시 쓰기를 거부합니다 (refs/notes/ ë°–ìž„)"
+
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "ìž˜ëª»ëœ %s ê°’: '%s'"
+
+#: object.c:242
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "오브ì íŠ¸ë¥¼ 파싱할 수 없습니다: %s"
+
+#: parse-options.c:570
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:588
+#, c-format
+msgid "usage: %s"
+msgstr "사용법: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:592
+#, c-format
+msgid " or: %s"
+msgstr " ë˜ëŠ”: %s"
+
+#: parse-options.c:595
+#, c-format
+msgid " %s"
+msgstr " %s"
+
+#: parse-options.c:629
+msgid "-NUM"
+msgstr "-NUM"
+
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "ìž˜ëª»ëœ í˜•ì‹ì˜ 오브ì íŠ¸ ì´ë¦„ '%s'"
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "%sì„(를) 그룹ì—ì„œ 쓰기 가능하ë„ë¡ ë§Œë“¤ 수 없습니다"
+
+#: pathspec.c:133
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "'glob' ë° 'noglob' 경로명세 ì „ì²´ ì„¤ì •ì€ í˜¸í™˜ë˜ì§€ 않습니다"
+
+#: pathspec.c:143
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"'literal' 경로명세 ì „ì²´ ì„¤ì •ì€ ë‹¤ë¥¸ 경로명세 ì „ì²´ 설정과 호환ë˜ì§€ 않습니다"
+
+#: pathspec.c:177
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "경로명세 지시어 'prefix'ì— ìž˜ëª»ëœ íŒŒë¼ë¯¸í„°"
+
+#: pathspec.c:183
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "ìž˜ëª»ëœ ê²½ë¡œëª…ì„¸ 지시어 '%.*s' (위치 '%s')"
+
+#: pathspec.c:187
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "경로 명세 지시어 ëì— ')' ë¹ ì§ (위치 '%s')"
+
+#: pathspec.c:205
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "구현ë˜ì§€ ì•Šì€ ê²½ë¡œëª…ì„¸ 지시어 '%c' (위치 '%s')"
+
+#: pathspec.c:230
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal'ê³¼ 'glob'ì€ í˜¸í™˜ë˜ì§€ 않습니다"
+
+#: pathspec.c:241
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s: '%s'ì€(는) 저장소 밖입니다"
+
+#: pathspec.c:291
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "경로명세 '%s'ì€(는) ''%.*s' 하위 모듈 ì•ˆì— ìžˆìŠµë‹ˆë‹¤"
+
+#: pathspec.c:353
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: 경로명세 지시어가 ì´ ëª…ë ¹ì–´ì—ì„œ 지ì›í•˜ì§€ 않습니다: %s"
+
+#: pathspec.c:432
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "'%s' 경로명세는 심볼릭 ë§í¬ ì•„ëž˜ì— ìžˆìŠµë‹ˆë‹¤"
+
+#: pathspec.c:441
+msgid ""
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
+msgstr ""
+":(exclude) 패턴으로 제외할 ì‚¬í•­ì´ ì—†ìŠµë‹ˆë‹¤.\n"
+"':/' ë˜ëŠ” '.' 추가를 잊으신 것 아닙니까?"
+
+#: pretty.c:969
+msgid "unable to parse --pretty format"
+msgstr "--pretty 형ì‹ì„ 파싱할 수 없습니다"
+
+#: progress.c:235
+msgid "done"
+msgstr "완료"
+
+#: read-cache.c:1281
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.versionì´ ì„¤ì •ë˜ì—ˆì§€ë§Œ, ì´ ê°’ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤.\n"
+"%i ë²„ì „ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
+
+#: read-cache.c:1291
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSIONì´ ì„¤ì •ë˜ì—ˆì§€ë§Œ, ì´ ê°’ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤.\n"
+"%i ë²„ì „ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
+
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: builtin/merge.c:983
+#, c-format
+msgid "Could not open '%s' for writing"
+msgstr "'%s'ì„(를) 쓰기용으로 ì—´ 수 없습니다"
+
+#: refs/files-backend.c:2359
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "%s ë ˆí¼ëŸ°ìŠ¤ë¥¼ 삭제할 수 없습니다: %s"
+
+#: refs/files-backend.c:2362
+#, c-format
+msgid "could not delete references: %s"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ë¥¼ 삭제할 수 없습니다: %s"
+
+#: refs/files-backend.c:2371
+#, c-format
+msgid "could not remove reference %s"
+msgstr "%s ë ˆí¼ëŸ°ìŠ¤ë¥¼ 제거할 수 없습니다"
+
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "형ì‹: %%(end) ì•„í†°ì´ ëŒ€ì‘ë˜ëŠ” 아톰 ì—†ì´ ì‚¬ìš©ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "'contents:lines=%s'ì—ì„œ 0보다 í° ê°’ì´ ì™€ì•¼ 합니다"
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "예ìƒí•œ 형ì‹: %%(color:<색>)"
+
+#: ref-filter.c:835
+msgid "unable to parse format"
+msgstr "형ì‹ì„ 파싱할 수 없습니다"
+
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "예ìƒí•œ 형ì‹: %%(align:<너비>,<위치>)"
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr "align:%s ìž˜ëª»ëœ í˜•ì‹ì´ ìž…ë ¥ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "%%(align) ì•„í†°ì— ë„ˆë¹„ê°€ 0보다 커야 합니다"
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "'%s'ì— ìž˜ëª»ëœ í˜•ì‹ì˜ 오브ì íŠ¸"
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "형ì‹: %%(end) ì•„í†°ì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr "ìž˜ëª»ëœ í˜•ì‹ì˜ 오브ì íŠ¸ ì´ë¦„ %s"
+
+#: remote.c:756
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "%s ë° %sì„(를) ëª¨ë‘ %sì— ê°€ì ¸ì˜¬ 수 없습니다"
+
+#: remote.c:760
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%sì€(는) 보통 %sì„(를) 추ì í•˜ê³ , %sì„(를) 추ì í•˜ì§€ 않습니다"
+
+#: remote.c:764
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%sì€(는) %s ë° %s ëª¨ë‘ ì¶”ì í•©ë‹ˆë‹¤"
+
+#: remote.c:772
+msgid "Internal error"
+msgstr "내부 오류"
+
+#: remote.c:1687 remote.c:1730
+msgid "HEAD does not point to a branch"
+msgstr "HEAD가 브랜치를 가리키지 않습니다"
+
+#: remote.c:1696
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "그런 브랜치가 없습니다: '%s'"
+
+#: remote.c:1699
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "'%s' ë¸Œëžœì¹˜ì— ëŒ€í•´ ì—…ìŠ¤íŠ¸ë¦¼ì„ ì„¤ì •í•˜ì§€ 않았습니다"
+
+#: remote.c:1705
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "업스트림 '%s' 브랜치가 리모트 ì¶”ì  ë¸Œëžœì¹˜ë¡œ 저장ë˜ì§€ 않았습니다"
+
+#: remote.c:1720
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "리모트 '%2$s'ì˜ í‘¸ì‹œ ëŒ€ìƒ '%1$s'ì— ë¡œì»¬ ì¶”ì  ë¸Œëžœì¹˜ê°€ 없습니다"
+
+#: remote.c:1735
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "'%s' ë¸Œëžœì¹˜ì— í‘¸ì‹œ 리모트가 없습니다"
+
+#: remote.c:1746
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "'%s'ì— ëŒ€í•œ 푸시 ë ˆí¼ëŸ°ìŠ¤ëª…ì„¸ì— '%s'ì´(ê°€) 들어 있지 않습니다"
+
+#: remote.c:1759
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "í‘¸ì‹œì˜ ëŒ€ìƒì´ 없습니다 (push.defaultê°€ 'nothing'입니다)"
+
+#: remote.c:1781
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "í•˜ë‚˜ì˜ ëŒ€ìƒì— 대해 'simple' 푸시를 처리할 수 없습니다"
+
+#: remote.c:2083
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "현재 브랜치가 '%s' 기반ì´ì§€ë§Œ, ì—…ìŠ¤íŠ¸ë¦¼ì´ ì—†ì–´ì¡ŒìŠµë‹ˆë‹¤.\n"
+
+#: remote.c:2087
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (바로잡으려면 \"git branch --unset-upstream\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)\n"
+
+#: remote.c:2090
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "브랜치가 '%s'ì— ë§žê²Œ ì—…ë°ì´íŠ¸ëœ ìƒíƒœìž…니다.\n"
+
+#: remote.c:2094
+#, 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] "브랜치가 '%s'보다 %dê°œ ì»¤ë°‹ë§Œí¼ ì•žì— ìžˆìŠµë‹ˆë‹¤.\n"
+
+#: remote.c:2100
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " (ë¡œì»¬ì— ìžˆëŠ” ì»¤ë°‹ì„ ì œì¶œí•˜ë ¤ë©´ \"git push\"를 사용하십시오)\n"
+
+#: remote.c:2103
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] "브랜치가 '%s'보다 %dê°œ 커밋 ë’¤ì— ìžˆê³ , 앞으로 ëŒë¦´ 수 있습니다.\n"
+
+#: remote.c:2111
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " (로컬 브랜치를 ì—…ë°ì´íŠ¸í•˜ë ¤ë©´ \"git pull\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)\n"
+
+#: remote.c:2114
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"현재 브랜치와 '%s'ì´(ê°€) ê°ˆë¼ì¡ŒìŠµë‹ˆë‹¤,\n"
+"다른 ì»¤ë°‹ì´ ê°ê° %d개와 %dê°œ 있습니다.\n"
+
+#: remote.c:2124
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr ""
+" (ë¦¬ëª¨íŠ¸ì˜ ë¸Œëžœì¹˜ë¥¼ 현재 브랜치로 병합하려면 \"git pull\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)\n"
+
+#: revision.c:2193
+msgid "your current branch appears to be broken"
+msgstr "현재 브랜치가 ë§ê°€ì§„ 것처럼 보입니다"
+
+#: revision.c:2196
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "현재 '%s' ë¸Œëžœì¹˜ì— ì•„ì§ ì•„ë¬´ ì»¤ë°‹ë„ ì—†ìŠµë‹ˆë‹¤"
+
+#: revision.c:2390
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent ì˜µì…˜ì€ --bisect 옵션과 호환ë˜ì§€ 않습니다"
+
+#: run-command.c:90
+msgid "open /dev/null failed"
+msgstr "/dev/null 열기 실패"
+
+#: run-command.c:92
+#, c-format
+msgid "dup2(%d,%d) failed"
+msgstr "dup2(%d,%d) 실패"
+
+#: send-pack.c:295
+msgid "failed to sign the push certificate"
+msgstr "푸시 ì¸ì¦ì„œ ì„œëª…ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: send-pack.c:404
+msgid "the receiving end does not support --signed push"
+msgstr "받는 쪽ì—ì„œ --signed 푸시를 지ì›í•˜ì§€ 않습니다"
+
+#: send-pack.c:406
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"받는 쪽ì—ì„œ --signed 푸시를 지ì›í•˜ì§€ 않으므로 푸시 ì¸ì¦ì„œë¥¼ 보내지 않습니다"
+
+#: send-pack.c:418
+msgid "the receiving end does not support --atomic push"
+msgstr "받는 쪽ì—ì„œ --atomic 푸시를 지ì›í•˜ì§€ 않습니다"
+
+#: sequencer.c:183
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"ì´ ì¶©ëŒì„ í•´ê²°í•œ ë’¤ì—, ë°”ë¡œìž¡ì€ ê²½ë¡œë¥¼\n"
+"'git add <경로>' ë˜ëŠ” 'git rm <경로>'ë¡œ 표시하십시오"
+
+#: sequencer.c:186
+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 ""
+"ì´ ì¶©ëŒì„ í•´ê²°í•œ ë’¤ì—, ë°”ë¡œìž¡ì€ ê²½ë¡œë¥¼\n"
+"'git add <경로>' ë˜ëŠ” 'git rm <경로>'ë¡œ 표시하십시오.\n"
+"그리고 ê²°ê³¼ë¬¼ì„ 'git commit'으로 커밋하십시오"
+
+#: sequencer.c:199 sequencer.c:842 sequencer.c:922
+#, c-format
+msgid "Could not write to %s"
+msgstr "%sì— ì“¸ 수 없습니다"
+
+#: sequencer.c:202
+#, c-format
+msgid "Error wrapping up %s"
+msgstr "%s ìž ê·¸ëŠ”ë° ì˜¤ë¥˜"
+
+#: sequencer.c:217
+msgid "Your local changes would be overwritten by cherry-pick."
+msgstr "로컬 변경 ì‚¬í•­ì„ cherry-pick ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤."
+
+#: sequencer.c:219
+msgid "Your local changes would be overwritten by revert."
+msgstr "로컬 변경 ì‚¬í•­ì„ revert ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤."
+
+#: sequencer.c:222
+msgid "Commit your changes or stash them to proceed."
+msgstr "변경 ì‚¬í•­ì„ ìŠ¤í…Œì´ì§•í•˜ê±°ë‚˜ 스태시한 ë‹¤ìŒ ê³„ì†í•˜ì‹­ì‹œì˜¤."
+
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:309
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: 새 ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다"
+
+#: sequencer.c:327
+msgid "Could not resolve HEAD commit\n"
+msgstr "HEAD ì»¤ë°‹ì„ ì²˜ë¦¬í•  수 없습니다\n"
+
+#: sequencer.c:347
+msgid "Unable to update cache tree\n"
+msgstr "ìºì‹œ 트리를 ì—…ë°ì´íŠ¸í•  수 없습니다\n"
+
+#: sequencer.c:399
+#, c-format
+msgid "Could not parse commit %s\n"
+msgstr "%s ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다\n"
+
+#: sequencer.c:404
+#, c-format
+msgid "Could not parse parent commit %s\n"
+msgstr "%s ì´ì „ ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다\n"
+
+#: sequencer.c:469
+msgid "Your index file is unmerged."
+msgstr "ì¸ë±ìŠ¤ 파ì¼ì´ 병합ë˜ì§€ 않았습니다."
+
+#: sequencer.c:488
+#, c-format
+msgid "Commit %s is a merge but no -m option was given."
+msgstr "%s ì»¤ë°‹ì€ ë³‘í•©ì´ì§€ë§Œ -m ì˜µì…˜ì´ ì£¼ì–´ì§€ì§€ 않았습니다."
+
+# FIXME: "parent %d" 번호가 무슨 ì˜ë¯¸?
+#: sequencer.c:496
+#, c-format
+msgid "Commit %s does not have parent %d"
+msgstr "Commit %s ì»¤ë°‹ì— ì´ì „ 커밋 %dì´(ê°€) 없습니다"
+
+#: sequencer.c:500
+#, c-format
+msgid "Mainline was specified but commit %s is not a merge."
+msgstr "ë©”ì¸ë¼ì¸ì„ 지정했지만 %s ì»¤ë°‹ì´ ë³‘í•© ì»¤ë°‹ì´ ì•„ë‹™ë‹ˆë‹¤."
+
+#. TRANSLATORS: The first %s will be "revert" or
+#. "cherry-pick", the second %s a SHA1
+#: sequencer.c:513
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: %s ì´ì „ ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다"
+
+#: sequencer.c:517
+#, c-format
+msgid "Cannot get commit message for %s"
+msgstr "%sì— ëŒ€í•œ 커밋 메시지를 가져올 수 없습니다"
+
+#: sequencer.c:603
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "다ìŒì„ ë˜ëŒë¦´(revert) 수 없습니다: %s... %s"
+
+#: sequencer.c:604
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "다ìŒì„ ì ìš©í• (apply) 수 없습니다: %s... %s"
+
+#: sequencer.c:639
+msgid "empty commit set passed"
+msgstr "빈 커밋 모ìŒì„ 건너 ëœë‹ˆë‹¤"
+
+#: sequencer.c:647
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: ì¸ë±ìŠ¤ ì½ê¸°ì— 실패했습니다"
+
+#: sequencer.c:651
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: ì¸ë±ìŠ¤ 새로 ê³ ì¹¨ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: sequencer.c:711
+#, c-format
+msgid "Cannot %s during a %s"
+msgstr "%2$s ë™ì•ˆ %1$s í•  수 없습니다"
+
+#: sequencer.c:733
+#, c-format
+msgid "Could not parse line %d."
+msgstr "%d번 ì¤„ì„ íŒŒì‹±í•  수 없습니다."
+
+#: sequencer.c:738
+msgid "No commits parsed."
+msgstr "파싱한 ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤."
+
+#: sequencer.c:750
+#, c-format
+msgid "Could not open %s"
+msgstr "%sì„(를) ì—´ 수 없습니다"
+
+#: sequencer.c:754
+#, c-format
+msgid "Could not read %s."
+msgstr "%sì„(를) ì½ì„ 수 없습니다."
+
+#: sequencer.c:761
+#, c-format
+msgid "Unusable instruction sheet: %s"
+msgstr "사용 불가능 ì¸ìŠ¤íŠ¸ëŸ­ì…˜ 파ì¼: %s"
+
+#: sequencer.c:791
+#, c-format
+msgid "Invalid key: %s"
+msgstr "ìž˜ëª»ëœ í‚¤: %s"
+
+#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "%sì˜ ê°’ì´ ì˜¬ë°”ë¥´ì§€ 않습니다: %s"
+
+#: sequencer.c:804
+#, c-format
+msgid "Malformed options sheet: %s"
+msgstr "형ì‹ì´ ìž˜ëª»ëœ ì˜µì…˜ 파ì¼: %s"
+
+#: sequencer.c:823
+msgid "a cherry-pick or revert is already in progress"
+msgstr "ì´ë¯¸ 커밋 빼오기(cherry-pick) ë˜ëŠ” ë˜ëŒë¦¬ê¸°(revert)ê°€ 진행 중입니다"
+
+#: sequencer.c:824
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "\"git cherry-pick (--continue | --quit | --abort)\" ëª…ë ¹ì„ í•´ 보십시오"
+
+#: sequencer.c:828
+#, c-format
+msgid "Could not create sequencer directory %s"
+msgstr "%s 시퀀서 디렉터리를 만들 수 없습니다"
+
+#: sequencer.c:844 sequencer.c:926
+#, c-format
+msgid "Error wrapping up %s."
+msgstr "%s ìž ê·¸ëŠ”ë° ì˜¤ë¥˜."
+
+#: sequencer.c:863 sequencer.c:996
+msgid "no cherry-pick or revert in progress"
+msgstr "빼오기(cherry-pick) ë˜ëŠ” ë˜ëŒë¦¬ê¸°(revert)ê°€ 진행 중ì´ì§€ 않습니다"
+
+#: sequencer.c:865
+msgid "cannot resolve HEAD"
+msgstr "HEAD를 구해 올 수 없습니다"
+
+#: sequencer.c:867
+msgid "cannot abort from a branch yet to be born"
+msgstr "새로 만들고 있는 브랜치ì—ì„œ 중지할 수 없습니다"
+
+#: sequencer.c:887 builtin/apply.c:4287
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "%sì„(를) ì—´ 수 없습니다: %s"
+
+#: sequencer.c:890
+#, c-format
+msgid "cannot read %s: %s"
+msgstr "%sì„(를) ì½ì„ 수 없습니다: %s"
+
+#: sequencer.c:891
+msgid "unexpected end of file"
+msgstr "예ìƒì¹˜ 못하게 파ì¼ì´ ë났습니다"
+
+#: sequencer.c:897
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "빼오기 ì „ì— ì €ìž¥í•œ HEAD 파ì¼ì´('%s') ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: sequencer.c:919
+#, c-format
+msgid "Could not format %s."
+msgstr "%sì— í¬ë§¤íŒ…í•  수 없습니다."
+
+#: sequencer.c:1064
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: %s ì»¤ë°‹ì„ ë¹¼ì˜¬ 수 없습니다"
+
+#: sequencer.c:1067
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: ìž˜ëª»ëœ ë¦¬ë¹„ì „"
+
+#: sequencer.c:1101
+msgid "Can't revert as initial commit"
+msgstr "ìµœì´ˆì˜ ì»¤ë°‹ì„ ë˜ëŒë¦´ 수 없습니다"
+
+#: sequencer.c:1102
+msgid "Can't cherry-pick into empty head"
+msgstr "빈 헤드로 ì»¤ë°‹ì„ ë¹¼ì˜¬ 수 없습니다."
+
+#: setup.c:248
+#, c-format
+msgid "failed to read %s"
+msgstr "%sì„(를) ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: sha1_name.c:463
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"깃ì—서는 보통 40ê°œì˜ 16진수 문ìžë¡œ ë나는 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 만들지 않습니다.\n"
+"16진수 ë¬¸ìž 40ìžë¥¼ ì§€ì •í–ˆì„ ë•Œ ì´ ë ˆí¼ëŸ°ìŠ¤ê°€ 무시ë˜ê¸° 때문입니다. ì´\n"
+"ë ˆí¼ëŸ°ìŠ¤ëŠ” 실수로 ë§Œë“¤ì–´ì¡Œì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. 예를 들어,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"여기서 \"$br\"ì€ ë¹„ì–´ 있으므로 40ìž ë ˆí¼ëŸ°ìŠ¤ê°€ 만들어집니다. ì´ ë ˆí¼ëŸ°ìŠ¤ë¥¼\n"
+"확ì¸í•´ 보시고 잘못 만들어진 것ì´ë©´ 지우십시오. ì´ ë©”ì‹œì§€ë¥¼ ë³´ê³  싶지\n"
+"않으면 \"git config advice.objectNameWarning false\" ëª…ë ¹ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤."
+
+#: submodule.c:61 submodule.c:95
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"병합하지 ì•Šì€ .gitmodules를 바꿀 수 없습니다. 병합 충ëŒì„ 먼저 해결하십시오"
+
+#: submodule.c:65 submodule.c:99
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "경로가 %sì¼ ë•Œ .gitmodulesì˜ ì„¹ì…˜ì„ ì°¾ì„ ìˆ˜ 없습니다"
+
+#: submodule.c:73
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr ".gitmodules 항목 %sì„(를) ì—…ë°ì´íŠ¸í•  수 없습니다"
+
+#: submodule.c:106
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "%sì— ëŒ€í•œ .gitmodules í•­ëª©ì„ ì œê±°í•  수 없습니다"
+
+#: submodule.c:117
+msgid "staging updated .gitmodules failed"
+msgstr "ì—…ë°ì´íŠ¸í•œ .gitmodules를 커밋할 사항으로 í‘œì‹œí•˜ëŠ”ë° ì‹¤íŒ¨"
+
+#: submodule.c:1040
+#, c-format
+msgid "Could not set core.worktree in %s"
+msgstr "%sì—ì„œ core.worktree를 설정할 수 없습니다"
+
+#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
+#: trailer.c:561
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "알 수 없는 값 '%s', 키 '%s'"
+
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
+#, c-format
+msgid "more than one %s"
+msgstr "%sì´(ê°€) 여러개입니다"
+
+#: trailer.c:581
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "트레ì¼ëŸ¬ '%.*s'ì—ì„œ 빈 트레ì¼ëŸ¬ 토í°"
+
+#: trailer.c:701
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "'%s' ìž…ë ¥ 파ì¼ì„ ì½ì„ 수 없습니다"
+
+#: trailer.c:704
+msgid "could not read from stdin"
+msgstr "표준 ìž…ë ¥ì—ì„œ ì½ì„ 수 없습니다"
+
+#: transport-helper.c:1025
+#, c-format
+msgid "Could not read ref %s"
+msgstr "%s ë ˆí¼ëŸ°ìŠ¤ë¥¼ ì½ì„ 수 없습니다"
+
+#: unpack-trees.c:203
+msgid "Checking out files"
+msgstr "파ì¼ì„ 가져옵니다"
+
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "URL 스킴 ì´ë¦„ì´ ìž˜ëª»ë˜ì—ˆê±°ë‚˜ '://'ê°€ ë’¤ì— ë¶™ì§€ 않았습니다"
+
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "ìž˜ëª»ëœ %XX ì´ìŠ¤ì¼€ì´í”„ 시퀀스"
+
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr "호스트가 없고 ìŠ¤í‚´ì´ 'file:'ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr "'file:' URLì—는 í¬íŠ¸ 번호를 쓸 수 없습니다"
+
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr "호스트 ì´ë¦„ì— ìž˜ëª»ëœ ë¬¸ìž"
+
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr "ìž˜ëª»ëœ í¬íŠ¸ 번호"
+
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr "경로ì—ì„œ ìž˜ëª»ëœ '..' 부분"
+
+#: wrapper.c:219 wrapper.c:362
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "ì½ê¸°ì™€ 쓰기용으로 '%s'ì„(를) ì—´ 수 없습니다"
+
+#: wrapper.c:221 wrapper.c:364
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "'%s'ì„(를) 쓰기용으로 ì—´ 수 없습니다"
+
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "'%s'ì„(를) ì½ê¸°ìš©ìœ¼ë¡œ ì—´ 수 없습니다"
+
+#: wrapper.c:579
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "'%s'ì— ì ‘ê·¼í•  수 없습니다: %s"
+
+#: wrapper.c:600
+#, c-format
+msgid "unable to access '%s'"
+msgstr "'%s'ì— ì ‘ê·¼í•  수 없습니다"
+
+#: wrapper.c:608
+msgid "unable to get current working directory"
+msgstr "현재 작업 디렉터리를 가져올 수 없습니다"
+
+#: wrapper.c:635
+#, c-format
+msgid "could not open %s for writing"
+msgstr "%sì„(를) 쓰기용으로 ì—´ 수 없습니다"
+
+#: wrapper.c:646 builtin/am.c:425
+#, c-format
+msgid "could not write to %s"
+msgstr "%sì— ì“¸ 수 없습니다"
+
+#: wrapper.c:652
+#, c-format
+msgid "could not close %s"
+msgstr "%sì„(를) ë‹«ì„ ìˆ˜ 없습니다"
+
+#: wt-status.c:149
+msgid "Unmerged paths:"
+msgstr "병합하지 ì•Šì€ ê²½ë¡œ:"
+
+#: wt-status.c:176 wt-status.c:203
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " (스테ì´ì§€ 해제하려면 \"git reset %s <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:178 wt-status.c:205
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " (스테ì´ì§€ 해제하려면 \"git rm --cached <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:182
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (해결했다고 표시하려면 \"git add <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:184 wt-status.c:188
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+" (해결했다고 표시하려면 알맞게 \"git add/rm <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:186
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (해결했다고 표시하려면 \"git rm <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:197 wt-status.c:880
+msgid "Changes to be committed:"
+msgstr "커밋할 변경 사항:"
+
+#: wt-status.c:215 wt-status.c:889
+msgid "Changes not staged for commit:"
+msgstr "커밋하ë„ë¡ ì •í•˜ì§€ ì•Šì€ ë³€ê²½ 사항:"
+
+#: wt-status.c:219
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr " (ë¬´ì—‡ì„ ì»¤ë°‹í• ì§€ 바꾸려면 \"git add <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:221
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr " (ë¬´ì—‡ì„ ì»¤ë°‹í• ì§€ 바꾸려면 \"git add/rm <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:222
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+" (ìž‘ì—… í´ë”ì˜ ë³€ê²½ ì‚¬í•­ì„ ë²„ë¦¬ë ¤ë©´ \"git checkout -- <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­"
+"시오)"
+
+#: wt-status.c:224
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+" (하위 ëª¨ë“ˆì˜ ì¶”ì ë˜ì§€ 않는 파ì¼ì´ë‚˜ ìˆ˜ì •ëœ ë‚´ìš©ì„ ì»¤ë°‹í•˜ê±°ë‚˜ 버리십시오)"
+
+#: wt-status.c:236
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr " (커밋할 ì‚¬í•­ì— í¬í•¨í•˜ë ¤ë©´ \"git %s <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:251
+msgid "both deleted:"
+msgstr "양쪽ì—ì„œ ì‚­ì œ:"
+
+#: wt-status.c:253
+msgid "added by us:"
+msgstr "ì´ ìª½ì—ì„œ 추가:"
+
+#: wt-status.c:255
+msgid "deleted by them:"
+msgstr "ì € 쪽ì—ì„œ ì‚­ì œ:"
+
+#: wt-status.c:257
+msgid "added by them:"
+msgstr "ì € 쪽ì—ì„œ 추가:"
+
+#: wt-status.c:259
+msgid "deleted by us:"
+msgstr "ì´ ìª½ì—ì„œ ì‚­ì œ:"
+
+#: wt-status.c:261
+msgid "both added:"
+msgstr "양쪽ì—ì„œ 추가:"
+
+#: wt-status.c:263
+msgid "both modified:"
+msgstr "양쪽ì—ì„œ 수정:"
+
+#: wt-status.c:265
+#, c-format
+msgid "bug: unhandled unmerged status %x"
+msgstr "bug: 병합하지 ì•Šì€ ìƒíƒœ %x 처리ë˜ì§€ ì•ŠìŒ"
+
+#: wt-status.c:273
+msgid "new file:"
+msgstr "새 파ì¼:"
+
+#: wt-status.c:275
+msgid "copied:"
+msgstr "복사함:"
+
+#: wt-status.c:277
+msgid "deleted:"
+msgstr "삭제함:"
+
+#: wt-status.c:279
+msgid "modified:"
+msgstr "수정함:"
+
+#: wt-status.c:281
+msgid "renamed:"
+msgstr "ì´ë¦„ 바꿈:"
+
+#: wt-status.c:283
+msgid "typechange:"
+msgstr "종류 바뀜:"
+
+#: wt-status.c:285
+msgid "unknown:"
+msgstr "ì•Œ 수 ì—†ìŒ:"
+
+#: wt-status.c:287
+msgid "unmerged:"
+msgstr "병합하지 ì•ŠìŒ:"
+
+#: wt-status.c:369
+msgid "new commits, "
+msgstr "새 커밋, "
+
+#: wt-status.c:371
+msgid "modified content, "
+msgstr "수정한 내용, "
+
+#: wt-status.c:373
+msgid "untracked content, "
+msgstr "추ì í•˜ì§€ ì•Šì€ ë‚´ìš©, "
+
+#: wt-status.c:390
+#, c-format
+msgid "bug: unhandled diff status %c"
+msgstr "버그: 처리ë˜ì§€ ì•Šì€ diff ìƒíƒœ %c"
+
+#: wt-status.c:754
+msgid "Submodules changed but not updated:"
+msgstr "변경ë˜ì—ˆì§€ë§Œ ì—…ë°ì´íŠ¸í•˜ì§€ ì•Šì€ í•˜ìœ„ 모듈:"
+
+#: wt-status.c:756
+msgid "Submodule changes to be committed:"
+msgstr "커밋할 하위 ëª¨ë“ˆì˜ ë³€ê²½ 사항:"
+
+#: wt-status.c:837
+msgid ""
+"Do not touch the line above.\n"
+"Everything below will be removed."
+msgstr ""
+"ìœ„ì˜ ì¤„ì„ ë°”ê¾¸ì§€ 마십시오.\n"
+"아래 있는 ë‚´ìš©ì€ ëª¨ë‘ ì œê±°ë©ë‹ˆë‹¤."
+
+#: wt-status.c:948
+msgid "You have unmerged paths."
+msgstr "병합하지 ì•Šì€ ê²½ë¡œê°€ 있습니다."
+
+#: wt-status.c:951
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (충ëŒì„ 바로잡고 \"git commit\"ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:954
+msgid "All conflicts fixed but you are still merging."
+msgstr "모든 충ëŒì„ 바로잡았지만 ì•„ì§ ë³‘í•©í•˜ëŠ” 중입니다."
+
+#: wt-status.c:957
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (ë³‘í•©ì„ ë§ˆë¬´ë¦¬í•˜ë ¤ë©´ \"git commit\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:967
+msgid "You are in the middle of an am session."
+msgstr "am 세션 ì¤‘ê°„ì— ìžˆìŠµë‹ˆë‹¤."
+
+#: wt-status.c:970
+msgid "The current patch is empty."
+msgstr "현재 패치가 비어 있습니다."
+
+#: wt-status.c:974
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (충ëŒì„ ë°”ë¡œìž¡ì€ ë‹¤ìŒ \"git am --continue\"를 사용하십시오)"
+
+#: wt-status.c:976
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (ì´ íŒ¨ì¹˜ë¥¼ 건너 뛰려면 \"git am --skip\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:978
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (ì›ë³¸ 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)"
+
+#: wt-status.c:1105
+msgid "No commands done."
+msgstr "완료한 명령 ì—†ìŒ."
+
+#: wt-status.c:1108
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "최근 완료한 명령 (%d개 명령 완료):"
+
+#: wt-status.c:1119
+#, c-format
+msgid " (see more in file %s)"
+msgstr " (ìžì„¸í•œ 정보는 %s íŒŒì¼ ì°¸ê³ )"
+
+#: wt-status.c:1124
+msgid "No commands remaining."
+msgstr "ëª…ë ¹ì´ ë‚¨ì•„ìžˆì§€ ì•ŠìŒ."
+
+#: wt-status.c:1127
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "다ìŒì— í•  명령 (%dê°œ 명령 남ìŒ):"
+
+#: wt-status.c:1135
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " (보고 편집하려면 \"git rebase --edit-todo\"를 사용하십시오)"
+
+#: wt-status.c:1148
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "현재 '%s' 브랜치를 '%s' 위로 리베ì´ìŠ¤í•˜ëŠ” 중입니다."
+
+#: wt-status.c:1153
+msgid "You are currently rebasing."
+msgstr "현재 리베ì´ìŠ¤í•˜ëŠ” 중입니다."
+
+#: wt-status.c:1167
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (충ëŒì„ 바로잡고 \"git rebase --continue\"를 사용하십시오)"
+
+#: wt-status.c:1169
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (ì´ íŒ¨ì¹˜ë¥¼ 건너뛰려면 \"git rebase --skip\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:1171
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (ì›ë³¸ 브랜치를 가져오려면 \"git rebase --abort\"를 사용하십시오)"
+
+#: wt-status.c:1177
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr ""
+" (모든 충ëŒì„ 바로잡았습니다: \"git rebase --continue\"를 실행하십시오)"
+
+#: wt-status.c:1181
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "현재 '%s' 브랜치를 '%s' 위로 리베ì´ìŠ¤í•˜ëŠ” 중 ì»¤ë°‹ì„ ë¶„ë¦¬í•˜ëŠ” 중입니다."
+
+#: wt-status.c:1186
+msgid "You are currently splitting a commit during a rebase."
+msgstr "현재 리베ì´ìŠ¤í•˜ëŠ” 중 ì»¤ë°‹ì„ ë¶„ë¦¬í•˜ëŠ” 중입니다."
+
+#: wt-status.c:1189
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr " (ìž‘ì—… í´ë”ê°€ 깨ë—해지면, \"git rebase --continue\"를 실행하십시오)"
+
+#: wt-status.c:1193
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "'%s' 브랜치를 '%s' 위로 리베ì´ìŠ¤í•˜ëŠ” 중 ì»¤ë°‹ì„ íŽ¸ì§‘í•˜ëŠ” 중입니다."
+
+#: wt-status.c:1198
+msgid "You are currently editing a commit during a rebase."
+msgstr "리베ì´ìŠ¤ ì¤‘ì— ì»¤ë°‹ì„ íŽ¸ì§‘í•˜ëŠ” 중입니다."
+
+#: wt-status.c:1201
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (현재 ì»¤ë°‹ì„ ìˆ˜ì •í•˜ë ¤ë©´ \"git commit --amend\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:1203
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr " (변경 ì‚¬í•­ì— ë§Œì¡±í•  ë•Œ \"git rebase --continue\"를 사용하십시오)"
+
+#: wt-status.c:1213
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "현재 %s ì»¤ë°‹ì„ ë½‘ì•„ ë‚´ê³  있습니다."
+
+#: wt-status.c:1218
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " (충ëŒì„ 바로잡고 \"git cherry-pick --continue\"를 실행하십시오)"
+
+#: wt-status.c:1221
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+" (모든 충ëŒì„ 바로잡았습니다: \"git cherry-pick --continue\"를 실행하십시오)"
+
+#: wt-status.c:1223
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " (뽑기 ìž‘ì—…ì„ ì·¨ì†Œí•˜ë ¤ë©´ \"git cherry-pick --abort\"를 사용하십시오)"
+
+#: wt-status.c:1232
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "현재 %s ì»¤ë°‹ì„ ë˜ëŒë¦¬ëŠ” 중입니다."
+
+#: wt-status.c:1237
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (충ëŒì„ 바로잡고 \"git revert --continue\"를 실행하십시오)"
+
+#: wt-status.c:1240
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr ""
+" (모든 충ëŒì„ 바로잡았습니다: \"git revert --continue\"를 실행하십시오)"
+
+#: wt-status.c:1242
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " (ë˜ëŒë¦¬ê¸° ìž‘ì—…ì„ ì·¨ì†Œí•˜ë ¤ë©´ \"git revert --abort\"를 사용하십시오)"
+
+#: wt-status.c:1253
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "'ì´ë“±ë¶„하는 중입니다. '%s' 브랜치부터 시작."
+
+#: wt-status.c:1257
+msgid "You are currently bisecting."
+msgstr "'ì´ë“±ë¶„하는 중입니다."
+
+#: wt-status.c:1260
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (ì›ëž˜ 브랜치로 ëŒì•„가려면 \"git bisect reset\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:1438
+msgid "On branch "
+msgstr "현재 브랜치 "
+
+#: wt-status.c:1444
+msgid "interactive rebase in progress; onto "
+msgstr "대화형 리베ì´ìŠ¤ 진행 중. ê°ˆ 위치는 "
+
+#: wt-status.c:1446
+msgid "rebase in progress; onto "
+msgstr "리베ì´ìŠ¤ 진행 중. ê°ˆ 위치는 "
+
+#: wt-status.c:1451
+msgid "HEAD detached at "
+msgstr "HEADê°€ ë‹¤ìŒ ìœ„ì¹˜ì—ì„œ 분리: "
+
+#: wt-status.c:1453
+msgid "HEAD detached from "
+msgstr "HEADê°€ 다ìŒìœ¼ë¡œë¶€í„° 분리: "
+
+#: wt-status.c:1456
+msgid "Not currently on any branch."
+msgstr "현재 ì–´ë–¤ ë¸Œëžœì¹˜ë„ ì‚¬ìš©í•˜ì§€ ì•ŠìŒ."
+
+#: wt-status.c:1474
+msgid "Initial commit"
+msgstr "최초 커밋"
+
+#: wt-status.c:1488
+msgid "Untracked files"
+msgstr "추ì í•˜ì§€ 않는 파ì¼"
+
+#: wt-status.c:1490
+msgid "Ignored files"
+msgstr "무시한 파ì¼"
+
+#: wt-status.c:1494
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"추ì í•˜ì§€ 않는 파ì¼ì„ ëª¨ë‘ í™•ì¸í•˜ëŠ”ë° %.2f초가 걸렸습니다.\n"
+"'status -uno' ì˜µì…˜ì„ ì“°ë©´ 빨ë¼ì§ˆ ìˆ˜ë„ ìžˆì§€ë§Œ, 새 파ì¼ì„\n"
+"ì§ì ‘ 찾아서 추가해야 합니다. ('git help status' 참고)"
+
+#: wt-status.c:1500
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "추ì í•˜ì§€ 않는 파ì¼ì„ 보지 않습니다%s"
+
+#: wt-status.c:1502
+msgid " (use -u option to show untracked files)"
+msgstr " (추ì í•˜ì§€ 않는 파ì¼ì„ 보려면 -u ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: wt-status.c:1508
+msgid "No changes"
+msgstr "변경 사항 ì—†ìŒ"
+
+#: wt-status.c:1513
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"커밋할 변경 ì‚¬í•­ì„ ì¶”ê°€í•˜ì§€ 않았습니다 (\"git add\" ë°/ë˜ëŠ” \"git commit -a"
+"\"를\n"
+"사용하십시오)\n"
+
+#: wt-status.c:1516
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "커밋할 변경 ì‚¬í•­ì„ ì¶”ê°€í•˜ì§€ 않았습니다\n"
+
+#: wt-status.c:1519
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"커밋할 ì‚¬í•­ì„ ì¶”ê°€í•˜ì§€ 않았지만 추ì í•˜ì§€ 않는 파ì¼ì´ 있습니다 (추ì í•˜ë ¤ë©´ "
+"\"git\n"
+"add\"를 사용하십시오)\n"
+
+#: wt-status.c:1522
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "커밋할 ì‚¬í•­ì„ ì¶”ê°€í•˜ì§€ 않았지만 추ì í•˜ì§€ 않는 파ì¼ì´ 있습니다\n"
+
+#: wt-status.c:1525
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"커밋할 사항 ì—†ìŒ (파ì¼ì„ 만들거나 복사하고 \"git add\"를 사용하면 추ì í•©ë‹ˆ"
+"다)\n"
+
+#: wt-status.c:1528 wt-status.c:1533
+#, c-format
+msgid "nothing to commit\n"
+msgstr "커밋할 사항 ì—†ìŒ\n"
+
+#: wt-status.c:1531
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"커밋할 사항 ì—†ìŒ (추ì í•˜ì§€ 않는 파ì¼ì„ 보려면 -u ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)\n"
+
+#: wt-status.c:1535
+#, c-format
+msgid "nothing to commit, working directory clean\n"
+msgstr "커밋할 사항 ì—†ìŒ, ìž‘ì—… í´ë” 깨ë—함\n"
+
+#: wt-status.c:1642
+msgid "Initial commit on "
+msgstr "최초 커밋, 브랜치: "
+
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
+msgstr "HEAD (브랜치 ì—†ìŒ)"
+
+#: wt-status.c:1675
+msgid "gone"
+msgstr "ì—†ìŒ"
+
+#: wt-status.c:1677 wt-status.c:1685
+msgid "behind "
+msgstr "ë’¤ì—: "
+
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "'%s' íŒŒì¼ ì‚­ì œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<옵션>] [--] <경로명세>..."
+
+#: builtin/add.c:65
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "예ìƒì¹˜ 못한 diff ìƒíƒœ %c"
+
+#: builtin/add.c:70 builtin/commit.c:278
+msgid "updating files failed"
+msgstr "íŒŒì¼ ì—…ë°ì´íŠ¸ê°€ 실패했습니다"
+
+#: builtin/add.c:80
+#, c-format
+msgid "remove '%s'\n"
+msgstr "'%s' 제거\n"
+
+#: builtin/add.c:134
+msgid "Unstaged changes after refreshing the index:"
+msgstr "ì¸ë±ìŠ¤ë¥¼ 새로 고친 ë‹¤ìŒ ì»¤ë°‹ 표시하지 ì•Šì€ ë³€ê²½ 사항:"
+
+#: builtin/add.c:194 builtin/rev-parse.c:796
+msgid "Could not read the index"
+msgstr "ì¸ë±ìŠ¤ë¥¼ ì½ì„ 수 없습니다"
+
+#: builtin/add.c:205
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "'%s' 파ì¼ì„ 쓰기용으로 ì—´ 수 없습니다."
+
+#: builtin/add.c:209
+msgid "Could not write patch"
+msgstr "패치를 쓸 수 없습니다"
+
+#: builtin/add.c:212
+msgid "editing patch failed"
+msgstr "패치 íŽ¸ì§‘ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/add.c:215
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "'%s'ì„(를) stat()í•  수 없습니다"
+
+#: builtin/add.c:217
+msgid "Empty patch. Aborted."
+msgstr "빈 패치. 중지."
+
+#: builtin/add.c:222
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "'%s'ì„(를) ì ìš©í•  수 없습니다"
+
+#: builtin/add.c:232
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "ë‹¤ìŒ ê²½ë¡œëŠ” .gitignore íŒŒì¼ ì¤‘ 하나 ë•Œë¬¸ì— ë¬´ì‹œí•©ë‹ˆë‹¤:\n"
+
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
+msgid "dry run"
+msgstr "가짜로 실행"
+
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr "ìžì„¸ížˆ 표시"
+
+#: builtin/add.c:252
+msgid "interactive picking"
+msgstr "대화ì‹ìœ¼ë¡œ 고릅니다"
+
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
+msgid "select hunks interactively"
+msgstr "대화ì‹ìœ¼ë¡œ ë³€ê²½ëœ ë¶€ë¶„ì„ ì„ íƒí•©ë‹ˆë‹¤"
+
+#: builtin/add.c:254
+msgid "edit current diff and apply"
+msgstr "현재 diff를 편집하고 ì ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/add.c:255
+msgid "allow adding otherwise ignored files"
+msgstr "무시하는 파ì¼ì˜ 추가를 허용합니다"
+
+#: builtin/add.c:256
+msgid "update tracked files"
+msgstr "추ì ë˜ëŠ” 파ì¼ì„ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤"
+
+#: builtin/add.c:257
+msgid "record only the fact that the path will be added later"
+msgstr "ë‚˜ì¤‘ì— ì¶”ê°€í•  것ì´ë¼ëŠ” 사실만 기ë¡í•©ë‹ˆë‹¤"
+
+#: builtin/add.c:258
+msgid "add changes from all tracked and untracked files"
+msgstr "추ì ë˜ê³  추ì ë˜ì§€ 않는 모든 파ì¼ì˜ 변경 ì‚¬í•­ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
+
+#: builtin/add.c:261
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "ìž‘ì—… í´ë”ì—ì„œ 제거한 경로를 무시합니다 (--no-allê³¼ ë™ì¼)"
+
+#: builtin/add.c:263
+msgid "don't add, only refresh the index"
+msgstr "추가하지 ì•Šê³  ì¸ë±ìŠ¤ë§Œ 새로 고칩니다"
+
+#: builtin/add.c:264
+msgid "just skip files which cannot be added because of errors"
+msgstr "오류 ë•Œë¬¸ì— ì¶”ê°€í•  수 없는 파ì¼ì„ 건너ëœë‹ˆë‹¤"
+
+#: builtin/add.c:265
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "가짜로 ì‹¤í–‰í–ˆì„ ë•Œ 파ì¼ì„ 무시하는지 확ì¸í•©ë‹ˆë‹¤"
+
+#: builtin/add.c:287
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr "ì •ë§ë¡œ 추가하려면 -f ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤.\n"
+
+#: builtin/add.c:294
+msgid "adding files failed"
+msgstr "íŒŒì¼ ì¶”ê°€ê°€ 실패했습니다"
+
+#: builtin/add.c:330
+msgid "-A and -u are mutually incompatible"
+msgstr "-A ë° -u ì˜µì…˜ì€ ì„œë¡œ 호환ë˜ì§€ 않습니다"
+
+#: builtin/add.c:337
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr ""
+"--ignore-missing ì˜µì…˜ì€ --dry-run 옵션과 ê°™ì´ ì‚¬ìš©í•  경우ì—만 쓸 수 있습니다."
+
+#: builtin/add.c:352
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "아무 ê²ƒë„ ì§€ì •í•˜ì§€ 않았으므로 아무 ê²ƒë„ ì¶”ê°€í•˜ì§€ 않습니다.\n"
+
+#: builtin/add.c:353
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "'git add .' ëª…ë ¹ì„ ì‹¤í–‰í•˜ë ¤ê³  í•œ 것 아니었습니까?\n"
+
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
+msgid "index file corrupt"
+msgstr "ì¸ë±ìŠ¤ 파ì¼ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
+msgid "Unable to write new index file"
+msgstr "새 ì¸ë±ìŠ¤ 파ì¼ì— 쓸 수 없습니다"
+
+#: builtin/am.c:42
+#, c-format
+msgid "could not stat %s"
+msgstr "%sì— ëŒ€í•´ stat()í•  수 없습니다"
+
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
+#, c-format
+msgid "could not read '%s'"
+msgstr "'%s'ì—ì„œ ì½ì„ 수 없습니다"
+
+#: builtin/am.c:445
+msgid "could not parse author script"
+msgstr "ìž‘ì„±ìž ìŠ¤í¬ë¦½íŠ¸ë¥¼ 파싱할 수 없습니다"
+
+#: builtin/am.c:522
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "applypatch-msg í›… ë•Œë¬¸ì— '%s'ì´(ê°€) ì‚­ì œë˜ì—ˆìŠµë‹ˆë‹¤."
+
+#: builtin/am.c:563 builtin/notes.c:300
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "ìž˜ëª»ëœ í˜•ì‹ì˜ ìž…ë ¥ 줄: '%s'."
+
+#: builtin/am.c:600 builtin/notes.c:315
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "'%s'ì—ì„œ '%s'(으)ë¡œ 노트를 ë³µì‚¬í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/am.c:626
+msgid "fseek failed"
+msgstr "fseek 실패"
+
+#: builtin/am.c:787 builtin/am.c:875
+#, c-format
+msgid "could not open '%s' for reading: %s"
+msgstr "'%s'ì„(를) ì½ê¸°ìš©ìœ¼ë¡œ ì—´ 수 없습니다: %s"
+
+#: builtin/am.c:794
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "'%s'ì„(를) 쓰기용으로 ì—´ 수 없습니다: %s"
+
+#: builtin/am.c:803
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "'%s' 패치를 파싱할 수 없습니다"
+
+#: builtin/am.c:868
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "í•œë²ˆì— í•˜ë‚˜ì˜ StGIT 패치 시리즈만 ì ìš©í•  수 있습니다"
+
+#: builtin/am.c:916
+msgid "invalid timestamp"
+msgstr "ì‹œê°ì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: builtin/am.c:919 builtin/am.c:927
+msgid "invalid Date line"
+msgstr "Date ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: builtin/am.c:924
+msgid "invalid timezone offset"
+msgstr "시간대 ì˜¤í”„ì…‹ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: builtin/am.c:1011
+msgid "Patch format detection failed."
+msgstr "패치 í˜•ì‹ ê²€ìƒ‰ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/am.c:1016 builtin/clone.c:373
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "'%s' 디렉터리 만들기가 실패했습니다"
+
+#: builtin/am.c:1020
+msgid "Failed to split patches."
+msgstr "패치를 ìª¼ê°œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/am.c:1152 builtin/commit.c:363
+msgid "unable to write index file"
+msgstr "ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다"
+
+#: builtin/am.c:1203
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "ì´ ë¬¸ì œë¥¼ í•´ê²°í–ˆì„ ë•Œ \"%s --continue\"를 실행하십시오."
+
+#: builtin/am.c:1204
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "ì´ íŒ¨ì¹˜ë¥¼ 건너뛰려면, ê·¸ 대신 \"%s --skip\"ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤."
+
+#: builtin/am.c:1205
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+"ì›ëž˜ 브랜치를 복구하고 패치 ì ìš©ì„ 중지하려면 \"%s --abort\"를 실행하십시오."
+
+#: builtin/am.c:1343
+msgid "Patch is empty. Was it split wrong?"
+msgstr "패치가 비어 있습니다. 잘못 쪼개지지 않았나요?"
+
+#: builtin/am.c:1417 builtin/log.c:1347
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "ìž˜ëª»ëœ ì‹ ì› ì¤„: %s"
+
+#: builtin/am.c:1444
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "%s ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다"
+
+#: builtin/am.c:1646
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr "ì €ìž¥ì†Œì— 3-ë°©í–¥ 병합으로 대신할 ë•Œ 필요한 ë¸”ë¡­ì´ ì—†ìŠµë‹ˆë‹¤."
+
+#: builtin/am.c:1648
+msgid "Using index info to reconstruct a base tree..."
+msgstr "ì¸ë±ìŠ¤ 정보를 사용해 기본 트리를 다시 만듭니다..."
+
+#: builtin/am.c:1667
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"패치를 ì§ì ‘ 편집하셨습니까?\n"
+"ì´ íŒ¨ì¹˜ëŠ” ì¸ë±ìŠ¤ì— 기ë¡ëœ 블롭ì—는 ì ìš©ë˜ì§€ 않습니다."
+
+#: builtin/am.c:1673
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "ë² ì´ìŠ¤ 패치 ì ìš© ë° 3-ë°©í–¥ 병합으로 대신합니다..."
+
+#: builtin/am.c:1688
+msgid "Failed to merge in the changes."
+msgstr "변경 사항ì—ì„œ ë³‘í•©í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/am.c:1712 builtin/merge.c:632
+msgid "git write-tree failed to write a tree"
+msgstr "git write-treeê°€ 트리를 ì“°ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/am.c:1719
+msgid "applying to an empty history"
+msgstr "빈 커밋 ë‚´ì—­ì— ëŒ€í•´ ì ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
+#: builtin/merge.c:854
+msgid "failed to write commit object"
+msgstr "커밋 오브ì íŠ¸ë¥¼ ì“°ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/am.c:1764 builtin/am.c:1768
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "다시 시작할 수 없습니다: %sì´(ê°€) 없습니다."
+
+#: builtin/am.c:1784
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr ""
+"터미ë„ì— í‘œì¤€ ìž…ë ¥ì´ ì—°ê²°ë˜ì§€ ì•Šì€ ìƒíƒœì—ì„œ 대화형으로 실행할 수 없습니다."
+
+#: builtin/am.c:1789
+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.
+#.
+#: builtin/am.c:1799
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "ì ìš©? 예[y]/아니오[n]/편집[e]/패치 보기[v]/ëª¨ë‘ ì ìš©[a]: "
+
+#: builtin/am.c:1849
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "ë³€ê²½ëœ ì¸ë±ìŠ¤: 패치를 ì ìš©í•  수 없습니다 (dirty: %s)"
+
+#: builtin/am.c:1884 builtin/am.c:1955
+#, c-format
+msgid "Applying: %.*s"
+msgstr "ì ìš©í•˜ëŠ” 중: %.*s"
+
+#: builtin/am.c:1900
+msgid "No changes -- Patch already applied."
+msgstr "변경 사항 ì—†ìŒ -- 패치가 ì´ë¯¸ ì ìš©ë˜ì—ˆìŠµë‹ˆë‹¤."
+
+#: builtin/am.c:1908
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "패치가 %s %.*s 위치ì—ì„œ 실패했습니다"
+
+#: builtin/am.c:1914
+#, c-format
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "실패한 íŒ¨ì¹˜ì˜ ë³µì‚¬ë³¸ì´ ë‹¤ìŒ ìœ„ì¹˜ì— ìžˆìŠµë‹ˆë‹¤: %s"
+
+#: builtin/am.c:1958
+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 ""
+"변경 ì‚¬í•­ì´ ì—†ìŠµë‹ˆë‹¤ - 'git add' ì‚¬ìš©ì„ ìžŠìœ¼ì…¨ìŠµë‹ˆê¹Œ?\n"
+"커밋으로 표시할 ì‚¬í•­ì´ ë‚¨ì•„ 있지 않으면, ì´ë¯¸ ê°™ì€ íŒ¨ì¹˜ì—ì„œ ì ìš©ëœ\n"
+"ê²½ìš°ì¼ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. 그런 경우ì—는 ì´ íŒ¨ì¹˜ë¥¼ 건너뛰면 ë©ë‹ˆë‹¤."
+
+#: builtin/am.c:1965
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr ""
+"ì¸ë±ìŠ¤ì— 병합하지 ì•Šì€ ê²½ë¡œê°€ 남아 있습니다.\n"
+"'git add' ì‚¬ìš©ì„ ìžŠì§€ 않으셨습니까?"
+
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
+#: builtin/reset.c:316
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "'%s' 오브ì íŠ¸ë¥¼ 파싱할 수 없습니다."
+
+#: builtin/am.c:2125
+msgid "failed to clean index"
+msgstr "ì¸ë±ìŠ¤ ì§€ìš°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/am.c:2159
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"마지막 'am' 실패 ì´í›„ HEAD를 옮긴 것 같습니다.\n"
+"ORIG_HEADë¡œ ë˜ëŒë¦¬ì§€ 않습니다."
+
+#: builtin/am.c:2220
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "--patch-format ì˜µì…˜ì— ëŒ€í•´ ìž˜ëª»ëœ ê°’: %s"
+
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+msgstr "git am [<옵션>] [(<mbox>|<Maildir>)...]"
+
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<옵션>] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2260
+msgid "run interactively"
+msgstr "대화형으로 실행합니다"
+
+#: builtin/am.c:2262
+msgid "historical option -- no-op"
+msgstr "아무 ë™ìž‘ë„ í•˜ì§€ 않습니다 (과거부터 ìžˆì—ˆë˜ ì˜µì…˜)"
+
+#: builtin/am.c:2264
+msgid "allow fall back on 3way merging if needed"
+msgstr "필요하면 3-ë°©í–¥ 병합으로 대신하ë„ë¡ í—ˆìš©í•©ë‹ˆë‹¤"
+
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/repack.c:171
+msgid "be quiet"
+msgstr "간략히 표시합니다"
+
+#: builtin/am.c:2267
+msgid "add a Signed-off-by line to the commit message"
+msgstr "커밋 ë©”ì‹œì§€ì— Signed-off-by ì¤„ì„ ë‚¨ê¹ë‹ˆë‹¤"
+
+#: builtin/am.c:2270
+msgid "recode into utf8 (default)"
+msgstr "UTF-8 ì¸ì½”딩으로 변환합니다 (기본값)"
+
+#: builtin/am.c:2272
+msgid "pass -k flag to git-mailinfo"
+msgstr "git-mailinfoì— -k ì˜µì…˜ì„ ì”니다"
+
+#: builtin/am.c:2274
+msgid "pass -b flag to git-mailinfo"
+msgstr "git-mailinfoì— -b ì˜µì…˜ì„ ì”니다"
+
+#: builtin/am.c:2276
+msgid "pass -m flag to git-mailinfo"
+msgstr "git-mailinfoì— -m ì˜µì…˜ì„ ì”니다"
+
+#: builtin/am.c:2278
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "mbox 형ì‹ì— 대해 git-mailsplitì— --keep-cr ì˜µì…˜ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/am.c:2281
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+"am.keepcrì— ë¬´ê´€í•˜ê²Œ git-mailsplitì— --keep-cr ì˜µì…˜ì„ ì‚¬ìš©í•˜ì§€ 않습니다."
+
+#: builtin/am.c:2284
+msgid "strip everything before a scissors line"
+msgstr "절취선 ì•žì˜ ëª¨ë“  ì‚¬í•­ì„ ë¬´ì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/am.c:2285 builtin/apply.c:4554
+msgid "action"
+msgstr "ë™ìž‘"
+
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
+msgid "pass it through git-apply"
+msgstr "git-applyì— ë„˜ê¹ë‹ˆë‹¤"
+
+#: builtin/am.c:2294 builtin/apply.c:4578
+msgid "root"
+msgstr "최ìƒìœ„"
+
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
+msgid "path"
+msgstr "경로"
+
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
+msgid "n"
+msgstr "n"
+
+#: builtin/am.c:2306 builtin/apply.c:4522
+msgid "num"
+msgstr "개수"
+
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
+msgid "format"
+msgstr "형ì‹"
+
+#: builtin/am.c:2310
+msgid "format the patch(es) are in"
+msgstr "íŒ¨ì¹˜ì˜ í˜•ì‹"
+
+#: builtin/am.c:2316
+msgid "override error message when patch failure occurs"
+msgstr "패치 실패가 ë°œìƒí–ˆì„ ë•Œ 오류 메시지 대신 사용합니다"
+
+#: builtin/am.c:2318
+msgid "continue applying patches after resolving a conflict"
+msgstr "충ëŒì„ í•´ê²°í•œ ë‹¤ìŒ íŒ¨ì¹˜ ì ìš©ì„ 계ì†í•©ë‹ˆë‹¤"
+
+#: builtin/am.c:2321
+msgid "synonyms for --continue"
+msgstr "--continue 옵션과 ë™ì¼"
+
+#: builtin/am.c:2324
+msgid "skip the current patch"
+msgstr "현재 패치 건너뛰기"
+
+#: builtin/am.c:2327
+msgid "restore the original branch and abort the patching operation."
+msgstr "ì›ëž˜ 브랜치를 복구하고 패치 ì ìš© ìž‘ì—…ì„ ì¤‘ì§€í•©ë‹ˆë‹¤."
+
+# NOTE: ì˜µì…˜ì˜ ì˜ë¯¸ëŠ” ì´ê²Œ 맞다. ì›ë¬¸ì—서는 사용ìžê°€
+# --committer-date-is-author-dateë¼ëŠ” ì˜µì…˜ì„ ë³´ê³  ì˜ë¯¸ë¥¼ ì•Œ 수 있다고 가정하고 있다.
+#: builtin/am.c:2331
+msgid "lie about committer date"
+msgstr "커미터 ì‹œê°ì„ ìž‘ì„±ìž ì‹œê°ìœ¼ë¡œ 넣습니다"
+
+#: builtin/am.c:2333
+msgid "use current timestamp for author date"
+msgstr "현재 ì‹œê°ì„ ìž‘ì„±ìž ì‹œê°ìœ¼ë¡œ 사용합니다"
+
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
+msgid "key-id"
+msgstr "키-ID"
+
+#: builtin/am.c:2336
+msgid "GPG-sign commits"
+msgstr "GPG 서명 커밋"
+
+#: builtin/am.c:2339
+msgid "(internal use for git-rebase)"
+msgstr "(git-rebase를 위한 내부 ìš©ë„)"
+
+#: builtin/am.c:2354
+msgid ""
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
+msgstr ""
+"-b/--binary ì˜µì…˜ì€ ì˜¤ëžœ 시간 ë™ì•ˆ 아무 ë™ìž‘ë„ í•˜ì§€ 않았으므로, ì´\n"
+"ì˜µì…˜ì€ ì œê±°ë  ì˜ˆì •ìž…ë‹ˆë‹¤. ì´ì œ 사용하지 마십시오."
+
+#: builtin/am.c:2361
+msgid "failed to read the index"
+msgstr "ì¸ë±ìŠ¤ ì½ê¸°ì— 실패했습니다"
+
+#: builtin/am.c:2376
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "ì´ì „ 리베ì´ìŠ¤ 디렉터리 %sì´(ê°€) ì•„ì§ ìžˆê³  mbox를 지정했습니다."
+
+#: builtin/am.c:2400
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"ë²—ì–´ë‚œ %s 디렉터리가 발견ë˜ì—ˆìŠµë‹ˆë‹¤.\n"
+"제거하려면 \"git am --abort\"를 사용하십시오."
+
+#: builtin/am.c:2406
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "해소 ìž‘ì—…ì´ ì§„í–‰ 중입니다. 다시 시작하지 않습니다."
+
+#: builtin/apply.c:59
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<옵션>] [<패치>...]"
+
+#: builtin/apply.c:111
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "알 수 없는 공백 옵션 '%s'"
+
+#: builtin/apply.c:126
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "알 수 없는 공백 무시 옵션 '%s'"
+
+#: builtin/apply.c:818
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "타임스탬프 ì •ê·œì‹ì„ 준비할 수 없습니다 (%s)"
+
+#: builtin/apply.c:827
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec()ì—ì„œ ë‹¤ìŒ ìž…ë ¥ì— ëŒ€í•´ %dë²ˆì„ ë¦¬í„´í–ˆìŠµë‹ˆë‹¤: %s"
+
+#: builtin/apply.c:908
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "íŒ¨ì¹˜ì˜ %d번 ì¤„ì— íŒŒì¼ ì´ë¦„ì„ ì°¾ì„ ìˆ˜ 없습니다"
+
+#: builtin/apply.c:940
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr "git apply: ìž˜ëª»ëœ git-diff - %2$d번 줄ì—ì„œ /dev/nullì„ ê¸°ëŒ€í–ˆì§€ë§Œ, '%1$s'ì´(ê°€) 왔습니다"
+
+#: builtin/apply.c:944
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply: ìž˜ëª»ëœ git-diff - %d번 ì¤„ì— ìƒˆ íŒŒì¼ ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다"
+
+#: builtin/apply.c:945
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr "git apply: ìž˜ëª»ëœ git-diff - %d번 ì¤„ì— ì˜ˆì „ íŒŒì¼ ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다"
+
+#: builtin/apply.c:952
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: ìž˜ëª»ëœ git-diff - %d번 줄ì—ì„œ /dev/nullì„ ê¸°ëŒ€í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/apply.c:1415
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: 예ìƒì¹˜ 못한 줄: %.*s"
+
+#: builtin/apply.c:1472
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "%d번 ì¤„ì— í—¤ë” ì—†ëŠ” 패치 부분: %.*s"
+
+#: builtin/apply.c:1489
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+"경로 ì´ë¦„ 부분ì—ì„œ %d개를 ì œê±°ë¼ ë•Œ git diff í—¤ë”ì— íŒŒì¼ ì´ë¦„ ì •ë³´ê°€ 없습니"
+"다. (%d번 줄)"
+
+#: builtin/apply.c:1655
+msgid "new file depends on old contents"
+msgstr "새 파ì¼ì´ 예전 ë‚´ìš©ì— ì˜ì¡´í•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:1657
+msgid "deleted file still has contents"
+msgstr "삭제한 파ì¼ì— ì•„ì§ ë‚´ìš©ì´ ë“¤ì–´ 있습니다"
+
+#: builtin/apply.c:1683
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "패치가 %d번 줄ì—ì„œ ë§ê°€ì¡ŒìŠµë‹ˆë‹¤"
+
+#: builtin/apply.c:1719
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "새 íŒŒì¼ %sì´(ê°€) 예전 ë‚´ìš©ì— ì˜ì¡´í•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:1721
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "삭제한 íŒŒì¼ %sì´(ê°€) ì•„ì§ ë‚´ìš©ì´ ë“¤ì–´ 있습니다"
+
+#: builtin/apply.c:1724
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** 경고: %s 파ì¼ì˜ ë‚´ìš©ì´ ë¹„ì–´ 있지만 ì‚­ì œë˜ì§€ 않았습니다"
+
+#: builtin/apply.c:1870
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "%d번 ì¤„ì— ë°”ì´ë„ˆë¦¬ 패치가 ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤: %.*s"
+
+#: builtin/apply.c:1899
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "%d번 ì¤„ì— ë°”ì´ë„ˆë¦¬ 패치가 ì´í•´í•  수 없습니다"
+
+#: builtin/apply.c:2050
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "%d번 ì¤„ì— ì“°ë ˆê¸° ë°ì´í„°ë§Œ 있는 패치"
+
+#: builtin/apply.c:2140
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "%s 심볼릭 ë§í¬ë¥¼ ì½ì„ 수 없습니다"
+
+#: builtin/apply.c:2144
+#, c-format
+msgid "unable to open or read %s"
+msgstr "%sì„(를) 열거나 ì½ì„ 수 없습니다"
+
+#: builtin/apply.c:2777
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "줄 ì‹œìž‘ì´ ìž˜ëª»ë¨: '%c'"
+
+#: builtin/apply.c:2896
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "패치 %d번 부분 %d번 줄ì—ì„œ 성공 (오프셋 %d줄)"
+
+#: builtin/apply.c:2908
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "컨í…스트가 (%ld/%ld)ë¡œ 줄어듭니다. (%d번 줄ì—ì„œ ì ìš©)"
+
+#: builtin/apply.c:2914
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"다ìŒì„ ê²€ìƒ‰í•˜ë˜ ì¤‘:\n"
+"%.*s"
+
+#: builtin/apply.c:2934
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "'%s'ì— ëŒ€í•œ ë°”ì´ë„ˆë¦¬ 패치 ë°ì´í„°ê°€ 없습니다"
+
+#: builtin/apply.c:3035
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "ë°”ì´ë„ˆë¦¬ 패치를 '%s'ì— ì ìš©í•  수 없습니다"
+
+#: builtin/apply.c:3041
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"'%s'ì— ëŒ€í•œ ë°”ì´ë„ˆë¦¬ 패치가 올바르지 ì•Šì€ ê²°ê³¼ë¥¼ 만듭니다. (기대한 ê°’ %s, 실"
+"제 %s)"
+
+#: builtin/apply.c:3062
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "패치 실패: %s:%ld"
+
+#: builtin/apply.c:3186
+#, c-format
+msgid "cannot checkout %s"
+msgstr "%sì„(를) 가져올 수 없습니다"
+
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#, c-format
+msgid "read of %s failed"
+msgstr "%s ì½ê¸°ê°€ 실패했습니다"
+
+#: builtin/apply.c:3239
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "심볼릭 ë§í¬ ë’¤ì— ìžˆëŠ” '%s' ì½ê¸°"
+
+#: builtin/apply.c:3267 builtin/apply.c:3489
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "%s 경로가 ì´ë¦„ì´ ë°”ë€Œì—ˆê±°ë‚˜ ì‚­ì œë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: builtin/apply.c:3348 builtin/apply.c:3503
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: ì¸ë±ìŠ¤ì— 없습니다"
+
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#, c-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: builtin/apply.c:3357 builtin/apply.c:3511
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: ì¸ë±ìŠ¤ì™€ 맞지 않습니다"
+
+#: builtin/apply.c:3459
+msgid "removal patch leaves file contents"
+msgstr "제거하는 패치 다ìŒì— íŒŒì¼ ë‚´ìš©ì´ ë‚¨ì•˜ìŠµë‹ˆë‹¤"
+
+#: builtin/apply.c:3528
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: ìž˜ëª»ëœ ì¢…ë¥˜"
+
+#: builtin/apply.c:3530
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%sì˜ ì¢…ë¥˜ê°€ %oì´ì§€ë§Œ %oì´(ê°€) ë˜ì–´ì•¼ 합니다"
+
+#: builtin/apply.c:3689 builtin/apply.c:3691
+#, c-format
+msgid "invalid path '%s'"
+msgstr "ìž˜ëª»ëœ ê²½ë¡œ '%s'"
+
+#: builtin/apply.c:3746
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: ì´ë¯¸ ì¸ë±ìŠ¤ì— 있습니다"
+
+#: builtin/apply.c:3749
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: ì´ë¯¸ ìž‘ì—… ë””ë ‰í„°ë¦¬ì— ìžˆìŠµë‹ˆë‹¤"
+
+#: builtin/apply.c:3769
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "%2$sì˜ ìƒˆ 모드(%1$o)ê°€ 예전 모드(%3$o)와 다릅니다"
+
+#: builtin/apply.c:3774
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "%2$sì˜ ìƒˆ 모드(%1$o)ê°€ %4$sì˜ ì˜ˆì „ 모드(%3$o)와 다릅니다"
+
+#: builtin/apply.c:3794
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "ì˜í–¥ 받는 '%s' 파ì¼ì´ 심볼릭 ë§í¬ ë’¤ì— ìžˆìŠµë‹ˆë‹¤"
+
+#: builtin/apply.c:3798
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: 패치를 ì ìš©í•˜ì§€ 않습니다"
+
+#: builtin/apply.c:3812
+#, c-format
+msgid "Checking patch %s..."
+msgstr "%s 패치를 확ì¸í•˜ëŠ” 중입니다..."
+
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "경로 '%s'ì— ëŒ€í•´ make_cache_entry 실패"
+
+#: builtin/apply.c:4048
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "ì¸ë±ìŠ¤ì—ì„œ %sì„(를) 제거할 수 없습니다"
+
+#: builtin/apply.c:4077
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "하위 모듈 %sì— ëŒ€í•´ ì†ìƒëœ 패치"
+
+#: builtin/apply.c:4081
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "새로 만든 íŒŒì¼ '%s'ì— ëŒ€í•´ stat()í•  수 없습니다"
+
+#: builtin/apply.c:4086
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr "새로 만든 íŒŒì¼ '%s'ì— ëŒ€í•´ 예비 저장소를 만들 수 없습니다"
+
+#: builtin/apply.c:4089 builtin/apply.c:4197
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "%sì— ëŒ€í•´ ìºì‹œ í•­ëª©ì„ ì¶”ê°€í•  수 없습니다"
+
+#: builtin/apply.c:4122
+#, c-format
+msgid "closing file '%s'"
+msgstr "'%s' 파ì¼ì„ 닫는 중입니다"
+
+#: builtin/apply.c:4171
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "'%s' 파ì¼ì— 쓸 수 없습니다 ('%o' 모드)"
+
+#: builtin/apply.c:4258
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "%s 패치 ê¹”ë”하게 ì ìš©."
+
+#: builtin/apply.c:4266
+msgid "internal error"
+msgstr "내부 오류"
+
+#: builtin/apply.c:4269
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "%%s 패치를 (%dê°œ 거부) ì ìš©..."
+
+#: builtin/apply.c:4279
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "truncating .rej íŒŒì¼ ì´ë¦„ì„ '%.*s.rej'(으)ë¡œ ìžë¦„"
+
+#: builtin/apply.c:4300
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "패치 부위 #%d ê¹”ë”하게 ì ìš©."
+
+#: builtin/apply.c:4303
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "패치 부위 #%d 거부ë¨."
+
+#: builtin/apply.c:4393
+msgid "unrecognized input"
+msgstr "ì¸ì‹í•  수 없는 ìž…ë ¥"
+
+#: builtin/apply.c:4404
+msgid "unable to read index file"
+msgstr "ì¸ë±ìŠ¤ 파ì¼ì„ ì½ì„ 수 없습니다"
+
+#: builtin/apply.c:4517
+msgid "don't apply changes matching the given path"
+msgstr "주어진 ê²½ë¡œì— í•´ë‹¹í•˜ëŠ” 변경 ì‚¬í•­ì„ ì ìš©í•˜ì§€ 않습니다"
+
+#: builtin/apply.c:4520
+msgid "apply changes matching the given path"
+msgstr "주어진 ê²½ë¡œì— í•´ë‹¹í•˜ëŠ” 변경 ì‚¬í•­ì„ ì ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:4523
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "전통ì ì¸ diff 경로 ì•žì˜ <개수>ê°œì˜ ì•ž 슬래시(/)를 제거합니다"
+
+#: builtin/apply.c:4526
+msgid "ignore additions made by the patch"
+msgstr "패치ì—ì„œ 추가하는 파ì¼ì„ 무시합니다"
+
+#: builtin/apply.c:4528
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "패치를 ì ìš©í•˜ëŠ” 대신, ìž…ë ¥ì— ëŒ€í•œ diffstatì„ ì¶œë ¥í•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:4532
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "십진수로 추가 ë° ì‚­ì œí•œ 줄 수를 표시합니다"
+
+#: builtin/apply.c:4534
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "패치를 ì ìš©í•˜ëŠ” 대신, ìž…ë ¥ì— ëŒ€í•œ ìš”ì•½ì„ ì¶œë ¥í•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:4536
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "패치를 ì ìš©í•˜ëŠ” 대신, 패치를 ì ìš© 가능한지 확ì¸í•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:4538
+msgid "make sure the patch is applicable to the current index"
+msgstr "현재 ì¸ë±ìŠ¤ì—ì„œ 패치가 ì ìš© 가능한지 확ì¸í•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:4540
+msgid "apply a patch without touching the working tree"
+msgstr "ìž‘ì—… í´ë”를 바꾸지 ì•Šê³  패치를 ì ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:4542
+msgid "accept a patch that touches outside the working area"
+msgstr "ìž‘ì—… ì˜ì—­ ë°–ì˜ íŒŒì¼ì„ 바꾸는 패치를 허용합니다"
+
+#: builtin/apply.c:4544
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "그리고 íŒ¨ì¹˜ë„ ì ìš©í•©ë‹ˆë‹¤ (--stat/--summary/--check 옵션과 ê°™ì´ ì‚¬ìš©)"
+
+#: builtin/apply.c:4546
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "패치를 ì ìš©í•˜ì§€ 않으면 3-ë°©í–¥ ë³‘í•©ì„ ì‹œë„합니다"
+
+#: builtin/apply.c:4548
+msgid "build a temporary index based on embedded index information"
+msgstr "내장 ì¸ë±ìŠ¤ 정보를 사용해 ìž„ì‹œ ì¸ë±ìŠ¤ë¥¼ 만듭니다"
+
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
+msgid "paths are separated with NUL character"
+msgstr "경로를 NUL 문ìžë¡œ 구분합니다"
+
+#: builtin/apply.c:4553
+msgid "ensure at least <n> lines of context match"
+msgstr "최소한 <n>ì¤„ì´ ì»¨í…스트와 ì¼ì¹˜í•˜ëŠ”지 확ì¸í•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:4555
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "공백 오류가 있는 추가ë거나 ìˆ˜ì •ëœ ì¤„ì„ ì°¾ìŠµë‹ˆë‹¤"
+
+#: builtin/apply.c:4558 builtin/apply.c:4561
+msgid "ignore changes in whitespace when finding context"
+msgstr "컨í…스트를 ì°¾ì„ ë•Œ 공백 변경 ì‚¬í•­ì„ ë¬´ì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:4564
+msgid "apply the patch in reverse"
+msgstr "패치를 반대 순서로 ì ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:4566
+msgid "don't expect at least one line of context"
+msgstr "ìµœì†Œí•œì˜ ì»¨í…스트 í•œ ì¤„ë„ ì—†ì´ ì ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:4568
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "ê±°ë¶€ëœ íŒ¨ì¹˜ ë¶€ë¶„ì„ ëŒ€ì‘ë˜ëŠ” *.rej 파ì¼ì— 남겨둡니다"
+
+#: builtin/apply.c:4570
+msgid "allow overlapping hunks"
+msgstr "패치 ë¶€ë¶„ì´ ê²¹ì³ë„ 허용합니다"
+
+#: builtin/apply.c:4573
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "íŒŒì¼ ëì— ì¤„ë°”ê¿ˆì´ ë¹ ì¡ŒìŒì„ 잘못 검색한 ê²½ìš°ì— ë¬´ì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/apply.c:4576
+msgid "do not trust the line counts in the hunk headers"
+msgstr "패치 ë¶€ë¶„ì˜ í—¤ë”ì˜ ì¤„ 수를 신용하지 않습니다"
+
+#: builtin/apply.c:4579
+msgid "prepend <root> to all filenames"
+msgstr "모든 íŒŒì¼ ì´ë¦„ì— <최ìƒìœ„>를 ì•žì— ë¶™ìž…ë‹ˆë‹¤"
+
+#: builtin/apply.c:4601
+msgid "--3way outside a repository"
+msgstr "저장소 ë°–ì—ì„œ --3way 옵션 사용"
+
+#: builtin/apply.c:4609
+msgid "--index outside a repository"
+msgstr "저장소 ë°–ì—ì„œ --index 옵션 사용"
+
+#: builtin/apply.c:4612
+msgid "--cached outside a repository"
+msgstr "저장소 ë°–ì—ì„œ --cached 옵션 사용"
+
+#: builtin/apply.c:4631
+#, c-format
+msgid "can't open patch '%s'"
+msgstr "'%s' 패치를 열 수 없습니다"
+
+#: builtin/apply.c:4645
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "공백 오류 %d개를 넘어갑니다"
+
+#: builtin/apply.c:4651 builtin/apply.c:4661
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d줄ì—ì„œ 공백 오류를 추가합니다."
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr "'%s' ì•„ì¹´ì´ë¸Œ 파ì¼ì„ 만들 수 없습니다"
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "출력 ë°©í–¥ì„ ëŒë¦´ 수 없습니다"
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive: URL 없는 리모트"
+
+#: builtin/archive.c:58
+msgid "git archive: expected ACK/NAK, got EOF"
+msgstr "git archive: ACK/NAK가 와야 하지만, EOF를 받았습니다"
+
+#: builtin/archive.c:61
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive: NACK %s"
+
+#: builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "리모트 오류: %s"
+
+#: builtin/archive.c:64
+msgid "git archive: protocol error"
+msgstr "git archive: 프로토콜 오류"
+
+#: builtin/archive.c:68
+msgid "git archive: expected a flush"
+msgstr "git archive: íŒŒì¼ ëì„ ì˜ˆìƒí•¨"
+
+#: builtin/bisect--helper.c:7
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:17
+msgid "perform 'git bisect next'"
+msgstr "'git bisect next'를 수행합니다"
+
+#: builtin/bisect--helper.c:19
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr "현재 ì»¤ë°‹ì„ ê°€ì ¸ì˜¤ëŠ” 대신 BISECT_HEAD를 ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤"
+
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<옵션>] [<리비전-옵션>] [<리비전>] [--] <파ì¼>"
+
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<리비전-옵션>ì€ git-rev-list(1)ì— ì„¤ëª…ë˜ì–´ 있습니다"
+
+#: builtin/blame.c:2519
+msgid "Show blame entries as we find them, incrementally"
+msgstr "blame í•­ëª©ì„ ì°¾ìžë§ˆìž ì ì§„ì ìœ¼ë¡œ 표시합니다"
+
+#: builtin/blame.c:2520
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr "가장ìžë¦¬ ì»¤ë°‹ì— ëŒ€í•´ 빈 SHA-1ì„ í‘œì‹œí•©ë‹ˆë‹¤ (기본값: 꺼ì§)"
+
+#: builtin/blame.c:2521
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr "최ìƒìœ„ ì»¤ë°‹ì„ ê°€ìž¥ìžë¦¬ 커밋으로 취급하지 않습니다 (기본값: 꺼ì§)"
+
+#: builtin/blame.c:2522
+msgid "Show work cost statistics"
+msgstr "작업 비용 통계를 표시합니다"
+
+#: builtin/blame.c:2523
+msgid "Show output score for blame entries"
+msgstr "blame í•­ëª©ì— ëŒ€í•´ 출력 ì ìˆ˜ë¥¼ 표시합니다"
+
+#: builtin/blame.c:2524
+msgid "Show original filename (Default: auto)"
+msgstr "ì›ëž˜ íŒŒì¼ ì´ë¦„ 표시 (기본값: ìžë™)"
+
+#: builtin/blame.c:2525
+msgid "Show original linenumber (Default: off)"
+msgstr "ì›ëž˜ 줄 번호 표시 (기본값: 하지 ì•ŠìŒ)"
+
+#: builtin/blame.c:2526
+msgid "Show in a format designed for machine consumption"
+msgstr "컴퓨터 처리용으로 ì„¤ê³„ëœ í˜•ì‹ìœ¼ë¡œ 표시합니다"
+
+#: builtin/blame.c:2527
+msgid "Show porcelain format with per-line commit information"
+msgstr "줄마다 커밋 ì •ë³´ê°€ 표시ë˜ëŠ” 사용ìžìš© 형ì‹ìœ¼ë¡œ 표시합니다"
+
+#: builtin/blame.c:2528
+msgid "Use the same output mode as git-annotate (Default: off)"
+msgstr "git-annotate와 ë™ì¼í•œ 형ì‹ì„ 사용합니다 (기본값: 꺼ì§)"
+
+#: builtin/blame.c:2529
+msgid "Show raw timestamp (Default: off)"
+msgstr "내부 형ì‹ìœ¼ë¡œ ì‹œê°ì„ 표시합니다 (기본값: 꺼ì§)"
+
+#: builtin/blame.c:2530
+msgid "Show long commit SHA1 (Default: off)"
+msgstr "길게 커밋 SHA1ì„ í‘œì‹œí•©ë‹ˆë‹¤ (기본값: 꺼ì§)"
+
+#: builtin/blame.c:2531
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr "ìž‘ì„±ìž ì´ë¦„ê³¼ ì‹œê°ì„ 표시하지 않습니다 (기본값: 꺼ì§)"
+
+#: builtin/blame.c:2532
+msgid "Show author email instead of name (Default: off)"
+msgstr "ìž‘ì„±ìž ì´ë¦„ ëŒ€ì‹ ì— ì „ìžë©”ì¼ì„ 표시합니다 (기본값: 꺼ì§)"
+
+#: builtin/blame.c:2533
+msgid "Ignore whitespace differences"
+msgstr "공백 ë¬¸ìž ì°¨ì´ì ì„ 무시합니다"
+
+#: builtin/blame.c:2534
+msgid "Spend extra cycles to find better match"
+msgstr "ë” ì¼ì¹˜í•˜ëŠ” í•­ëª©ì„ ì°¾ëŠ”ë° ë” ì‹œê°„ì„ ì†Œëª¨í•©ë‹ˆë‹¤"
+
+#: builtin/blame.c:2535
+msgid "Use revisions from <file> instead of calling git-rev-list"
+msgstr "git-rev-list를 호출하는 대신 <파ì¼>ì—ì„œ ë¦¬ë¹„ì „ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/blame.c:2536
+msgid "Use <file>'s contents as the final image"
+msgstr "<파ì¼>ì˜ ë‚´ìš©ì„ ìµœì¢… ì´ë¯¸ì§€ë¡œ 사용합니다"
+
+#: builtin/blame.c:2537 builtin/blame.c:2538
+msgid "score"
+msgstr "ì ìˆ˜"
+
+#: builtin/blame.c:2537
+msgid "Find line copies within and across files"
+msgstr "íŒŒì¼ ë‚´ë¶€ì™€ íŒŒì¼ ì‚¬ì´ì˜ ë³µì‚¬ëœ ì¤„ì„ ì°¾ìŠµë‹ˆë‹¤"
+
+#: builtin/blame.c:2538
+msgid "Find line movements within and across files"
+msgstr "íŒŒì¼ ë‚´ë¶€ì™€ íŒŒì¼ ì‚¬ì´ì˜ 옮겨진 ì¤„ì„ ì°¾ìŠµë‹ˆë‹¤"
+
+#: builtin/blame.c:2539
+msgid "n,m"
+msgstr "n,m"
+
+#: builtin/blame.c:2539
+msgid "Process only line range n,m, counting from 1"
+msgstr "n,m줄 (1번 줄부터 시작) 사ì´ì˜ 범위만 처리"
+
+#. TRANSLATORS: This string is used to tell us the maximum
+#. display width for a relative timestamp in "git blame"
+#. output. For C locale, "4 years, 11 months ago", which
+#. takes 22 places, is the longest among various forms of
+#. relative timestamps, but your language may need more or
+#. fewer display columns.
+#: builtin/blame.c:2620
+msgid "4 years, 11 months ago"
+msgstr "4년 11달 전"
+
+#: builtin/branch.c:25
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<옵션>] [-r | -a] [--merged | --no-merged]"
+
+#: builtin/branch.c:26
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<옵션>] [-l] [-f] <브랜치-ì´ë¦„> [<시작-지ì >]"
+
+#: builtin/branch.c:27
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<옵션>] [-r] (-d | -D) <브랜치-ì´ë¦„>..."
+
+#: builtin/branch.c:28
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<옵션>] (-m | -M) [<과거-브랜치>] <새-브랜치>"
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<옵션>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:142
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
+msgstr ""
+"'%s' 브랜치를 삭제합니다. ì´ ë¸Œëžœì¹˜ëŠ” '%s'ì—\n"
+" 병합ë˜ì—ˆì§€ë§Œ, HEADì—는 병합ë˜ì§€ 않았습니다."
+
+#: builtin/branch.c:146
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
+msgstr ""
+"'%s' 브랜치를 삭제하지 않습니다. ì´ ë¸Œëžœì¹˜ëŠ” '%s'ì—\n"
+" 병합ë˜ì§€ 않았지만, HEADì—는 병합ë˜ì—ˆìŠµë‹ˆë‹¤."
+
+#: builtin/branch.c:160
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "'%s'ì— ëŒ€í•œ 커밋 오브ì íŠ¸ë¥¼ 찾아볼 수 없습니다"
+
+#: builtin/branch.c:164
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+"'%s' 브랜치가 완전히 병합ë˜ì§€ 않았습니다.\n"
+"ì •ë§ë¡œ 삭제하려면 'git branch -D %s' ëª…ë ¹ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤."
+
+#: builtin/branch.c:177
+msgid "Update of config-file failed"
+msgstr "config-file ì—…ë°ì´íŠ¸ê°€ 실패했습니다"
+
+#: builtin/branch.c:205
+msgid "cannot use -a with -d"
+msgstr "-a ì˜µì…˜ì„ -d 옵션과 ê°™ì´ ì“¸ 수 없습니다"
+
+#: builtin/branch.c:211
+msgid "Couldn't look up commit object for HEAD"
+msgstr "HEADì— ëŒ€í•œ 커밋 오브ì íŠ¸ë¥¼ 찾아볼 수 없습니다"
+
+#: builtin/branch.c:219
+#, c-format
+msgid "Cannot delete the branch '%s' which you are currently on."
+msgstr "'%s' 브랜치는 현재 위치한 브랜치ì´ê¸° ë•Œë¬¸ì— ì‚­ì œí•  수 없습니다."
+
+#: builtin/branch.c:235
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "리모트 ì¶”ì  '%s' 브랜치가 없습니다."
+
+#: builtin/branch.c:236
+#, c-format
+msgid "branch '%s' not found."
+msgstr "'%s' 브랜치가 없습니다."
+
+#: builtin/branch.c:251
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr "리모트 ì¶”ì  '%s' 브랜치를 ì‚­ì œí•˜ëŠ”ë° ì˜¤ë¥˜"
+
+#: builtin/branch.c:252
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr "'%s' 브랜치를 ì‚­ì œí•˜ëŠ”ë° ì˜¤ë¥˜"
+
+#: builtin/branch.c:259
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "리모트 ì¶”ì  '%s' 브랜치를 삭제합니다. (과거 %s)\n"
+
+#: builtin/branch.c:260
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "%s 브랜치 삭제 (과거 %s).\n"
+
+#: builtin/branch.c:303
+#, c-format
+msgid "[%s: gone]"
+msgstr "[%s: 사ë¼ì§]"
+
+#: builtin/branch.c:308
+#, c-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#: builtin/branch.c:313
+#, c-format
+msgid "[%s: behind %d]"
+msgstr "[%s: %d개 뒤]"
+
+#: builtin/branch.c:315
+#, c-format
+msgid "[behind %d]"
+msgstr "[%d개 뒤]"
+
+#: builtin/branch.c:319
+#, c-format
+msgid "[%s: ahead %d]"
+msgstr "[%s: %d개 앞]"
+
+#: builtin/branch.c:321
+#, c-format
+msgid "[ahead %d]"
+msgstr "[%d개 앞]"
+
+#: builtin/branch.c:324
+#, c-format
+msgid "[%s: ahead %d, behind %d]"
+msgstr "[%s: %d개 앞, %d개 뒤]"
+
+#: builtin/branch.c:327
+#, c-format
+msgid "[ahead %d, behind %d]"
+msgstr "[%d개 앞, %d개 뒤]"
+
+#: builtin/branch.c:340
+msgid " **** invalid ref ****"
+msgstr " **** ìž˜ëª»ëœ ë ˆí¼ëŸ°ìŠ¤ ****"
+
+#: builtin/branch.c:366
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(브랜치 ì—†ìŒ, %s 리베ì´ìŠ¤)"
+
+#: builtin/branch.c:369
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(브랜치 ì—†ìŒ, ì´ë“±ë¶„ %sì—ì„œ 시작)"
+
+#: builtin/branch.c:375
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD %s 위치ì—ì„œ 분리ë¨)"
+
+#: builtin/branch.c:378
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD %s(으)로부터 분리ë¨)"
+
+#: builtin/branch.c:382
+msgid "(no branch)"
+msgstr "(브랜치 ì—†ìŒ)"
+
+#: builtin/branch.c:524
+msgid "cannot rename the current branch while not on any."
+msgstr "브랜치 ìœ„ì— ì—†ìœ¼ë©´ì„œ 현재 브랜치 ì´ë¦„ì„ ë°”ê¿€ 수 없습니다."
+
+#: builtin/branch.c:534
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "ìž˜ëª»ëœ ë¸Œëžœì¹˜ ì´ë¦„: '%s'"
+
+#: builtin/branch.c:549
+msgid "Branch rename failed"
+msgstr "브랜치 ì´ë¦„ 바꾸기 실패"
+
+#: builtin/branch.c:553
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "ì´ë¦„ì´ ìž˜ëª»ëœ '%s' ë¸Œëžœì¹˜ì˜ ì´ë¦„ì„ ë‹¤ë¥´ê²Œ 바꿉니다"
+
+#: builtin/branch.c:557
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr "브랜치 ì´ë¦„ì„ %s(으)ë¡œ 바꾸지만, HEAD를 ì—…ë°ì´íŠ¸í•˜ì§€ 않습니다!"
+
+#: builtin/branch.c:564
+msgid "Branch is renamed, but update of config-file failed"
+msgstr "ë¸Œëžœì¹˜ì˜ ì´ë¦„ì„ ë°”ê¾¸ì§€ë§Œ, config-file ì—…ë°ì´íŠ¸ê°€ 실패했습니다"
+
+#: builtin/branch.c:587
+#, c-format
+msgid "could not write branch description template: %s"
+msgstr "브랜치 설명 ì„œì‹ì„ 쓸 수 없습니다: %s"
+
+#: builtin/branch.c:616
+msgid "Generic options"
+msgstr "ì¼ë°˜ 옵션"
+
+# FIXME: give twice?
+#: builtin/branch.c:618
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "해시와 ì œëª©ì„ í‘œì‹œí•˜ê³ , 업스트림 ë¸Œëžœì¹˜ì— ëŒ€í•œ 위치를 표시합니다"
+
+#: builtin/branch.c:619
+msgid "suppress informational messages"
+msgstr "여러가지 안내 메시지를 표시하지 않습니다"
+
+#: builtin/branch.c:620
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "ì¶”ì  ëª¨ë“œë¥¼ 설정합니다 (git-pull(1) 참고)"
+
+#: builtin/branch.c:622
+msgid "change upstream info"
+msgstr "업스트림 정보를 바꿉니다"
+
+#: builtin/branch.c:626
+msgid "use colored output"
+msgstr "여러 색으로 출력합니다"
+
+#: builtin/branch.c:627
+msgid "act on remote-tracking branches"
+msgstr "리모트 ì¶”ì  ë¸Œëžœì¹˜ì— ëŒ€í•´ ë™ìž‘합니다"
+
+#: builtin/branch.c:629 builtin/branch.c:630
+msgid "print only branches that contain the commit"
+msgstr "ì»¤ë°‹ì´ ìžˆëŠ” 브랜치만 표시합니다"
+
+#: builtin/branch.c:633
+msgid "Specific git-branch actions:"
+msgstr "특정 git-branch ë™ìž‘:"
+
+#: builtin/branch.c:634
+msgid "list both remote-tracking and local branches"
+msgstr "리모트와 ë¡œì»¬ì˜ ë¸Œëžœì¹˜ 목ë¡ì„ ëª¨ë‘ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/branch.c:636
+msgid "delete fully merged branch"
+msgstr "완전히 ë³‘í•©ëœ ë¸Œëžœì¹˜ë¥¼ 삭제합니다"
+
+#: builtin/branch.c:637
+msgid "delete branch (even if not merged)"
+msgstr "브랜치를 삭제합니다 (병합ë˜ì§€ 않았ë”ë¼ë„)"
+
+#: builtin/branch.c:638
+msgid "move/rename a branch and its reflog"
+msgstr "브랜치와 ê·¸ reflog를 옮기거나 ì´ë¦„ì„ ë°”ê¿‰ë‹ˆë‹¤"
+
+#: builtin/branch.c:639
+msgid "move/rename a branch, even if target exists"
+msgstr "대ìƒì´ ì´ë¯¸ 있ë”ë¼ë„ 브랜치를 옮기거나 ì´ë¦„ì„ ë°”ê¿‰ë‹ˆë‹¤"
+
+#: builtin/branch.c:640
+msgid "list branch names"
+msgstr "브랜치 ì´ë¦„ 목ë¡ì„ 표시합니다"
+
+#: builtin/branch.c:641
+msgid "create the branch's reflog"
+msgstr "ë¸Œëžœì¹˜ì˜ reflog를 만듭니다"
+
+#: builtin/branch.c:643
+msgid "edit the description for the branch"
+msgstr "ë¸Œëžœì¹˜ì˜ ì„¤ëª…ì„ íŽ¸ì§‘í•©ë‹ˆë‹¤"
+
+#: builtin/branch.c:644
+msgid "force creation, move/rename, deletion"
+msgstr "강제로 만들고, 옮기거나 ì´ë¦„ì„ ë°”ê¾¸ê³ , 삭제합니다"
+
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
+msgstr "병합ë˜ëŠ” 브랜치만 표시합니다"
+
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
+msgstr "병합ë˜ì§€ 않는 브랜치만 표시합니다"
+
+#: builtin/branch.c:647
+msgid "list branches in columns"
+msgstr "목ë¡ì„ 여러 ì—´ë¡œ 표시합니다"
+
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr "키"
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr "정렬한 ê¸°ì¤€ì´ ë˜ëŠ” í•„ë“œ ì´ë¦„"
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr "오브ì íŠ¸"
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr "해당 오브ì íŠ¸ì˜ 브랜치만 표시합니다"
+
+#: builtin/branch.c:670
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "HEAD를 올바른 ë ˆí¼ëŸ°ìŠ¤ë¡œ êµ¬í•´ë‚´ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/branch.c:674 builtin/clone.c:697
+msgid "HEAD not found below refs/heads!"
+msgstr "ë ˆí¼ëŸ°ìŠ¤/헤드 ì•„ëž˜ì— HEADê°€ 없습니다!"
+
+#: builtin/branch.c:694
+msgid "--column and --verbose are incompatible"
+msgstr "--column ë° --verbose ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
+
+#: builtin/branch.c:705 builtin/branch.c:747
+msgid "branch name required"
+msgstr "브랜치 ì´ë¦„ì´ í•„ìš”í•©ë‹ˆë‹¤"
+
+#: builtin/branch.c:723
+msgid "Cannot give description to detached HEAD"
+msgstr "ë¶„ë¦¬ëœ HEADì— ëŒ€í•œ ì„¤ëª…ì„ ë¶€ì—¬í•  수 없습니다"
+
+#: builtin/branch.c:728
+msgid "cannot edit description of more than one branch"
+msgstr "여러 ë¸Œëžœì¹˜ì— ëŒ€í•œ ì„¤ëª…ì„ íŽ¸ì§‘í•  수 없습니다"
+
+#: builtin/branch.c:735
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "ì•„ì§ '%s' ë¸Œëžœì¹˜ì— ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤."
+
+#: builtin/branch.c:738
+#, c-format
+msgid "No branch named '%s'."
+msgstr "ì´ë¦„ì´ '%s'ì¸ ë¸Œëžœì¹˜ê°€ 없습니다."
+
+#: builtin/branch.c:753
+msgid "too many branches for a rename operation"
+msgstr "ì´ë¦„ 바꾸기 ìž‘ì—…ì— ëŒ€í•´ 브랜치가 너무 많습니다"
+
+#: builtin/branch.c:758
+msgid "too many branches to set new upstream"
+msgstr "새 ì—…ìŠ¤íŠ¸ë¦¼ì„ ì„¤ì •í•˜ëŠ”ë° ë¸Œëžœì¹˜ê°€ 너무 많습니다"
+
+#: builtin/branch.c:762
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr "HEADì˜ ì—…ìŠ¤íŠ¸ë¦¼ì„ %s(으)ë¡œ 설정할 수 없습니다. ì–´ë–¤ ë¸Œëžœì¹˜ë„ ê°€ë¦¬í‚¤ì§€ 않습니다."
+
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
+#, c-format
+msgid "no such branch '%s'"
+msgstr "그런 브랜치가 ('%s') 없습니다"
+
+#: builtin/branch.c:769
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "'%s' 브랜치가 없습니다"
+
+#: builtin/branch.c:781
+msgid "too many branches to unset upstream"
+msgstr "업스트림 ì„¤ì •ì„ í•´ì œí•˜ëŠ”ë° ë¸Œëžœì¹˜ê°€ 너무 많습니다"
+
+#: builtin/branch.c:785
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr "HEADì˜ ì—…ìŠ¤íŠ¸ë¦¼ ì„¤ì •ì„ í•´ì œí•  수 없습니다. ì–´ë–¤ ë¸Œëžœì¹˜ë„ ê°€ë¦¬í‚¤ì§€ 않습니다."
+
+#: builtin/branch.c:791
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "'%s' ë¸Œëžœì¹˜ì— ì—…ìŠ¤íŠ¸ë¦¼ ì •ë³´ê°€ 없습니다"
+
+#: builtin/branch.c:805
+msgid "it does not make sense to create 'HEAD' manually"
+msgstr "'HEAD'를 수ë™ìœ¼ë¡œ 만드는 ê±´ 앞뒤가 맞지 않습니다"
+
+#: builtin/branch.c:811
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr "'git branch'ì— ëŒ€í•´ -a ë° -r ì˜µì…˜ì€ ë¸Œëžœì¹˜ ì´ë¦„ê³¼ ê°™ì´ ì“°ë©´ 앞뒤가 맞지 않습니다"
+
+#: builtin/branch.c:814
+#, c-format
+msgid ""
+"The --set-upstream flag is deprecated and will be removed. Consider using --"
+"track or --set-upstream-to\n"
+msgstr "--set-upstream ì˜µì…˜ì€ ë” ì´ìƒ 사용ë˜ì§€ ì•Šê³  ì œê±°ë  ì˜ˆì •ìž…ë‹ˆë‹¤. --track ë˜ëŠ” --set-upstream-to ì˜µì…˜ì„ ì‚¬ìš©í•´ 보십시오\n"
+
+#: builtin/branch.c:831
+#, c-format
+msgid ""
+"\n"
+"If you wanted to make '%s' track '%s', do this:\n"
+"\n"
+msgstr "\n'%s'ì„(를) 만들고 '%s'ì„(를) 추ì í•˜ê²Œ 하려면, 다ìŒì„ 하십시오:\n"
+
+#: builtin/branch.c:832
+#, c-format
+msgid " git branch -d %s\n"
+msgstr " git branch -d %s\n"
+
+#: builtin/branch.c:833
+#, c-format
+msgid " git branch --set-upstream-to %s\n"
+msgstr " git branch --set-upstream-to %s\n"
+
+#: builtin/bundle.c:51
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s ì •ìƒìž…니다\n"
+
+#: builtin/bundle.c:64
+msgid "Need a repository to create a bundle."
+msgstr "ë²ˆë“¤ì„ ë§Œë“œë ¤ë©´ 저장소가 필요합니다."
+
+#: builtin/bundle.c:68
+msgid "Need a repository to unbundle."
+msgstr "ë²ˆë“¤ì„ í•´ì œí•˜ë ¤ë©´ 저장소가 필요합니다."
+
+#: builtin/cat-file.c:428
+msgid ""
+"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
+"<type>|--textconv) <object>"
+msgstr ""
+"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<종류"
+">|--textconv) <오브ì íŠ¸>"
+
+#: builtin/cat-file.c:429
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+
+#: builtin/cat-file.c:466
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<종류>는 ë‹¤ìŒ ì¤‘ 하나가 ë  ìˆ˜ 있습니다: blob, tree, commit, tag"
+
+#: builtin/cat-file.c:467
+msgid "show object type"
+msgstr "오브ì íŠ¸ 종류를 봅니다"
+
+#: builtin/cat-file.c:468
+msgid "show object size"
+msgstr "오브ì íŠ¸ í¬ê¸°ë¥¼ 봅니다"
+
+#: builtin/cat-file.c:470
+msgid "exit with zero when there's no error"
+msgstr "오류가 ì—†ì„ ë•Œ 0ì„ ë¦¬í„´í•˜ê³  ë냅니다"
+
+#: builtin/cat-file.c:471
+msgid "pretty-print object's content"
+msgstr "오브ì íŠ¸ì˜ ë‚´ìš©ì„ ì˜ˆì˜ê²Œ 표시합니다"
+
+#: builtin/cat-file.c:473
+msgid "for blob objects, run textconv on object's content"
+msgstr "블롭 오브ì íŠ¸ì— 대해서는, 오브ì íŠ¸ì˜ ë‚´ìš©ì— ëŒ€í•´ textconv를 실행합니다"
+
+#: builtin/cat-file.c:475
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "-s ë° -t ì˜µì…˜ì´ ì†ìƒëœ 오브ì íŠ¸ì— 대해 ë™ìž‘하ë„ë¡ í—ˆìš©í•©ë‹ˆë‹¤"
+
+#: builtin/cat-file.c:476
+msgid "buffer --batch output"
+msgstr "--batch ì¶œë ¥ì— ëŒ€í•´ 버í¼ë§í•©ë‹ˆë‹¤"
+
+#: builtin/cat-file.c:478
+msgid "show info and content of objects fed from the standard input"
+msgstr "표준 ìž…ë ¥ì—ì„œ ìž…ë ¥ëœ ì˜¤ë¸Œì íŠ¸ì˜ 정보와 ë‚´ìš©ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/cat-file.c:481
+msgid "show info about objects fed from the standard input"
+msgstr "표준 ìž…ë ¥ì—ì„œ ìž…ë ¥ëœ ì˜¤ë¸Œì íŠ¸ì˜ 정보를 표시합니다"
+
+#: builtin/cat-file.c:484
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr "트리 ë‚´ë¶€ì˜ ì‹¬ë³¼ë¦­ ë§í¬ë¥¼ ë”°ë¼ê°‘니다 (--batch ë˜ëŠ” --batch-check와 ê°™ì´ ì‚¬ìš©)"
+
+#: builtin/cat-file.c:486
+msgid "show all objects with --batch or --batch-check"
+msgstr "--batch ë˜ëŠ” --batch-checkì—ì„œ 모든 오브ì íŠ¸ë¥¼ 표시합니다"
+
+#: builtin/check-attr.c:11
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <ì†ì„±>...] [--] <경로ì´ë¦„>..."
+
+#: builtin/check-attr.c:12
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <ì†ì„±>...]"
+
+#: builtin/check-attr.c:19
+msgid "report all attributes set on file"
+msgstr "파ì¼ì— ì„¤ì •ëœ ëª¨ë“  ì†ì„±ì„ 표시합니다"
+
+#: builtin/check-attr.c:20
+msgid "use .gitattributes only from the index"
+msgstr "ì¸ë±ìŠ¤ì—서만 .gitattributes를 사용합니다"
+
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
+msgid "read file names from stdin"
+msgstr "표준 ìž…ë ¥ì—ì„œ íŒŒì¼ ì´ë¦„ì„ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+msgid "terminate input and output records by a NUL character"
+msgstr "NUL 문ìžë¥¼ 기준으로 ìžë£Œ ìž…ë ¥ ë° ì¶œë ¥ì„ ë©ˆì¶¥ë‹ˆë‹¤"
+
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
+msgid "suppress progress reporting"
+msgstr "진행 ìƒí™© 표시를 하지 않습니다"
+
+#: builtin/check-ignore.c:26
+msgid "show non-matching input paths"
+msgstr "ì¼ì¹˜í•˜ì§€ 않는 ìž…ë ¥ 경로를 표시합니다"
+
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
+msgstr "검사할 ë•Œ ì¸ë±ìŠ¤ë¥¼ 무시합니다"
+
+#: builtin/check-ignore.c:154
+msgid "cannot specify pathnames with --stdin"
+msgstr "--stdin으로 경로 ì´ë¦„ì„ ì§€ì •í•  수 없습니다"
+
+#: builtin/check-ignore.c:157
+msgid "-z only makes sense with --stdin"
+msgstr "-z ì˜µì…˜ì€ --stdin 옵션과 ê°™ì´ ì¨ì•¼ë§Œ ì˜ë¯¸ê°€ 있습니다"
+
+#: builtin/check-ignore.c:159
+msgid "no path specified"
+msgstr "경로를 지정하지 않았습니다"
+
+#: builtin/check-ignore.c:163
+msgid "--quiet is only valid with a single pathname"
+msgstr "--quiet ì˜µì…˜ì€ í•˜ë‚˜ì˜ ê²½ë¡œ ì´ë¦„ê³¼ ê°™ì´ ì¨ì•¼ 합니다"
+
+#: builtin/check-ignore.c:165
+msgid "cannot have both --quiet and --verbose"
+msgstr "--quiet ë° --verbose ì˜µì…˜ì„ ê°™ì´ ì“¸ 수 없습니다"
+
+#: builtin/check-ignore.c:168
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching ì˜µì…˜ì€ --verbose 옵션과 ê°™ì´ ì¨ì•¼ 합니다"
+
+#: builtin/check-mailmap.c:8
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<옵션>] <ì—°ë½ì²˜>..."
+
+#: builtin/check-mailmap.c:13
+msgid "also read contacts from stdin"
+msgstr "ë˜ ì—°ë½ì²˜ë¥¼ 표준 ìž…ë ¥ì—ì„œ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/check-mailmap.c:24
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr "ì—°ë½ì²˜ë¥¼ 파싱할 수 없습니다: %s"
+
+#: builtin/check-mailmap.c:47
+msgid "no contacts specified"
+msgstr "ì—°ë½ì²˜ë¥¼ 지정하지 않았습니다"
+
+#: builtin/checkout-index.c:126
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<옵션>] [--] [<파ì¼>...]"
+
+#: builtin/checkout-index.c:188
+msgid "check out all files in the index"
+msgstr "ì¸ë±ìŠ¤ì˜ 모든 파ì¼ì„ 가져옵니다"
+
+#: builtin/checkout-index.c:189
+msgid "force overwrite of existing files"
+msgstr "기존 파ì¼ì„ 강제로 ë®ì–´ ì”니다"
+
+#: builtin/checkout-index.c:191
+msgid "no warning for existing files and files not in index"
+msgstr "기존 파ì¼ê³¼ ì¸ë±ìŠ¤ì— 없는 파ì¼ì— 대해 경고하지 않습니다"
+
+#: builtin/checkout-index.c:193
+msgid "don't checkout new files"
+msgstr "새 파ì¼ì„ 가져오지 않습니다"
+
+#: builtin/checkout-index.c:195
+msgid "update stat information in the index file"
+msgstr "ì¸ë±ìŠ¤ 파ì¼ì˜ stat 정보를 ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤"
+
+#: builtin/checkout-index.c:201
+msgid "read list of paths from the standard input"
+msgstr "표준 ìž…ë ¥ì—ì„œ ê²½ë¡œì˜ ëª©ë¡ì„ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/checkout-index.c:203
+msgid "write the content to temporary files"
+msgstr "ë‚´ìš©ì„ ìž„ì‹œ 파ì¼ì— ì”니다"
+
+#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
+msgid "string"
+msgstr "문ìžì—´"
+
+#: builtin/checkout-index.c:205
+msgid "when creating files, prepend <string>"
+msgstr "파ì¼ì„ 만들 ë•Œ, ì•žì— <문ìžì—´>ì„ ë¶™ìž…ë‹ˆë‹¤"
+
+#: builtin/checkout-index.c:208
+msgid "copy out the files from named stage"
+msgstr "지정한 스테ì´ì§€ì—ì„œ 파ì¼ì„ 복사해 옵니다"
+
+#: builtin/checkout.c:25
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<옵션>] <브랜치>"
+
+#: builtin/checkout.c:26
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<옵션>] [<브랜치>] -- <파ì¼>..."
+
+#: builtin/checkout.c:134 builtin/checkout.c:167
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "'%s' ê²½ë¡œì— ìš°ë¦¬ìª½ ë²„ì „ì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: builtin/checkout.c:136 builtin/checkout.c:169
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "'%s' ê²½ë¡œì— ìƒëŒ€íŽ¸ ë²„ì „ì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: builtin/checkout.c:152
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "'%s' ê²½ë¡œì— í•„ìš”í•œ 모든 ë²„ì „ì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: builtin/checkout.c:196
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "'%s' ê²½ë¡œì— í•„ìš”í•œ ë²„ì „ì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: builtin/checkout.c:213
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "'%s' 경로: 병합할 수 없습니다"
+
+#: builtin/checkout.c:230
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "'%s'ì— ëŒ€í•œ 병합 결과를 추가할 수 없습니다"
+
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' ì˜µì…˜ì€ ì—…ë°ì´íŠ¸í•˜ëŠ” 경로ì—ì„œ 쓸 수 없습니다"
+
+#: builtin/checkout.c:263 builtin/checkout.c:266
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "'%s' ì˜µì…˜ì€ %s 옵션과 ê°™ì´ ì“¸ 수 없습니다"
+
+#: builtin/checkout.c:269
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "경로를 ì—…ë°ì´íŠ¸í•˜ê³  '%s' 브랜치로 전환하는 ì¼ì€ ë™ì‹œì— í•  수 없습니다."
+
+#: builtin/checkout.c:280 builtin/checkout.c:474
+msgid "corrupt index file"
+msgstr "ì†ìƒëœ ì¸ë±ìŠ¤ 파ì¼"
+
+#: builtin/checkout.c:340 builtin/checkout.c:347
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "'%s' 경로를 병합하지 않았습니다"
+
+#: builtin/checkout.c:496
+msgid "you need to resolve your current index first"
+msgstr "현재 ì¸ë±ìŠ¤ë¥¼ 먼저 해결해야 합니다"
+
+#: builtin/checkout.c:623
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "'%s'ì— ëŒ€í•´ reflogí•  수 없습니다: %s\n"
+
+#: builtin/checkout.c:661
+msgid "HEAD is now at"
+msgstr "HEADì˜ í˜„ìž¬ 위치는"
+
+#: builtin/checkout.c:668
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "'%s' 브랜치 리셋\n"
+
+#: builtin/checkout.c:671
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "ì´ë¯¸ '%s'ì— ìžˆìŠµë‹ˆë‹¤\n"
+
+#: builtin/checkout.c:675
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "'%s' 브랜치로 전환하고 리셋합니다\n"
+
+#: builtin/checkout.c:677 builtin/checkout.c:1066
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "새로 만든 '%s' 브랜치로 전환합니다\n"
+
+#: builtin/checkout.c:679
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "'%s' 브랜치로 전환합니다\n"
+
+#: builtin/checkout.c:731
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... 그리고 %dê°œ ë”.\n"
+
+#: builtin/checkout.c:737
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+"경고: 브랜치 ì¤‘ì— ì•„ë¬´ê²ƒì—ë„ ì—°ê²°ë˜ì§€ ì•Šì€ ì»¤ë°‹ì´ ë’¤ì—\n"
+"%d개 있습니다:\n"
+"\n"
+"%s\n"
+
+#: builtin/checkout.c:756
+#, c-format
+msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+"새 브랜치를 만들어서 ì´ ì»¤ë°‹ì„ ì €ìž¥í•˜ê³  싶으면, 지금 다ìŒê³¼\n"
+"ê°™ì´ í•  수 있습니다:\n"
+"\n"
+" git branch <새-브랜치-ì´ë¦„> %s\n"
+"\n"
+
+#: builtin/checkout.c:792
+msgid "internal error in revision walk"
+msgstr "리비전 walkì— ë‚´ë¶€ 오류"
+
+#: builtin/checkout.c:796
+msgid "Previous HEAD position was"
+msgstr "ì´ì „ HEAD 위치는"
+
+#: builtin/checkout.c:823 builtin/checkout.c:1061
+msgid "You are on a branch yet to be born"
+msgstr "현재 위치가 만들 ì˜ˆì •ì¸ ë¸Œëžœì¹˜ì— ìžˆìŠµë‹ˆë‹¤"
+
+#: builtin/checkout.c:968
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "í•˜ë‚˜ì˜ ë ˆí¼ëŸ°ìŠ¤ë§Œ 지정해야 하지만 %d개를 지정했습니다."
+
+#: builtin/checkout.c:1007 builtin/worktree.c:213
+#, c-format
+msgid "invalid reference: %s"
+msgstr "ìž˜ëª»ëœ ë ˆí¼ëŸ°ìŠ¤: %s"
+
+#: builtin/checkout.c:1036
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ê°€ 트리가 아닙니다: %s"
+
+#: builtin/checkout.c:1075
+msgid "paths cannot be used with switching branches"
+msgstr "브랜치를 ì „í™˜í•˜ëŠ”ë° ê²½ë¡œë¥¼ 사용할 수 없습니다"
+
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' ì˜µì…˜ì€ ë¸Œëžœì¹˜ë¥¼ 전환할 ë•Œ 쓸 수 없습니다"
+
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "'%s' ì˜µì…˜ì€ '%s' 옵션과 ê°™ì´ ì“¸ 수 없습니다"
+
+#: builtin/checkout.c:1102
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "브랜치를 ì»¤ë°‹ì´ ì•„ë‹Œ '%s'(으)ë¡œ 전환할 수 없습니다"
+
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
+msgid "branch"
+msgstr "브랜치"
+
+#: builtin/checkout.c:1136
+msgid "create and checkout a new branch"
+msgstr "새 브랜치를 만들고 가져옵니다"
+
+#: builtin/checkout.c:1138
+msgid "create/reset and checkout a branch"
+msgstr "브랜치를 만들거나 리셋하고 가져옵니다"
+
+#: builtin/checkout.c:1139
+msgid "create reflog for new branch"
+msgstr "새 ë¸Œëžœì¹˜ì— ëŒ€í•œ reflog를 만듭니다"
+
+#: builtin/checkout.c:1140
+msgid "detach the HEAD at named commit"
+msgstr "지정한 커밋ì—ì„œ HEAD를 분리합니다"
+
+#: builtin/checkout.c:1141
+msgid "set upstream info for new branch"
+msgstr "새 ë¸Œëžœì¹˜ì— ëŒ€í•œ 업스트림 정보를 설정합니다"
+
+#: builtin/checkout.c:1143
+msgid "new-branch"
+msgstr "새-브랜치"
+
+#: builtin/checkout.c:1143
+msgid "new unparented branch"
+msgstr "ìƒìœ„ 브랜치가 없는 새 브랜치"
+
+#: builtin/checkout.c:1144
+msgid "checkout our version for unmerged files"
+msgstr "병합ë˜ì§€ ì•Šì€ íŒŒì¼ì— 대해 우리쪽 ë²„ì „ì„ ê°€ì ¸ì˜µë‹ˆë‹¤"
+
+#: builtin/checkout.c:1146
+msgid "checkout their version for unmerged files"
+msgstr "병합ë˜ì§€ ì•Šì€ íŒŒì¼ì— 대해 ìƒëŒ€íŽ¸ ë²„ì „ì„ ê°€ì ¸ì˜µë‹ˆë‹¤"
+
+#: builtin/checkout.c:1148
+msgid "force checkout (throw away local modifications)"
+msgstr "강제로 ì²´í¬ì•„웃합니다 (로컬ì—ì„œ 수정한 ì‚¬í•­ì„ ë²„ë¦½ë‹ˆë‹¤)"
+
+#: builtin/checkout.c:1149
+msgid "perform a 3-way merge with the new branch"
+msgstr "새 ë¸Œëžœì¹˜ì— ëŒ€í•´ 3-ë°©í–¥ ë³‘í•©ì„ ìˆ˜í–‰í•©ë‹ˆë‹¤"
+
+#: builtin/checkout.c:1150 builtin/merge.c:227
+msgid "update ignored files (default)"
+msgstr "무시하는 파ì¼ì„ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤ (기본값)"
+
+#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
+msgid "style"
+msgstr "스타ì¼"
+
+#: builtin/checkout.c:1152
+msgid "conflict style (merge or diff3)"
+msgstr "ì¶©ëŒ ìŠ¤íƒ€ì¼ (merge ë˜ëŠ” diff3)"
+
+# FIXME: ì˜ë¯¸ 불명
+#: builtin/checkout.c:1155
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "경로명세를 드문 항목ì—만 제한하지 않습니다"
+
+#: builtin/checkout.c:1157
+msgid "second guess 'git checkout <no-such-branch>'"
+msgstr "'git checkout <없는-브랜치>'ì— ëŒ€í•´ 추측합니다"
+
+#: builtin/checkout.c:1159
+msgid "do not check if another worktree is holding the given ref"
+msgstr "다른 ìž‘ì—…í´ë”ì— ì£¼ì–´ì§„ ë ˆí¼ëŸ°ìŠ¤ê°€ 있는지 확ì¸í•˜ì§€ 않습니다"
+
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr "강제로 진행 ìƒí™©ì„ 표시합니다"
+
+#: builtin/checkout.c:1191
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr "-b, -B ë° --orphan ì˜µì…˜ì€ ì„œë¡œ 호환ë˜ì§€ 않습니다"
+
+#: builtin/checkout.c:1208
+msgid "--track needs a branch name"
+msgstr "--track ì˜µì…˜ì€ ë¸Œëžœì¹˜ ì´ë¦„ì´ í•„ìš”í•©ë‹ˆë‹¤"
+
+#: builtin/checkout.c:1213
+msgid "Missing branch name; try -b"
+msgstr "브랜치 ì´ë¦„ì´ ì—†ìŠµë‹ˆë‹¤. -b ì˜µì…˜ì„ ì‚¬ìš©í•´ 보십시오"
+
+#: builtin/checkout.c:1249
+msgid "invalid path specification"
+msgstr "경로 명세가 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: builtin/checkout.c:1256
+#, c-format
+msgid ""
+"Cannot update paths and switch to branch '%s' at the same time.\n"
+"Did you intend to checkout '%s' which can not be resolved as commit?"
+msgstr ""
+"ë™ì‹œì— 경로를 ì—…ë°ì´íŠ¸í•˜ê³  '%s' 브랜치로 전환할 수 없습니다.\n"
+"ì»¤ë°‹ì„ í™•ì¸í•  수 없는 '%s'ì„(를) 가져오려고 하셨습니까?"
+
+#: builtin/checkout.c:1261
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout: --detach ì˜µì…˜ì€ ê²½ë¡œ ì¸ìžë¥¼ 받지 않습니다 '%s'"
+
+#: builtin/checkout.c:1265
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force ë° --merge ì˜µì…˜ì€ ì¸ë±ìŠ¤ì—ì„œ\n"
+"가져올 경우ì—는 서로 호환ë˜ì§€ 않습니다."
+
+#: builtin/clean.c:25
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <패턴>] [-x | -X] [--] <경로>..."
+
+#: builtin/clean.c:29
+#, c-format
+msgid "Removing %s\n"
+msgstr "%s 제거\n"
+
+#: builtin/clean.c:30
+#, c-format
+msgid "Would remove %s\n"
+msgstr "%s 제거할 예정\n"
+
+#: builtin/clean.c:31
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "%s 저장소 건너뜀\n"
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "%s 저장소 건너뛸 예정\n"
+
+#: builtin/clean.c:33
+#, c-format
+msgid "failed to remove %s"
+msgstr "%s ì œê±°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/clean.c:315
+msgid ""
+"Prompt help:\n"
+"1 - select a numbered item\n"
+"foo - select item based on unique prefix\n"
+" - (empty) select nothing"
+msgstr ""
+"프롬프트 ë„움ë§:\n"
+"1 - 해당 ë²ˆí˜¸ì˜ í•­ëª©ì„ ì„ íƒ\n"
+"foo - 유ì¼í•œ ì ‘ë‘ì–´ì— í•´ë‹¹í•˜ëŠ” 항목 ì„ íƒ\n"
+" - (빈 ìž…ë ¥) ì„ íƒí•˜ì§€ ì•ŠìŒ"
+
+#: builtin/clean.c:319
+msgid ""
+"Prompt help:\n"
+"1 - select a single item\n"
+"3-5 - select a range of items\n"
+"2-3,6-9 - select multiple ranges\n"
+"foo - select item based on unique prefix\n"
+"-... - unselect specified items\n"
+"* - choose all items\n"
+" - (empty) finish selecting"
+msgstr ""
+"프롬프트 ë„움ë§:\n"
+"1 - 해당 ë²ˆí˜¸ì˜ í•­ëª©ì„ ì„ íƒ\n"
+"3-5 - 해당 ë²”ìœ„ì˜ í•­ëª©ì„ ì„ íƒ\n"
+"2-3,6-9 - 여러 ê°œ 범위를 ì„ íƒ\n"
+"foo - 유ì¼í•œ ì ‘ë‘ì–´ì— í•´ë‹¹í•˜ëŠ” 항목 ì„ íƒ\n"
+"-... - 해당 항목 ì„ íƒ í•´ì œ\n"
+"* - 모든 항목 ì„ íƒ\n"
+" - (빈 ìž…ë ¥) ì„ íƒ ë§ˆì¹¨"
+
+#: builtin/clean.c:535
+#, c-format
+msgid "Huh (%s)?"
+msgstr "ì–´ë¼ë¼ (%s)?"
+
+#: builtin/clean.c:677
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "무시할 íŒ¨í„´ì„ ìž…ë ¥í•˜ì‹­ì‹œì˜¤>> "
+
+#: builtin/clean.c:714
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "경고: 다ìŒì— 해당하는 í•­ëª©ì„ ì°¾ì„ ìˆ˜ 없습니다: %s"
+
+#: builtin/clean.c:735
+msgid "Select items to delete"
+msgstr "삭제할 í•­ëª©ì„ ì„ íƒí•˜ì‹­ì‹œì˜¤"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:776
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "%s 제거합니까 [y/N]? "
+
+#: builtin/clean.c:801
+msgid "Bye."
+msgstr "ë."
+
+#: builtin/clean.c:809
+msgid ""
+"clean - start cleaning\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - select items to be deleted by numbers\n"
+"ask each - confirm each deletion (like \"rm -i\")\n"
+"quit - stop cleaning\n"
+"help - this screen\n"
+"? - help for prompt selection"
+msgstr ""
+"clean - 지우기 시작\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - 삭제할 í•­ëª©ì„ ë²ˆí˜¸ë¡œ ì„ íƒ\n"
+"ask each - ì‚­ì œ í•­ëª©ì„ (\"rm -i\" 처럼) 하나하나 확ì¸\n"
+"quit - 지우기 중지\n"
+"help - ì´ í™”ë©´ 표시\n"
+"? - 프롬프트 ì„ íƒ ë„움ë§"
+
+#: builtin/clean.c:836
+msgid "*** Commands ***"
+msgstr "*** 명령 ***"
+
+#: builtin/clean.c:837
+msgid "What now"
+msgstr "ë¬´ì—‡ì„ í• ê¹Œìš”"
+
+#: builtin/clean.c:845
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "ë‹¤ìŒ í•­ëª©ì„ ì œê±°í•  예정입니다:"
+
+#: builtin/clean.c:862
+msgid "No more files to clean, exiting."
+msgstr "지울 파ì¼ì´ ì´ì œ 없으므로 ë냅니다."
+
+#: builtin/clean.c:893
+msgid "do not print names of files removed"
+msgstr "제거할 íŒŒì¼ ì´ë¦„ì„ í‘œì‹œí•˜ì§€ 않습니다"
+
+#: builtin/clean.c:895
+msgid "force"
+msgstr "강제"
+
+#: builtin/clean.c:896
+msgid "interactive cleaning"
+msgstr "대화형 지우기"
+
+#: builtin/clean.c:898
+msgid "remove whole directories"
+msgstr "전체 디렉터리 제거"
+
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
+msgid "pattern"
+msgstr "패턴"
+
+#: builtin/clean.c:900
+msgid "add <pattern> to ignore rules"
+msgstr "ê·œì¹™ì„ ë¬´ì‹œí•˜ë ¤ë©´ <패턴>ì„ ì¶”ê°€í•˜ì‹­ì‹œì˜¤"
+
+#: builtin/clean.c:901
+msgid "remove ignored files, too"
+msgstr "무시한 파ì¼ë„ 제거"
+
+#: builtin/clean.c:903
+msgid "remove only ignored files"
+msgstr "무시한 파ì¼ë§Œ 제거"
+
+#: builtin/clean.c:921
+msgid "-x and -X cannot be used together"
+msgstr "-x ë° -X ì˜µì…˜ì€ ê°™ì´ ì“¸ 수 없습니다"
+
+#: builtin/clean.c:925
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr "clean.requireForceê°€ trueë¡œ 설정ë˜ì—ˆê³  -i, -n, -f 옵션 중 í•˜ë‚˜ë„ ì“°ì§€ 않았습니다. 지우지 않습니다"
+
+#: builtin/clean.c:928
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr "clean.requireForce ê¸°ë³¸ê°’ì´ trueì´ê³  -i, -n, -f 옵션 중 í•˜ë‚˜ë„ ì“°ì§€ 않았습니다. 지우지 않습니다"
+
+#: builtin/clone.c:37
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<옵션>] [--] <저장소> [<디렉터리>]"
+
+#: builtin/clone.c:59
+msgid "don't create a checkout"
+msgstr "ì²´í¬ì•„ì›ƒì„ ë§Œë“¤ì§€ 않습니다"
+
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
+msgid "create a bare repository"
+msgstr "간략한 저장소를 만듭니다"
+
+#: builtin/clone.c:64
+msgid "create a mirror repository (implies bare)"
+msgstr "미러 저장소를 만듭니다 (간략한 저장소로 취급)"
+
+#: builtin/clone.c:66
+msgid "to clone from a local repository"
+msgstr "로컬 저장소ì—ì„œ 복제합니다"
+
+#: builtin/clone.c:68
+msgid "don't use local hardlinks, always copy"
+msgstr "로컬 하드ë§í¬ë¥¼ 사용하지 ì•Šê³ , í•­ìƒ ë³µì‚¬í•©ë‹ˆë‹¤"
+
+#: builtin/clone.c:70
+msgid "setup as shared repository"
+msgstr "공유 저장소로 설정합니다"
+
+#: builtin/clone.c:72 builtin/clone.c:74
+msgid "initialize submodules in the clone"
+msgstr "복제한 결과물ì—ì„œ 하위 ëª¨ë“ˆì„ ì´ˆê¸°í™”í•©ë‹ˆë‹¤"
+
+#: builtin/clone.c:75 builtin/init-db.c:466
+msgid "template-directory"
+msgstr "ì„œì‹-디렉터리"
+
+#: builtin/clone.c:76 builtin/init-db.c:467
+msgid "directory from which templates will be used"
+msgstr "ì„œì‹ì„ 사용할 디렉터리 위치"
+
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
+msgid "reference repository"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ 저장소"
+
+#: builtin/clone.c:80
+msgid "use --reference only while cloning"
+msgstr "복제할 경우ì—만 --reference를 사용합니다"
+
+#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
+msgid "name"
+msgstr "ì´ë¦„"
+
+#: builtin/clone.c:82
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "업스트림 추ì ì— 'origin' 대신 <ì´ë¦„>ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/clone.c:84
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "ë¦¬ëª¨íŠ¸ì˜ HEAD 대신 <브랜치>를 가져옵니다"
+
+#: builtin/clone.c:86
+msgid "path to git-upload-pack on the remote"
+msgstr "ë¦¬ëª¨íŠ¸ì˜ git-upload-pack 경로"
+
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186
+msgid "depth"
+msgstr "깊ì´"
+
+#: builtin/clone.c:88
+msgid "create a shallow clone of that depth"
+msgstr "지정한 깊ì´ì˜ ì–•ì€ ë³µì œë¥¼ 만듭니다"
+
+#: builtin/clone.c:90
+msgid "clone only one branch, HEAD or --branch"
+msgstr "í•˜ë‚˜ì˜ ë¸Œëžœì¹˜ë§Œ 복제합니다 (HEAD ë˜ëŠ” --branchë¡œ 지정)"
+
+#: builtin/clone.c:91 builtin/init-db.c:475
+msgid "gitdir"
+msgstr "gitdir"
+
+#: builtin/clone.c:92 builtin/init-db.c:476
+msgid "separate git dir from working tree"
+msgstr "깃 디렉터리를 ìž‘ì—… í´ë”와 ë³„ê°œì˜ ìœ„ì¹˜ì— ë†“ìŠµë‹ˆë‹¤"
+
+#: builtin/clone.c:93
+msgid "key=value"
+msgstr "키=값"
+
+#: builtin/clone.c:94
+msgid "set config inside the new repository"
+msgstr "새 저장소 안ì—ì„œ 설정합니다"
+
+#: builtin/clone.c:300
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "ë ˆí¼ëŸ°ìŠ¤ '%s' 저장소를 ì—°ê²°ëœ ì²´í¬ì•„웃으로 쓰기는 ì•„ì§ ì§€ì›í•˜ì§€ 않습니다."
+
+#: builtin/clone.c:302
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "ë ˆí¼ëŸ°ìŠ¤ '%s' 저장소가 로컬 저장소가 아닙니다."
+
+#: builtin/clone.c:307
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ '%s' 저장소가 ì–•ì€ ì €ìž¥ì†Œìž…ë‹ˆë‹¤"
+
+#: builtin/clone.c:310
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ '%s' 저장소가 붙어 있는 저장소입니다"
+
+#: builtin/clone.c:375 builtin/diff.c:84
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "'%s'ì— ëŒ€í•´ stat()ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/clone.c:377
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "'%s'ì´(ê°€) 있지만 디렉터리가 아닙니다"
+
+#: builtin/clone.c:391
+#, c-format
+msgid "failed to stat %s\n"
+msgstr "'%s'ì— ëŒ€í•´ stat()ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤\n"
+
+#: builtin/clone.c:413
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "'%s' ë§í¬ë¥¼ ë§Œë“œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/clone.c:417
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "파ì¼ì„ '%s'(으)ë¡œ ë³µì‚¬í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/clone.c:442 builtin/clone.c:626
+#, c-format
+msgid "done.\n"
+msgstr "완료.\n"
+
+#: builtin/clone.c:454
+msgid ""
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry the checkout with 'git checkout -f HEAD'\n"
+msgstr ""
+"복제가 성공했지만, ì²´í¬ì•„ì›ƒì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤.\n"
+"'git status' 명령으로 ë¬´ì—‡ì„ ì²´í¬ì•„웃했는지 살펴볼 수 있고\n"
+"'git checkout -f HEAD'ë¡œ ì²´í¬ì•„ì›ƒì„ ë‹¤ì‹œ í•  수 있습니다\n"
+
+#: builtin/clone.c:531
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "복제할 ë¦¬ëª¨íŠ¸ì˜ %s 브랜치를 ì°¾ì„ ìˆ˜ 없습니다."
+
+#: builtin/clone.c:621
+#, c-format
+msgid "Checking connectivity... "
+msgstr "ì—°ê²°ì„ í™•ì¸í•˜ëŠ” 중입니다..."
+
+#: builtin/clone.c:624
+msgid "remote did not send all necessary objects"
+msgstr "리모트ì—ì„œ 필요한 오브ì íŠ¸ë¥¼ ëª¨ë‘ ë³´ë‚´ì§€ 않았습니다"
+
+#: builtin/clone.c:688
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr "리모트 HEADê°€ 없는 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 참고하므로, ì²´í¬ì•„웃할 수 없습니다.\n"
+
+#: builtin/clone.c:719
+msgid "unable to checkout working tree"
+msgstr "ìž‘ì—… í´ë”를 ì²´í¬ì•„웃할 수 없습니다"
+
+#: builtin/clone.c:808
+msgid "cannot repack to clean up"
+msgstr "정리용으로 repack할 수 없습니다"
+
+#: builtin/clone.c:810
+msgid "cannot unlink temporary alternates file"
+msgstr "ë³´ì¡° ìž„ì‹œ 파ì¼ì„ 삭제할 수 없습니다"
+
+#: builtin/clone.c:842
+msgid "Too many arguments."
+msgstr "너무 ì¸ìžê°€ 많습니다."
+
+#: builtin/clone.c:846
+msgid "You must specify a repository to clone."
+msgstr "복제할 저장소를 지정해야 합니다."
+
+#: builtin/clone.c:857
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "--bare ë° --origin %s ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다."
+
+#: builtin/clone.c:860
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "--bare ë° --separate-git-dir ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다."
+
+#: builtin/clone.c:873
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "'%s' 저장소가 없습니다"
+
+#: builtin/clone.c:879 builtin/fetch.c:1166
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "깊ì´ê°€(%s) 0보다 í° ìˆ˜ê°€ 아닙니다"
+
+#: builtin/clone.c:889
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "ëŒ€ìƒ ê²½ë¡œê°€('%s') ì´ë¯¸ 있고 빈 디렉터리가 아닙니다."
+
+#: builtin/clone.c:899
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "ìž‘ì—… í´ë”ê°€('%s') ì´ë¯¸ 있습니다."
+
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "'%s'ì˜ ì•ž 디렉터리를 만들 수 없습니다"
+
+#: builtin/clone.c:917
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "작업 디렉터리를('%s') 만들 수 없습니다"
+
+#: builtin/clone.c:935
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "간략한 저장소로('%s') 복제합니다...\n"
+
+#: builtin/clone.c:937
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "'%s'ì— ë³µì œí•©ë‹ˆë‹¤...\n"
+
+#: builtin/clone.c:975
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "--depth ì˜µì…˜ì€ ë¡œì»¬ 복제ì—ì„œ 무시ë©ë‹ˆë‹¤. ëŒ€ì‹ ì— 'file://'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤."
+
+#: builtin/clone.c:978
+msgid "source repository is shallow, ignoring --local"
+msgstr "ì›ë³¸ 저장소가 ì–•ì€ ì €ìž¥ì†Œì´ë¯€ë¡œ, --local ì˜µì…˜ì„ ë¬´ì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/clone.c:983
+msgid "--local is ignored"
+msgstr "--local ì˜µì…˜ì€ ë¬´ì‹œë©ë‹ˆë‹¤"
+
+#: builtin/clone.c:987
+#, c-format
+msgid "Don't know how to clone %s"
+msgstr "%sì˜ ë³µì œ ë°©ë²•ì„ ì•Œì§€ 못합니다"
+
+#: builtin/clone.c:1036 builtin/clone.c:1044
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "ë¦¬ëª¨íŠ¸ì˜ %s 브랜치가 업스트림 %sì— ì—†ìŠµë‹ˆë‹¤"
+
+#: builtin/clone.c:1047
+msgid "You appear to have cloned an empty repository."
+msgstr "빈 저장소를 복제한 것처럼 보입니다."
+
+#: builtin/column.c:9
+msgid "git column [<options>]"
+msgstr "git column [<옵션>]"
+
+#: builtin/column.c:26
+msgid "lookup config vars"
+msgstr "설정 변수를 찾아 봅니다"
+
+#: builtin/column.c:27 builtin/column.c:28
+msgid "layout to use"
+msgstr "사용할 배치"
+
+#: builtin/column.c:29
+msgid "Maximum width"
+msgstr "최대 너비"
+
+#: builtin/column.c:30
+msgid "Padding space on left border"
+msgstr "왼쪽 가장ìžë¦¬ì— 채울 공백"
+
+#: builtin/column.c:31
+msgid "Padding space on right border"
+msgstr "오른쪽 가장ìžë¦¬ì— 채울 공백"
+
+#: builtin/column.c:32
+msgid "Padding space between columns"
+msgstr "ì—´ 사ì´ì— 채울 공백"
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr "--command는 첫 번째 ì¸ìžì—¬ì•¼ 합니다"
+
+#: builtin/commit.c:38
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<옵션>] [--] <경로명세>..."
+
+#: builtin/commit.c:43
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<옵션>] [--] <경로명세>..."
+
+#: builtin/commit.c:48
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr ""
+"ì´ë¦„ê³¼ ì „ìžë©”ì¼ ì£¼ì†Œë¥¼ ì‚¬ìš©ìž ì´ë¦„ê³¼ 호스트 ì´ë¦„ì„ ì´ìš©í•´ì„œ ìžë™ìœ¼ë¡œ\n"
+"설정했습니다. ì´ ì •ë³´ê°€ 맞는지 확ì¸í•˜ì‹­ì‹œì˜¤. ì´ ë©”ì‹œì§€ë¥¼ 보지 않으려면 ì •ë³´"
+"를\n"
+"명시ì ìœ¼ë¡œ 설정하십시오. ë‹¤ìŒ ëª…ë ¹ì–´ë¥¼ 실행하고 íŽ¸ì§‘ê¸°ì˜ ì•ˆë‚´ì— ë”°ë¼ ì„¤ì •\n"
+"파ì¼ì„ 편집하십시오:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"ì´ë ‡ê²Œ í•œ 다ìŒ, ì´ ì»¤ë°‹ì— ì‚¬ìš©í•œ ì‹ ì› ì •ë³´ë¥¼ 다ìŒê³¼ ê°™ì´ í•´ì„œ 바꿀 수 있습니"
+"다:\n"
+"\n"
+" git commit --amend --reset-author\n"
+
+#: builtin/commit.c:61
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr ""
+"ì´ë¦„ê³¼ ì „ìžë©”ì¼ ì£¼ì†Œë¥¼ ì‚¬ìš©ìž ì´ë¦„ê³¼ 호스트 ì´ë¦„ì„ ì´ìš©í•´ì„œ\n"
+"ìžë™ìœ¼ë¡œ 설정했습니다. ì´ ì •ë³´ê°€ 맞는지 확ì¸í•˜ì‹­ì‹œì˜¤. ì´ ë©”ì‹œì§€ë¥¼\n"
+"보지 않으려면 정보를 명시ì ìœ¼ë¡œ 설정하십시오:\n"
+"\n"
+" git config --global user.name \"ë‚´ ì´ë¦„\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"ì´ë ‡ê²Œ í•œ 다ìŒ, ì´ ì»¤ë°‹ì— ì‚¬ìš©í•œ ì‹ ì› ì •ë³´ë¥¼ 다ìŒê³¼ ê°™ì´ í•´ì„œ 바꿀 수 있습니"
+"다:\n"
+"\n"
+" git commit --amend --reset-author\n"
+
+#: builtin/commit.c:73
+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 ""
+"ìµœì´ˆì˜ ì»¤ë°‹ì„ ë°”ê¾¸ë ¤ê³  하지만, 그렇게 하면 ì»¤ë°‹ì´ ë¹„ì–´ 있게 ë©ë‹ˆë‹¤.\n"
+"--allow-empty 옵션과 ê°™ì´ ì´ ëª…ë ¹ì„ ë°˜ë³µí•  ìˆ˜ë„ ìžˆê³ , \"git reset HEAD\"\n"
+"명령으로 ì»¤ë°‹ì„ ì™„ì „ížˆ 제거할 ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.\n"
+
+#: builtin/commit.c:78
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+msgstr ""
+"ì´ì „ 커맷 빼오기가 비어 있습니다. ì•„ë§ˆë„ ì¶©ëŒ í•´ê²° 과정ì—ì„œ 그렇게 ëì„\n"
+"것입니다. ê·¸ëž˜ë„ ì»¤ë°‹í•˜ë ¤ë©´ 다ìŒê³¼ ê°™ì´ í•˜ì‹­ì‹œì˜¤:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+
+#: builtin/commit.c:85
+msgid "Otherwise, please use 'git reset'\n"
+msgstr "아니면 'git reset'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤\n"
+
+#: builtin/commit.c:88
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+" git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
+msgstr ""
+"ì´ ì»¤ë°‹ì„ ê±´ë„ˆë›°ë ¤ë©´, 다ìŒì„ 사용하십시오:\n"
+"\n"
+" git reset\n"
+"\n"
+"ê·¸ 다ìŒì— \"git cherry-pick --continue\"를 하면 나머지 커밋ì—\n"
+"대해 커밋 빼오기를 다시 시작합니다.\n"
+
+#: builtin/commit.c:305
+msgid "failed to unpack HEAD tree object"
+msgstr "HEAD 트리 오브ì íŠ¸ì˜ 묶ìŒì„ í‘¸ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/commit.c:346
+msgid "unable to create temporary index"
+msgstr "ìž„ì‹œ ì¸ë±ìŠ¤ë¥¼ 만들 수 없습니다"
+
+#: builtin/commit.c:352
+msgid "interactive add failed"
+msgstr "대화형 추가가 실패했습니다"
+
+#: builtin/commit.c:365
+msgid "unable to update temporary index"
+msgstr "ìž„ì‹œ ì¸ë±ìŠ¤ë¥¼ ì—…ë°ì´íŠ¸í•  수 없습니다"
+
+#: builtin/commit.c:367
+msgid "Failed to update main cache tree"
+msgstr "주요 ìºì‹œ 트리를 ì—…ë°ì´íŠ¸í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+msgid "unable to write new_index file"
+msgstr "new_index 파ì¼ì— 쓸 수 없습니다"
+
+#: builtin/commit.c:445
+msgid "cannot do a partial commit during a merge."
+msgstr "병합하는 중 부분 ì»¤ë°‹ì„ í•  수 없습니다."
+
+#: builtin/commit.c:447
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "커밋 빼오기를 하는 중 부분 ì»¤ë°‹ì„ í•  수 없습니다."
+
+#: builtin/commit.c:456
+msgid "cannot read the index"
+msgstr "ì¸ë±ìŠ¤ë¥¼ ì½ì„ 수 없습니다"
+
+#: builtin/commit.c:475
+msgid "unable to write temporary index file"
+msgstr "ìž„ì‹œ ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다"
+
+#: builtin/commit.c:580
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "'%s' ì»¤ë°‹ì— ìž‘ì„±ìž í—¤ë”ê°€ 없습니다"
+
+#: builtin/commit.c:582
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "'%s' ì»¤ë°‹ì˜ ìž‘ì„±ìž í—¤ë” í˜•ì‹ì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: builtin/commit.c:601
+msgid "malformed --author parameter"
+msgstr "--author 파ë¼ë¯¸í„° 형ì‹ì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: builtin/commit.c:609
+#, c-format
+msgid "invalid date format: %s"
+msgstr "ì‹œê° í˜•ì‹ì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤: %s"
+
+#: builtin/commit.c:653
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+"현재 커밋 메시지ì—ì„œ 사용ë˜ì§€ 않는 ì£¼ì„ ë¬¸ìžë¥¼\n"
+"ì„ íƒí•  수 없습니다"
+
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "%s ì»¤ë°‹ì„ ì°¾ì•„ë³¼ 수 없습니다"
+
+#: builtin/commit.c:702 builtin/shortlog.c:273
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "(표준 ìž…ë ¥ì—ì„œ 로그 메시지를 ì½ìŒ)\n"
+
+#: builtin/commit.c:704
+msgid "could not read log from standard input"
+msgstr "표준 ìž…ë ¥ì—ì„œ 로그 메시지를 ì½ì„ 수 없습니다"
+
+#: builtin/commit.c:708
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "'%s' 로그 파ì¼ì„ ì½ì„ 수 없습니다"
+
+#: builtin/commit.c:730
+msgid "could not read MERGE_MSG"
+msgstr "MERGE_MSG를 ì½ì„ 수 없습니다"
+
+#: builtin/commit.c:734
+msgid "could not read SQUASH_MSG"
+msgstr "SQUASH_MSG를 ì½ì„ 수 없습니다"
+
+#: builtin/commit.c:785
+msgid "could not write commit template"
+msgstr "커밋 ì„œì‹ì„ 쓸 수 없습니다"
+
+#: builtin/commit.c:803
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"ë³‘í•©ì„ ì»¤ë°‹í•˜ë ¤ëŠ” 것으로 보입니다.\n"
+"그렇지 않다면, ë‹¤ìŒ íŒŒì¼ì„ 지우고,\n"
+"\t%s\n"
+"다시 ì‹œë„하십시오.\n"
+
+#: builtin/commit.c:808
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"커밋 빼오기를 커밋하려는 것으로 보입니다.\n"
+"그렇지 않다면, ë‹¤ìŒ íŒŒì¼ì„ 지우고,\n"
+"\t%s\n"
+"다시 ì‹œë„하십시오.\n"
+
+#: builtin/commit.c:821
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"변경 ì‚¬í•­ì— ëŒ€í•œ 커밋 메시지를 입력하십시오. '%c' 문ìžë¡œ 시작하는\n"
+"ì¤„ì€ ë¬´ì‹œë˜ê³ , 메시지를 입력하지 않으면 ì»¤ë°‹ì´ ì¤‘ì§€ë©ë‹ˆë‹¤.\n"
+
+#: builtin/commit.c:828
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"변경 ì‚¬í•­ì— ëŒ€í•œ 커밋 메시지를 입력하십시오. '%c' 문ìžë¡œ 시작하는\n"
+"ì¤„ì€ ë³´ì¡´ë˜ë‹ˆ, 필요하면 ì§ì ‘ 제거하십시오. 메시지를 입력하지\n"
+"않으면 ì»¤ë°‹ì´ ì¤‘ì§€ë©ë‹ˆë‹¤.\n"
+
+#: builtin/commit.c:848
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr "%s작성ìž: %.*s <%.*s>"
+
+#: builtin/commit.c:856
+#, c-format
+msgid "%sDate: %s"
+msgstr "%sì‹œê°: %s"
+
+#: builtin/commit.c:863
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%s커미터: %.*s <%.*s>"
+
+#: builtin/commit.c:881
+msgid "Cannot read index"
+msgstr "ì¸ë±ìŠ¤ë¥¼ ì½ì„ 수 없습니다"
+
+#: builtin/commit.c:938
+msgid "Error building trees"
+msgstr "트리를 ë§Œë“œëŠ”ë° ì˜¤ë¥˜"
+
+#: builtin/commit.c:953 builtin/tag.c:266
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "메시지를 -m ë˜ëŠ” -F 옵션으로 입력하십시오.\n"
+
+#: builtin/commit.c:1055
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+"--author '%s' ì˜µì…˜ì´ 'ì´ë¦„ <ì „ìžë©”ì¼>' 형ì‹ì´ 아니고 기존 작성ìžì—ë„ ì—†ìŠµë‹ˆë‹¤"
+
+#: builtin/commit.c:1070 builtin/commit.c:1310
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "추ì ë˜ì§€ 않는 íŒŒì¼ ëª¨ë“œê°€ ('%s') 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: builtin/commit.c:1107
+msgid "--long and -z are incompatible"
+msgstr "--long ë° -z ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
+
+#: builtin/commit.c:1137
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "--reset-author ë° --author ì˜µì…˜ì„ ëª¨ë‘ ì‚¬ìš©í•˜ë©´ 앞뒤가 맞지 않습니다"
+
+#: builtin/commit.c:1146
+msgid "You have nothing to amend."
+msgstr "바꿀 ì‚¬í•­ì´ ì—†ìŠµë‹ˆë‹¤."
+
+#: builtin/commit.c:1149
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "병합 ì¤‘ì— ìžˆìŠµë‹ˆë‹¤ -- ì»¤ë°‹ì„ ë°”ê¿€ 수 없습니다."
+
+#: builtin/commit.c:1151
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "커밋 빼오기 ì¤‘ì— ìžˆìŠµë‹ˆë‹¤ -- ì»¤ë°‹ì„ ë°”ê¿€ 수 없습니다."
+
+#: builtin/commit.c:1154
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "--squash ë° --fixup ì˜µì…˜ì€ ê°™ì´ ì“¸ 수 없습니다"
+
+#: builtin/commit.c:1164
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr "-c/-C/-F/--fixup 옵션 ì¤‘ì— í•˜ë‚˜ë§Œ 사용할 수 있습니다."
+
+#: builtin/commit.c:1166
+msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+msgstr "-m ì˜µì…˜ì€ -c/-C/-F/--fixup 옵션과 ê°™ì´ ì“¸ 수 없습니다."
+
+#: builtin/commit.c:1174
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr "--reset-author ì˜µì…˜ì€ -C, -c ë˜ëŠ” --amend 옵션과 ê°™ì´ ì¨ì•¼ 합니다."
+
+#: builtin/commit.c:1191
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr ""
+"--include/--only/--all/--interactive/--patch 옵션 중 하나만 사용할 수 있습니"
+"다."
+
+#: builtin/commit.c:1193
+msgid "No paths with --include/--only does not make sense."
+msgstr "경로가 ì—†ì´ --include/--only ì˜µì…˜ì„ ì“°ë©´ 앞뒤가 맞지 않습니다."
+
+#: builtin/commit.c:1195
+msgid "Clever... amending the last one with dirty index."
+msgstr "기발하네요... ë§ˆì§€ë§‰ì„ ë³€ê²½ëœ ì¸ë±ìŠ¤ë¡œ 바꿉니다."
+
+#: builtin/commit.c:1197
+msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+msgstr "-i ë˜ëŠ” -o ì—†ì´ ëª…ì‹œì ì¸ 경로를 지정했습니다. --only 경로를 가정합니다..."
+
+#: builtin/commit.c:1209 builtin/tag.c:475
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "ìž˜ëª»ëœ ì •ë¦¬ 모드 %s"
+
+#: builtin/commit.c:1214
+msgid "Paths with -a does not make sense."
+msgstr "-a 옵션과 경로를 ê°™ì´ ì‚¬ìš©í•˜ë©´ 앞뒤가 맞지 않습니다."
+
+#: builtin/commit.c:1324 builtin/commit.c:1605
+msgid "show status concisely"
+msgstr "ìƒíƒœë¥¼ 간략하게 표시합니다"
+
+#: builtin/commit.c:1326 builtin/commit.c:1607
+msgid "show branch information"
+msgstr "브랜치 정보를 표시합니다"
+
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
+#: builtin/worktree.c:423
+msgid "machine-readable output"
+msgstr "컴퓨터가 ì½ì„ 수 있는 형ì‹"
+
+#: builtin/commit.c:1331 builtin/commit.c:1611
+msgid "show status in long format (default)"
+msgstr "긴 형ì‹ìœ¼ë¡œ ìƒíƒœë¥¼ 표시합니다 (기본값)"
+
+#: builtin/commit.c:1334 builtin/commit.c:1614
+msgid "terminate entries with NUL"
+msgstr "NUL 문ìžë¡œ í•­ëª©ì„ ë냅니다"
+
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
+msgid "mode"
+msgstr "모드"
+
+#: builtin/commit.c:1337 builtin/commit.c:1617
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr "추ì ë˜ì§€ 않는 파ì¼ì„ 표시합니다. 추가 옵션: all, normal, no (기본값: all)"
+
+#: builtin/commit.c:1340
+msgid "show ignored files"
+msgstr "무시ë˜ëŠ” 파ì¼ì„ 표시합니다"
+
+#: builtin/commit.c:1341 parse-options.h:155
+msgid "when"
+msgstr "언제"
+
+#: builtin/commit.c:1342
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr "하위 ëª¨ë“ˆì˜ ë³€ê²½ì„ ë¬´ì‹œí•©ë‹ˆë‹¤. 추가 옵션: all, dirty, untracked. (기본값: all)"
+
+#: builtin/commit.c:1344
+msgid "list untracked files in columns"
+msgstr "추ì ë˜ì§€ 않는 파ì¼ì˜ 목ë¡ì„ 여러 ì—´ë¡œ 표시합니다"
+
+#: builtin/commit.c:1430
+msgid "couldn't look up newly created commit"
+msgstr "새로 만든 ì»¤ë°‹ì„ ì°¾ì•„ë³¼ 수 없습니다"
+
+#: builtin/commit.c:1432
+msgid "could not parse newly created commit"
+msgstr "새로 만든 ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다"
+
+#: builtin/commit.c:1477
+msgid "detached HEAD"
+msgstr "HEAD 분리ë¨"
+
+#: builtin/commit.c:1480
+msgid " (root-commit)"
+msgstr " (최ìƒìœ„-커밋)"
+
+#: builtin/commit.c:1575
+msgid "suppress summary after successful commit"
+msgstr "성공ì ì¸ 커밋 í›„ì— ìš”ì•½ì„ í‘œì‹œí•˜ì§€ 않습니다"
+
+#: builtin/commit.c:1576
+msgid "show diff in commit message template"
+msgstr "커밋 메시지 ì„œì‹ì— diff를 표시합니다"
+
+#: builtin/commit.c:1578
+msgid "Commit message options"
+msgstr "커밋 메시지 옵션"
+
+#: builtin/commit.c:1579 builtin/tag.c:351
+msgid "read message from file"
+msgstr "파ì¼ì—ì„œ 메시지를 ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/commit.c:1580
+msgid "author"
+msgstr "작성ìž"
+
+#: builtin/commit.c:1580
+msgid "override author for commit"
+msgstr "ì»¤ë°‹ì˜ ìž‘ì„±ìžë¥¼ 지정합니다"
+
+#: builtin/commit.c:1581 builtin/gc.c:326
+msgid "date"
+msgstr "ì‹œê°"
+
+#: builtin/commit.c:1581
+msgid "override date for commit"
+msgstr "ì»¤ë°‹ì˜ ì‹œê°ì„ 지정합니다"
+
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
+msgid "message"
+msgstr "메시지"
+
+#: builtin/commit.c:1582
+msgid "commit message"
+msgstr "커밋 메시지"
+
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr "커밋"
+
+#: builtin/commit.c:1583
+msgid "reuse and edit message from specified commit"
+msgstr "지정한 ì»¤ë°‹ì˜ ë©”ì‹œì§€ë¥¼ 재사용하고 편집합니다"
+
+#: builtin/commit.c:1584
+msgid "reuse message from specified commit"
+msgstr "지정한 커밋ì—ì„œ 메시지를 재사용합니다"
+
+#: builtin/commit.c:1585
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr "지정한 ì»¤ë°‹ì„ ìˆ˜ì •í•˜ëŠ”ë° autosquash í˜•ì‹ ë©”ì‹œì§€ë¥¼ 사용합니다"
+
+#: builtin/commit.c:1586
+msgid "use autosquash formatted message to squash specified commit"
+msgstr "지정한 ì»¤ë°‹ì„ í•©ì¹˜ëŠ”ë° autosquash í˜•ì‹ ë©”ì‹œì§€ë¥¼ 사용합니다"
+
+#: builtin/commit.c:1587
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "ì»¤ë°‹ì„ ë‚´ê°€ 작성한 것으로 만듭니다 (-C/-c/--amend와 ê°™ì´ ì‚¬ìš©)"
+
+#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
+msgid "add Signed-off-by:"
+msgstr "Signed-off-by: ì¤„ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
+
+#: builtin/commit.c:1589
+msgid "use specified template file"
+msgstr "지정한 ì„œì‹ íŒŒì¼ì„ 사용합니다"
+
+#: builtin/commit.c:1590
+msgid "force edit of commit"
+msgstr "커밋 íŽ¸ì§‘ì„ ê°•ì œí•©ë‹ˆë‹¤"
+
+#: builtin/commit.c:1591
+msgid "default"
+msgstr "기본값"
+
+#: builtin/commit.c:1591 builtin/tag.c:354
+msgid "how to strip spaces and #comments from message"
+msgstr "메시지ì—ì„œ 공백과 #주ì„ì„ ì§€ì›ë‹ˆë‹¤"
+
+#: builtin/commit.c:1592
+msgid "include status in commit message template"
+msgstr "커밋 메시지 ì„œì‹ì— ìƒíƒœë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
+
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/revert.c:93
+msgid "GPG sign commit"
+msgstr "GPG 서명 커밋"
+
+#: builtin/commit.c:1597
+msgid "Commit contents options"
+msgstr "커밋 내용 옵션"
+
+#: builtin/commit.c:1598
+msgid "commit all changed files"
+msgstr "ë³€ê²½ëœ íŒŒì¼ì„ ëª¨ë‘ ì»¤ë°‹í•©ë‹ˆë‹¤"
+
+#: builtin/commit.c:1599
+msgid "add specified files to index for commit"
+msgstr "지정한 파ì¼ì„ 커밋할 ì¸ë±ìŠ¤ì— 추가합니다"
+
+#: builtin/commit.c:1600
+msgid "interactively add files"
+msgstr "대화형으로 파ì¼ì„ 추가합니다"
+
+#: builtin/commit.c:1601
+msgid "interactively add changes"
+msgstr "대화형으로 변경 ì‚¬í•­ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
+
+#: builtin/commit.c:1602
+msgid "commit only specified files"
+msgstr "지정한 파ì¼ë§Œ 커밋합니다"
+
+#: builtin/commit.c:1603
+msgid "bypass pre-commit hook"
+msgstr "커밋 ì „ 후í¬ë¥¼ 건너ëœë‹ˆë‹¤"
+
+#: builtin/commit.c:1604
+msgid "show what would be committed"
+msgstr "ë¬´ì—‡ì„ ì»¤ë°‹í• ì§€ 표시합니다"
+
+#: builtin/commit.c:1615
+msgid "amend previous commit"
+msgstr "바로 ì•ž ì»¤ë°‹ì„ ë°”ê¿‰ë‹ˆë‹¤"
+
+#: builtin/commit.c:1616
+msgid "bypass post-rewrite hook"
+msgstr "다시쓰기 후 후í¬ë¥¼ 건너ëœë‹ˆë‹¤"
+
+#: builtin/commit.c:1621
+msgid "ok to record an empty change"
+msgstr "빈 변경 ì‚¬í•­ì„ ê¸°ë¡í•˜ë„ë¡ í—ˆìš©í•©ë‹ˆë‹¤"
+
+#: builtin/commit.c:1623
+msgid "ok to record a change with an empty message"
+msgstr "빈 메시지와 ê°™ì´ ë³€ê²½ ì‚¬í•­ì„ ê¸°ë¡í•˜ë„ë¡ í—ˆìš©í•©ë‹ˆë‹¤"
+
+#: builtin/commit.c:1652
+msgid "could not parse HEAD commit"
+msgstr "HEAD ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다"
+
+#: builtin/commit.c:1698
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "ì†ìƒëœ MERGE_HEAD íŒŒì¼ (%s)"
+
+#: builtin/commit.c:1705
+msgid "could not read MERGE_MODE"
+msgstr "MERGE_MODE를 ì½ì„ 수 없습니다"
+
+#: builtin/commit.c:1724
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "커밋 메시지를 ì½ì„ 수 없습니다: %s"
+
+#: builtin/commit.c:1735
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "ì»¤ë°‹ì„ ì¤‘ì§€í•©ë‹ˆë‹¤. 메시지를 편집하지 않았습니다.\n"
+
+#: builtin/commit.c:1740
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "ì»¤ë°‹ì„ ì¤‘ì§€í•©ë‹ˆë‹¤. 커밋 메시지가 비어 있습니다.\n"
+
+#: builtin/commit.c:1788
+msgid ""
+"Repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
+msgstr ""
+"저장소를 ì—…ë°ì´íŠ¸í–ˆìŠµë‹ˆë‹¤. 하지만 new_index 파ì¼ì„ 쓸 수\n"
+"없습니다. 디스í¬ê°€ 꽉 차지 않았고 제한 ìš©ëŸ‰ì„ ë„˜ì–´ê°€ì§€\n"
+"않았는지 확ì¸í•˜ì‹­ì‹œì˜¤. 그리고 'git reset HEAD'ë¡œ 복구하십시오."
+
+#: builtin/config.c:8
+msgid "git config [<options>]"
+msgstr "git config [<옵션>]"
+
+#: builtin/config.c:54
+msgid "Config file location"
+msgstr "설정 íŒŒì¼ ìœ„ì¹˜"
+
+#: builtin/config.c:55
+msgid "use global config file"
+msgstr "공통 설정 파ì¼ì„ 사용합니다"
+
+#: builtin/config.c:56
+msgid "use system config file"
+msgstr "시스템 설정 파ì¼ì„ 사용합니다"
+
+#: builtin/config.c:57
+msgid "use repository config file"
+msgstr "저장소 설정 파ì¼ì„ 사용합니다"
+
+#: builtin/config.c:58
+msgid "use given config file"
+msgstr "지정한 설정 파ì¼ì„ 사용합니다"
+
+#: builtin/config.c:59
+msgid "blob-id"
+msgstr "블롭-id"
+
+#: builtin/config.c:59
+msgid "read config from given blob object"
+msgstr "지정한 블롭 오브ì íŠ¸ì—ì„œ ì„¤ì •ì„ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/config.c:60
+msgid "Action"
+msgstr "ë™ìž‘"
+
+#: builtin/config.c:61
+msgid "get value: name [value-regex]"
+msgstr "ê°’ì„ ê°€ì ¸ì˜µë‹ˆë‹¤: <ì´ë¦„> [<ê°’-ì •ê·œì‹>]"
+
+#: builtin/config.c:62
+msgid "get all values: key [value-regex]"
+msgstr "모든 ê°’ì„ ê°€ì ¸ì˜µë‹ˆë‹¤: <키> [<ê°’-ì •ê·œì‹>]"
+
+#: builtin/config.c:63
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr "ì •ê·œì‹ì— 대한 ê°’ì„ ê°€ì ¸ì˜µë‹ˆë‹¤: <ì´ë¦„-ì •ê·œì‹> [<ê°’-ì •ê·œì‹>]"
+
+#: builtin/config.c:64
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "<URL>ì— íŠ¹ì •ë˜ëŠ” ê°’ì„ ê°€ì ¸ì˜µë‹ˆë‹¤: <섹션>[.<변수>] <URL>"
+
+#: builtin/config.c:65
+msgid "replace all matching variables: name value [value_regex]"
+msgstr "해당하는 변수를 ëª¨ë‘ ì œê±°í•©ë‹ˆë‹¤: <ì´ë¦„> <ê°’> [<ê°’-ì •ê·œì‹>]"
+
+#: builtin/config.c:66
+msgid "add a new variable: name value"
+msgstr "새 변수를 추가합니다: <ì´ë¦„> <ê°’>"
+
+#: builtin/config.c:67
+msgid "remove a variable: name [value-regex]"
+msgstr "변수를 제거합니다: <ì´ë¦„> [<ê°’-ì •ê·œì‹>]"
+
+#: builtin/config.c:68
+msgid "remove all matches: name [value-regex]"
+msgstr "해당하는 í•­ëª©ì„ ëª¨ë‘ ì œê±°í•©ë‹ˆë‹¤: <ì´ë¦„> [<ê°’-ì •ê·œì‹>]"
+
+#: builtin/config.c:69
+msgid "rename section: old-name new-name"
+msgstr "ì„¹ì…˜ì˜ ì´ë¦„ì„ ë°”ê¿‰ë‹ˆë‹¤: <옛-ì´ë¦„> <새-ì´ë¦„>"
+
+#: builtin/config.c:70
+msgid "remove a section: name"
+msgstr "ì„¹ì…˜ì„ ì œê±°í•©ë‹ˆë‹¤: <ì´ë¦„>"
+
+#: builtin/config.c:71
+msgid "list all"
+msgstr "ì „ì²´ 목ë¡ì„ 표시합니다"
+
+#: builtin/config.c:72
+msgid "open an editor"
+msgstr "편집기를 엽니다"
+
+#: builtin/config.c:73
+msgid "find the color configured: slot [default]"
+msgstr "설정한 ìƒ‰ì„ ì°¾ìŠµë‹ˆë‹¤: slot [<기본값>]"
+
+#: builtin/config.c:74
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "색 ì„¤ì •ì„ ì°¾ìŠµë‹ˆë‹¤: slot [<표준출력ì´-TTYì¸ì§€-여부>]"
+
+#: builtin/config.c:75
+msgid "Type"
+msgstr "값 종류"
+
+#: builtin/config.c:76
+msgid "value is \"true\" or \"false\""
+msgstr "ê°’ì´ \"true\" ë˜ëŠ” \"false\"입니다"
+
+#: builtin/config.c:77
+msgid "value is decimal number"
+msgstr "ê°’ì´ ì‹­ì§„ìˆ˜ìž…ë‹ˆë‹¤"
+
+#: builtin/config.c:78
+msgid "value is --bool or --int"
+msgstr "ê°’ì´ --bool ë˜ëŠ” --int입니다"
+
+#: builtin/config.c:79
+msgid "value is a path (file or directory name)"
+msgstr "ê°’ì´ ê²½ë¡œ(íŒŒì¼ ë˜ëŠ” 디렉터리 ì´ë¦„)입니다"
+
+#: builtin/config.c:80
+msgid "Other"
+msgstr "기타"
+
+#: builtin/config.c:81
+msgid "terminate values with NUL byte"
+msgstr "ê°’ì„ NUL ë°”ì´íŠ¸ë¡œ ë냅니다"
+
+#: builtin/config.c:82
+msgid "show variable names only"
+msgstr "변수 ì´ë¦„만 표시합니다"
+
+#: builtin/config.c:83
+msgid "respect include directives on lookup"
+msgstr "찾아볼 때 include 지시어를 고려합니다"
+
+#: builtin/config.c:303
+msgid "unable to parse default color value"
+msgstr "기본 색 ê°’ì„ íŒŒì‹±í•  수 없습니다"
+
+#: builtin/config.c:441
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# ê¹ƒì˜ ì‚¬ìš©ìžë³„ 설정 파ì¼ìž…니다.\n"
+"[user]\n"
+"# ë‹¤ìŒ ì¤„ì„ ì•Œë§žê²Œ 고치고 ì•žì˜ ì£¼ì„ì„ ì œê±°í•˜ì‹­ì‹œì˜¤:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:575
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "%s 설정 파ì¼ì„ 만들 수 없습니다"
+
+#: builtin/count-objects.c:77
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:87
+msgid "print sizes in human readable format"
+msgstr "ì‚¬ëžŒì´ ì½ê¸° ì¢‹ì€ í˜•ì‹ìœ¼ë¡œ í¬ê¸°ë¥¼ 표시합니다"
+
+#: builtin/describe.c:17
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<옵션>] [<커밋-따위>...]"
+
+#: builtin/describe.c:18
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<옵션>] --dirty"
+
+#: builtin/describe.c:217
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "ì£¼ì„ ë‹¬ë¦° %s 태그를 사용할 수 없습니다"
+
+#: builtin/describe.c:221
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr "ì£¼ì„ ë‹¬ë¦° %s íƒœê·¸ì— ë‚´ìž¥ëœ ì´ë¦„ì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: builtin/describe.c:223
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr "'%s' 태그가 실제 여기 '%s'입니다"
+
+#: builtin/describe.c:250 builtin/log.c:459
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "올바른 오브ì íŠ¸ ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤ (%s)"
+
+#: builtin/describe.c:253
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%sì€(는) 올바른 '%s' 오브ì íŠ¸ê°€ 아닙니다"
+
+#: builtin/describe.c:270
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "ì–´ë–¤ íƒœê·¸ë„ '%s'와(ê³¼) 정확히 ì¼ì¹˜í•˜ì§€ 않습니다"
+
+#: builtin/describe.c:272
+#, c-format
+msgid "searching to describe %s\n"
+msgstr "%s ì„¤ëª…ì„ ìœ„í•´ 검색하는 중\n"
+
+#: builtin/describe.c:319
+#, c-format
+msgid "finished search at %s\n"
+msgstr "%sì—ì„œ 검색 마침\n"
+
+#: builtin/describe.c:346
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"ì–´ë–¤ ì£¼ì„ ë‹¬ë¦° íƒœê·¸ë„ '%s'ì„(를) 설명하지 않습니다.\n"
+"하지만 ì£¼ì„ ë‹¬ë¦¬ì§€ ì•Šì€ íƒœê·¸ê°€ 있습니다: --tags ì˜µì…˜ì„ í•´ 보십시오."
+
+#: builtin/describe.c:350
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"ì–´ë–¤ íƒœê·¸ë„ '%s'ì„(를) 설명할 수 없습니다.\n"
+"--always ì˜µì…˜ì„ ì¨ ë³´ê±°ë‚˜, 태그를 만들어 보십시오."
+
+#: builtin/describe.c:371
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "커밋 %lu개를 가로질렀습니다\n"
+
+#: builtin/describe.c:374
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+"태그를 %iê°œ 넘게 찾았습니다. 가장 ìµœê·¼ì˜ %iê°œ 목ë¡ì„\n"
+"표시합니다. %s 위치ì—ì„œ ê²€ìƒ‰ì„ ì¤‘ì§€í•©ë‹ˆë‹¤.\n"
+
+#: builtin/describe.c:396
+msgid "find the tag that comes after the commit"
+msgstr "커밋 다ìŒì— 오는 태그를 찾습니다"
+
+#: builtin/describe.c:397
+msgid "debug search strategy on stderr"
+msgstr "표준 오류ì—ì„œ 검색 ì „ëžµì„ ë””ë²„ê¹…í•©ë‹ˆë‹¤"
+
+#: builtin/describe.c:398
+msgid "use any ref"
+msgstr "모든 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 사용합니다"
+
+#: builtin/describe.c:399
+msgid "use any tag, even unannotated"
+msgstr "모든 태그를, ì£¼ì„ ë‹¬ë¦¬ì§€ ì•Šì€ íƒœê·¸ê¹Œì§€ 사용합니다"
+
+#: builtin/describe.c:400
+msgid "always use long format"
+msgstr "í•­ìƒ ê¸´ 형ì‹ì„ 사용합니다"
+
+#: builtin/describe.c:401
+msgid "only follow first parent"
+msgstr "첫 번째 ì´ì „ 커밋만 ë”°ë¼ê°‘니다"
+
+#: builtin/describe.c:404
+msgid "only output exact matches"
+msgstr "정확히 ì¼ì¹˜í•˜ëŠ” 항목만 출력합니다"
+
+#: builtin/describe.c:406
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "<n>ê°œì˜ ê°€ìž¥ ìµœê·¼ì˜ íƒœê·¸ë§Œ 고려합니다 (기본값: 10)"
+
+#: builtin/describe.c:408
+msgid "only consider tags matching <pattern>"
+msgstr "<패턴>ê³¼ ì¼ì¹˜í•˜ëŠ” 태그만 고려합니다"
+
+#: builtin/describe.c:410 builtin/name-rev.c:314
+msgid "show abbreviated commit object as fallback"
+msgstr "대안으로 요약한 커밋 오브ì íŠ¸ë¥¼ 표시합니다"
+
+#: builtin/describe.c:411
+msgid "mark"
+msgstr "표시"
+
+#: builtin/describe.c:412
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "ë³€ê²½ëœ ìž‘ì—… í´ë”ì— <표시>를 ë’¤ì— ë¶™ìž…ë‹ˆë‹¤ (기본값: \"-dirty\")"
+
+#: builtin/describe.c:430
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long ì˜µì…˜ì€ --abbrev=0 옵션과 호환ë˜ì§€ 않습니다"
+
+#: builtin/describe.c:456
+msgid "No names found, cannot describe anything."
+msgstr "ì´ë¦„ì´ ì—†ìŠµë‹ˆë‹¤. ì•„ë¬´ê²ƒë„ ì„¤ëª…í•  수 없습니다."
+
+#: builtin/describe.c:476
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty ì˜µì…˜ì€ ì»¤ë°‹ê°™ì€ í•­ëª©ê³¼ 호환ë˜ì§€ 않았습니다"
+
+#: builtin/diff.c:86
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s': ì¼ë°˜ 파ì¼ì´ë‚˜ 심볼릭 ë§í¬ê°€ 아닙니다"
+
+#: builtin/diff.c:237
+#, c-format
+msgid "invalid option: %s"
+msgstr "ìž˜ëª»ëœ ì˜µì…˜: %s"
+
+#: builtin/diff.c:358
+msgid "Not a git repository"
+msgstr "깃 저장소가 아닙니다"
+
+#: builtin/diff.c:401
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "ìž˜ëª»ëœ '%s' 오브ì íŠ¸ê°€ 주어졌습니다."
+
+#: builtin/diff.c:410
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "ë‘ ê°œë³´ë‹¤ ë§Žì€ ë¸”ë¡­ì´ ì£¼ì–´ì¡ŒìŠµë‹ˆë‹¤: '%s'"
+
+#: builtin/diff.c:417
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "처리하지 ì•Šì€ '%s' 오브ì íŠ¸ê°€ 주어졌습니다."
+
+#: builtin/fast-export.c:25
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [rev-list-옵션]"
+
+#: builtin/fast-export.c:980
+msgid "show progress after <n> objects"
+msgstr "오브ì íŠ¸ <n>ê°œ ë’¤ì— ì§„í–‰ ìƒí™©ì„ 표시합니다"
+
+#: builtin/fast-export.c:982
+msgid "select handling of signed tags"
+msgstr "서명한 íƒœê·¸ì˜ ì²˜ë¦¬ ë°©ì‹ì„ ì„ íƒí•©ë‹ˆë‹¤"
+
+#: builtin/fast-export.c:985
+msgid "select handling of tags that tag filtered objects"
+msgstr "í•„í„°ë§í•œ 오브ì íŠ¸ì— 대한 íƒœê·¸ì˜ ì²˜ë¦¬ ë°©ì‹ì„ ì„ íƒí•©ë‹ˆë‹¤"
+
+#: builtin/fast-export.c:988
+msgid "Dump marks to this file"
+msgstr "ì´ íŒŒì¼ë¡œ 표시를 내보냅니다"
+
+#: builtin/fast-export.c:990
+msgid "Import marks from this file"
+msgstr "ì´ íŒŒì¼ì—ì„œ 표시를 가져옵니다"
+
+#: builtin/fast-export.c:992
+msgid "Fake a tagger when tags lack one"
+msgstr "íƒœê·¸ì— íƒœê·¸ë¶™ì¸ ì‚¬ëžŒì´ ì—†ì„ ë•Œ 가짜로 만듭니다"
+
+#: builtin/fast-export.c:994
+msgid "Output full tree for each commit"
+msgstr "커밋 마다 전체 트리를 출력합니다"
+
+#: builtin/fast-export.c:996
+msgid "Use the done feature to terminate the stream"
+msgstr "ìŠ¤íŠ¸ë¦¼ì„ ëë‚´ëŠ”ë° ì™„ë£Œ ê¸°ëŠ¥ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/fast-export.c:997
+msgid "Skip output of blob data"
+msgstr "블롭 ë°ì´í„°ì˜ ì¶œë ¥ì„ ê±´ë„ˆëœë‹ˆë‹¤"
+
+#: builtin/fast-export.c:998
+msgid "refspec"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ëª…세"
+
+#: builtin/fast-export.c:999
+msgid "Apply refspec to exported refs"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ëª…세를 내보낸 ë ˆí¼ëŸ°ìŠ¤ì— ì ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/fast-export.c:1000
+msgid "anonymize output"
+msgstr "ì¶œë ¥ì„ ìµëª…화합니다"
+
+#: builtin/fetch.c:20
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<옵션>] [<저장소> [<ë ˆí¼ëŸ°ìŠ¤ëª…세>...]]"
+
+#: builtin/fetch.c:21
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<옵션>] <그룹>"
+
+#: builtin/fetch.c:22
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<옵션>] [(<저장소> | <그룹>)...]"
+
+#: builtin/fetch.c:23
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<옵션>]"
+
+#: builtin/fetch.c:90 builtin/pull.c:162
+msgid "fetch from all remotes"
+msgstr "모든 리모트ì—ì„œ 가져옵니다"
+
+#: builtin/fetch.c:92 builtin/pull.c:165
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "ë®ì–´ì“°ì§€ ë§ê³  .git/FETCH_HEADì— ë§ë¶™ìž…니다"
+
+#: builtin/fetch.c:94 builtin/pull.c:168
+msgid "path to upload pack on remote end"
+msgstr "리모트 ìª½ì— ë¬¶ìŒì„ 업로드할 경로"
+
+#: builtin/fetch.c:95 builtin/pull.c:170
+msgid "force overwrite of local branch"
+msgstr "로컬 브랜치를 강제로 ë®ì–´ì”니다"
+
+#: builtin/fetch.c:97
+msgid "fetch from multiple remotes"
+msgstr "여러 리모트ì—ì„œ 가져옵니다"
+
+#: builtin/fetch.c:99 builtin/pull.c:172
+msgid "fetch all tags and associated objects"
+msgstr "모든 태그와 관련 오브ì íŠ¸ë¥¼ 가져옵니다"
+
+#: builtin/fetch.c:101
+msgid "do not fetch all tags (--no-tags)"
+msgstr "모든 태그를 가져오지 않습니다 (--no-tags)"
+
+#: builtin/fetch.c:103 builtin/pull.c:175
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "ë¦¬ëª¨íŠ¸ì— ì´ì œ 없는 리모트 ì¶”ì  ë¸Œëžœì¹˜ë¥¼ 잘ë¼ëƒ…니다"
+
+#: builtin/fetch.c:104 builtin/pull.c:178
+msgid "on-demand"
+msgstr "주문형"
+
+#: builtin/fetch.c:105 builtin/pull.c:179
+msgid "control recursive fetching of submodules"
+msgstr "하위 모듈 재귀ì ìœ¼ë¡œ 가져오기 ë°©ì‹ì„ 설정합니다"
+
+#: builtin/fetch.c:109 builtin/pull.c:184
+msgid "keep downloaded pack"
+msgstr "다운로드한 묶ìŒì„ 보존합니다"
+
+#: builtin/fetch.c:111
+msgid "allow updating of HEAD ref"
+msgstr "HEAD ë ˆí¼ëŸ°ìŠ¤ ì—…ë°ì´íŠ¸ë¥¼ 허용합니다"
+
+#: builtin/fetch.c:114 builtin/pull.c:187
+msgid "deepen history of shallow clone"
+msgstr "ì–•ì€ ë³µì œì˜ ì»¤ë°‹ ë‚´ì—­ì„ ê¹Šê²Œ 만듭니다"
+
+#: builtin/fetch.c:116 builtin/pull.c:190
+msgid "convert to a complete repository"
+msgstr "완전한 저장소로 전환합니다"
+
+#: builtin/fetch.c:118 builtin/log.c:1233
+msgid "dir"
+msgstr "디렉터리"
+
+#: builtin/fetch.c:119
+msgid "prepend this to submodule path output"
+msgstr "하위 모듈 경로 ì¶œë ¥ì˜ ì•žì— ì´ ë””ë ‰í„°ë¦¬ë¥¼ 붙입니다"
+
+#: builtin/fetch.c:122
+msgid "default mode for recursion"
+msgstr "재귀 기본 모드"
+
+#: builtin/fetch.c:124 builtin/pull.c:193
+msgid "accept refs that update .git/shallow"
+msgstr ".git/shallow를 ì—…ë°ì´íŠ¸í•˜ëŠ” ë ˆí¼ëŸ°ìŠ¤ë¥¼ 허용합니다"
+
+#: builtin/fetch.c:125 builtin/pull.c:195
+msgid "refmap"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ë§µ"
+
+#: builtin/fetch.c:126 builtin/pull.c:196
+msgid "specify fetch refmap"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ë§µ 가져오기를 지정합니다"
+
+#: builtin/fetch.c:378
+msgid "Couldn't find remote ref HEAD"
+msgstr "리모트 ë ˆí¼ëŸ°ìŠ¤ HEAD를 ì°¾ì„ ìˆ˜ 없습니다"
+
+#: builtin/fetch.c:458
+#, c-format
+msgid "object %s not found"
+msgstr "%s 오브ì íŠ¸ê°€ 없습니다"
+
+#: builtin/fetch.c:463
+msgid "[up to date]"
+msgstr "[최신 ìƒíƒœ]"
+
+#: builtin/fetch.c:477
+#, c-format
+msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
+msgstr "! %-*s %-*s -> %s (현재 브랜치ì—ì„œ 가져올 수 ì—†ìŒ)"
+
+#: builtin/fetch.c:478 builtin/fetch.c:566
+msgid "[rejected]"
+msgstr "[거부ë¨]"
+
+#: builtin/fetch.c:489
+msgid "[tag update]"
+msgstr "[태그 ì—…ë°ì´íŠ¸]"
+
+#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
+msgid " (unable to update local ref)"
+msgstr " (로컬 ë ˆí¼ëŸ°ìŠ¤ë¥¼ ì—…ë°ì´íŠ¸í•  수 ì—†ìŒ)"
+
+#: builtin/fetch.c:509
+msgid "[new tag]"
+msgstr "[새로운 태그]"
+
+#: builtin/fetch.c:512
+msgid "[new branch]"
+msgstr "[새로운 브랜치]"
+
+#: builtin/fetch.c:515
+msgid "[new ref]"
+msgstr "[새로운 ë ˆí¼ëŸ°ìŠ¤]"
+
+#: builtin/fetch.c:561
+msgid "unable to update local ref"
+msgstr "로컬 ë ˆí¼ëŸ°ìŠ¤ë¥¼ ì—…ë°ì´íŠ¸í•  수 없습니다"
+
+#: builtin/fetch.c:561
+msgid "forced update"
+msgstr "ê°•ì œ ì—…ë°ì´íŠ¸"
+
+#: builtin/fetch.c:568
+msgid "(non-fast-forward)"
+msgstr "(ì •ë°©í–¥ ì§„í–‰ì´ ì•„ë‹˜)"
+
+#: builtin/fetch.c:602 builtin/fetch.c:843
+#, c-format
+msgid "cannot open %s: %s\n"
+msgstr "%sì„(를) ì—´ 수 없습니다: %s\n"
+
+#: builtin/fetch.c:611
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%sì´(ê°€) 모든 필요한 오브ì íŠ¸ë¥¼ 보내지 않았습니다\n"
+
+#: builtin/fetch.c:629
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr "ì–•ì€ ìµœìƒìœ„ì˜ ì—…ë°ì´íŠ¸ê°€ 허용ë˜ì§€ 않으므로 %sì„(를) 거부합니다"
+
+#: builtin/fetch.c:716 builtin/fetch.c:808
+#, c-format
+msgid "From %.*s\n"
+msgstr "%.*s URLì—ì„œ\n"
+
+#: builtin/fetch.c:727
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"ì—…ë°ì´íŠ¸í•  수 없는 로컬 ë ˆí¼ëŸ°ìŠ¤ê°€ 있습니다. 과거 ì¶©ëŒ ë¸Œëžœì¹˜ë¥¼\n"
+" 제거하려면 'git remote prune %s' ëª…ë ¹ì„ ì‹¤í–‰í•´ 보십시오"
+
+#: builtin/fetch.c:779
+#, c-format
+msgid " (%s will become dangling)"
+msgstr " (%s ë ˆí¼ëŸ°ìŠ¤ê°€ ì—°ê²°ì´ ëŠì–´ì§€ê²Œ ë©ë‹ˆë‹¤)"
+
+#: builtin/fetch.c:780
+#, c-format
+msgid " (%s has become dangling)"
+msgstr " (%s ë ˆí¼ëŸ°ìŠ¤ê°€ ì—°ê²°ì´ ëŠì–´ì¡ŒìŠµë‹ˆë‹¤)"
+
+#: builtin/fetch.c:812
+msgid "[deleted]"
+msgstr "[ì‚­ì œë¨]"
+
+#: builtin/fetch.c:813 builtin/remote.c:1040
+msgid "(none)"
+msgstr "(ì—†ìŒ)"
+
+#: builtin/fetch.c:833
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr "간략한 저장소가 ì•„ë‹Œ ì €ìž¥ì†Œì˜ í˜„ìž¬ %s 브랜치로 가져오기를 거절합니다"
+
+#: builtin/fetch.c:852
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "\"%s\" ì˜µì…˜ì˜ \"%s\" ê°’ì€ %sì— ëŒ€í•´ 올바르지 않습니다"
+
+#: builtin/fetch.c:855
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "\"%s\" ì˜µì…˜ì€ '%s'ì— ëŒ€í•´ 무시ë©ë‹ˆë‹¤\n"
+
+#: builtin/fetch.c:911
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr "'%s'ì—ì„œ 가져오는 ë°©ë²•ì„ ì•Œ 수 없습니다"
+
+#: builtin/fetch.c:1072
+#, c-format
+msgid "Fetching %s\n"
+msgstr "%sì„(를) 가져오는 중\n"
+
+#: builtin/fetch.c:1074 builtin/remote.c:96
+#, c-format
+msgid "Could not fetch %s"
+msgstr "%sì„(를) 가져올 수 없습니다"
+
+#: builtin/fetch.c:1092
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr ""
+"리모트 저장소를 지정하지 않았습니다. 새 ë¦¬ë¹„ì „ì„ ê°€ì ¸ì˜¬ 수 있는\n"
+"URLì´ë‚˜ 리모트 ì´ë¦„ì„ ì§€ì •í•˜ì‹­ì‹œì˜¤."
+
+#: builtin/fetch.c:1115
+msgid "You need to specify a tag name."
+msgstr "태그 ì´ë¦„ì„ ì§€ì •í•´ì•¼ 합니다."
+
+#: builtin/fetch.c:1157
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth ë° --unshallow ì˜µì…˜ì€ ê°™ì´ ì“¸ 수 없습니다"
+
+#: builtin/fetch.c:1159
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "완전한 ì €ìž¥ì†Œì— ëŒ€í•´ --unshallow ì˜µì…˜ì„ ì‚¬ìš©í•˜ëŠ” ê±´ 앞뒤가 맞지 않습니다"
+
+#: builtin/fetch.c:1179
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all ëª…ë ¹ì— ì €ìž¥ì†Œ ì¸ìžê°€ 없습니다"
+
+#: builtin/fetch.c:1181
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all ëª…ë ¹ì€ ë ˆí¼ëŸ°ìŠ¤ëª…세 ì¸ìžì™€ ê°™ì´ ì“°ë©´ 앞뒤가 맞지 않습니다"
+
+#: builtin/fetch.c:1192
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "그런 리모트나 리모트 ê·¸ë£¹ì´ ì—†ìŠµë‹ˆë‹¤: %s"
+
+#: builtin/fetch.c:1200
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "ê·¸ë£¹ì„ ê°€ì ¸ì˜¤ê³  ë ˆí¼ëŸ°ìŠ¤ëª…세를 지정하면 앞뒤가 맞지 않습니다"
+
+#: builtin/fmt-merge-msg.c:14
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+"git fmt-merge-msg [-m <메시지>] [--log[=<n>] | --no-log] [--file <파ì¼>]"
+
+#: builtin/fmt-merge-msg.c:667
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "shortlogì—ì„œ 최대 <n>ê°œ 로그를 표시합니다"
+
+#: builtin/fmt-merge-msg.c:670
+msgid "alias for --log (deprecated)"
+msgstr "--log와 ë™ì¼ (없어질 예정)"
+
+#: builtin/fmt-merge-msg.c:673
+msgid "text"
+msgstr "í…스트"
+
+#: builtin/fmt-merge-msg.c:674
+msgid "use <text> as start of message"
+msgstr "<í…스트>를 시작 메시지로 사용합니다"
+
+#: builtin/fmt-merge-msg.c:675
+msgid "file to read from"
+msgstr "ì½ì–´ë“¤ì¼ 파ì¼"
+
+#: builtin/for-each-ref.c:9
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<옵션>] [<패턴>]"
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <오브ì íŠ¸>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<오브ì íŠ¸>]]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr "git for-each-ref [--contains [<오브ì íŠ¸>]]"
+
+#: builtin/for-each-ref.c:27
+msgid "quote placeholders suitably for shells"
+msgstr "ì…¸ì— ì í•©í•˜ê²Œ 플레ì´ìŠ¤í™€ë”를 ì¸ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/for-each-ref.c:29
+msgid "quote placeholders suitably for perl"
+msgstr "íŽ„ì— ì í•©í•˜ê²Œ 플레ì´ìŠ¤í™€ë”를 ì¸ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/for-each-ref.c:31
+msgid "quote placeholders suitably for python"
+msgstr "파ì´ì¬ì— ì í•©í•˜ê²Œ 플레ì´ìŠ¤í™€ë”를 ì¸ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/for-each-ref.c:33
+msgid "quote placeholders suitably for Tcl"
+msgstr "í‹°í´ì— ì í•©í•˜ê²Œ 플레ì´ìŠ¤í™€ë”를 ì¸ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/for-each-ref.c:36
+msgid "show only <n> matched refs"
+msgstr "<n>ê°œì˜ í•´ë‹¹í•˜ëŠ” ë ˆí¼ëŸ°ìŠ¤ë§Œ 표시합니다"
+
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
+msgid "format to use for the output"
+msgstr "ì¶œë ¥ì— ì‚¬ìš©í•  형ì‹"
+
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
+msgstr "주어진 오브ì íŠ¸ë¥¼ 가리키는 ë ˆí¼ëŸ°ìŠ¤ë§Œ 표시합니다"
+
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr "병합하는 ë ˆí¼ëŸ°ìŠ¤ë§Œ 표시합니다"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr "병합하지 않는 ë ˆí¼ëŸ°ìŠ¤ë§Œ 표시합니다"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr "ì»¤ë°‹ì´ í¬í•¨ëœ ë ˆí¼ëŸ°ìŠ¤ë§Œ 표시합니다"
+
+#: builtin/fsck.c:156 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "ì—°ê²°ì„ í™•ì¸í•˜ëŠ” 중입니다"
+
+#: builtin/fsck.c:486
+msgid "Checking object directories"
+msgstr "오브ì íŠ¸ 디렉터리를 확ì¸í•˜ëŠ” 중입니다"
+
+#: builtin/fsck.c:553
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<옵션>] [<오브ì íŠ¸>...]"
+
+#: builtin/fsck.c:559
+msgid "show unreachable objects"
+msgstr "ì ê·¼í•  수 없는 오브ì íŠ¸ë¥¼ 표시합니다"
+
+#: builtin/fsck.c:560
+msgid "show dangling objects"
+msgstr "ì—°ê²°ì´ ëŠì–´ì§„ 오브ì íŠ¸ë¥¼ 표시합니다"
+
+#: builtin/fsck.c:561
+msgid "report tags"
+msgstr "태그를 알립니다"
+
+#: builtin/fsck.c:562
+msgid "report root nodes"
+msgstr "최ìƒìœ„ 노드를 알립니다"
+
+#: builtin/fsck.c:563
+msgid "make index objects head nodes"
+msgstr "ì¸ë±ìŠ¤ 오브ì íŠ¸ 헤드 노드를 만듭니다"
+
+#: builtin/fsck.c:564
+msgid "make reflogs head nodes (default)"
+msgstr "reflog 헤드 노드를 만듭니다 (기본값)"
+
+#: builtin/fsck.c:565
+msgid "also consider packs and alternate objects"
+msgstr "묶ìŒê³¼ ë³´ì¡° 오브ì íŠ¸ë„ 만듭니다"
+
+#: builtin/fsck.c:566
+msgid "check only connectivity"
+msgstr "연결만 확ì¸í•©ë‹ˆë‹¤"
+
+#: builtin/fsck.c:567
+msgid "enable more strict checking"
+msgstr "ë” ì—„ê²©í•˜ê²Œ 확ì¸í•©ë‹ˆë‹¤"
+
+#: builtin/fsck.c:569
+msgid "write dangling objects in .git/lost-found"
+msgstr ".git/lost-found ì•ˆì— ì—°ê²°ì´ ëŠì–´ì§„ 오브ì íŠ¸ë¥¼ ì”니다"
+
+#: builtin/fsck.c:570 builtin/prune.c:107
+msgid "show progress"
+msgstr "진행 ìƒí™©ì„ 표시합니다"
+
+#: builtin/fsck.c:631
+msgid "Checking objects"
+msgstr "오브ì íŠ¸ë¥¼ 확ì¸í•©ë‹ˆë‹¤"
+
+#: builtin/gc.c:25
+msgid "git gc [<options>]"
+msgstr "git gc [<옵션>]"
+
+#: builtin/gc.c:72
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "ìž˜ëª»ëœ %s: '%s'"
+
+#: builtin/gc.c:139
+#, c-format
+msgid "insanely long object directory %.*s"
+msgstr "비정ìƒì ìœ¼ë¡œ 긴 오브ì íŠ¸ 디렉터리 %.*s"
+
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"마지막 가비지컬렉터ì—ì„œ 다ìŒì„ 알려왔습니다. ì›ì¸ì„ 바로잡ì€\n"
+"ë‹¤ìŒ %s 파ì¼ì„ 제거하십시오.\n"
+"ì´ íŒŒì¼ì„ 제거하기 ì „ì—는 ìžë™ 정리 ìž‘ì—…ì„ ìˆ˜í–‰í•˜ì§€ 않습니다.\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:327
+msgid "prune unreferenced objects"
+msgstr "ë ˆí¼ëŸ°ìŠ¤í•˜ì§€ 않는 오브ì íŠ¸ë¥¼ 잘ë¼ëƒ…니다"
+
+#: builtin/gc.c:329
+msgid "be more thorough (increased runtime)"
+msgstr "ë” ìžì„¸ížˆ 검사합니다 (실행 시간 늘어남)"
+
+#: builtin/gc.c:330
+msgid "enable auto-gc mode"
+msgstr "ìžë™ 가비지컬렉터 모드를 사용합니다"
+
+#: builtin/gc.c:331
+msgid "force running gc even if there may be another gc running"
+msgstr "ì´ë¯¸ 가비지컬렉터가 실행 중ì´ë”ë¼ë„ 강제로 가비지컬렉터를 실행합니다"
+
+#: builtin/gc.c:373
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr "ìµœì  ì„±ëŠ¥ì„ ìœ„í•´ 백그ë¼ìš´ë“œì—ì„œ ìžë™ìœ¼ë¡œ ì €ìž¥ì†Œì˜ ë¬¶ìŒì„ 만듭니다.\n"
+
+#: builtin/gc.c:375
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "ìµœì  ì„±ëŠ¥ì„ ìœ„í•´ ìžë™ìœ¼ë¡œ ì €ìž¥ì†Œì˜ ë¬¶ìŒì„ 만듭니다.\n"
+
+#: builtin/gc.c:376
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "ìˆ˜ë™ ê´€ë¦¬ ìž‘ì—…ì€ \"git help gc\" ë‚´ìš©ì„ ì°¸ê³ í•˜ì‹­ì‹œì˜¤.\n"
+
+#: builtin/gc.c:397
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr "가비지컬렉터가 ì´ë¯¸ '%s' 컴퓨터ì—ì„œ %<PRIuMAX> PIDë¡œ 실행 중입니다 (아니면 --force를 사용하십시오)"
+
+#: builtin/gc.c:441
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr "ëŠìŠ¨í•œ 오브ì íŠ¸ê°€ 너무 많습니다. 제거하려면 'git prune'ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤."
+
+#: builtin/grep.c:23
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<옵션>] [-e] <패턴> [<리비전>...] [[--] <경로>...]"
+
+#: builtin/grep.c:218
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: 스레드를 ë§Œë“œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: %s"
+
+#: builtin/grep.c:441 builtin/grep.c:476
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "트리를 ì½ì„ 수 없습니다 (%s)"
+
+#: builtin/grep.c:491
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "종류가 %sì¸ ì˜¤ë¸Œì íŠ¸ì—ì„œ grepì„ í•  수 없습니다"
+
+#: builtin/grep.c:547
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "`%c' 옵션ì—는 ìˆ«ìž ê°’ì´ ì™€ì•¼ 합니다"
+
+#: builtin/grep.c:564
+#, c-format
+msgid "cannot open '%s'"
+msgstr "'%s'ì„(를) ì—´ 수 없습니다"
+
+#: builtin/grep.c:633
+msgid "search in index instead of in the work tree"
+msgstr "ìž‘ì—… í´ë” ëŒ€ì‹ ì— ì¸ë±ìŠ¤ì—ì„œ 검색합니다"
+
+#: builtin/grep.c:635
+msgid "find in contents not managed by git"
+msgstr "깃으로 관리하지 ì•Šì€ ë‚´ìš©ì—ì„œ 찾습니다"
+
+#: builtin/grep.c:637
+msgid "search in both tracked and untracked files"
+msgstr "추ì ë˜ëŠ” 파ì¼ê³¼ 추ì ë˜ì§€ 않는 íŒŒì¼ ëª¨ë‘ì—ì„œ 검색합니다"
+
+#: builtin/grep.c:639
+msgid "ignore files specified via '.gitignore'"
+msgstr "'.gitignore'ë¡œ 지정한 파ì¼ì„ 무시합니다"
+
+#: builtin/grep.c:642
+msgid "show non-matching lines"
+msgstr "ì¼ì¹˜í•˜ì§€ 않는 ì¤„ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/grep.c:644
+msgid "case insensitive matching"
+msgstr "ëŒ€ì†Œë¬¸ìž êµ¬ë³„í•˜ì§€ ì•Šê³  맞춥니다"
+
+#: builtin/grep.c:646
+msgid "match patterns only at word boundaries"
+msgstr "단어 경계 ë¶€ë¶„ì— ëŒ€í•´ì„œë§Œ íŒ¨í„´ì„ ë§žì¶¥ë‹ˆë‹¤"
+
+#: builtin/grep.c:648
+msgid "process binary files as text"
+msgstr "ë°”ì´ë„ˆë¦¬ 파ì¼ì„ í…스트로 처리합니다"
+
+#: builtin/grep.c:650
+msgid "don't match patterns in binary files"
+msgstr "ë°”ì´ë„ˆë¦¬ 파ì¼ì—ì„œ íŒ¨í„´ì„ ë§žì¶”ì§€ 않습니다"
+
+#: builtin/grep.c:653
+msgid "process binary files with textconv filters"
+msgstr "textconv 필터를 사용해 ë°”ì´ë„ˆë¦¬ 파ì¼ì„ 처리합니다"
+
+#: builtin/grep.c:655
+msgid "descend at most <depth> levels"
+msgstr "최대 <깊ì´> ë‹¨ê³„ë§Œí¼ ë‚´ë ¤ê°‘ë‹ˆë‹¤"
+
+#: builtin/grep.c:659
+msgid "use extended POSIX regular expressions"
+msgstr "POSIX 확장 ì •ê·œì‹ì„ 사용합니다"
+
+#: builtin/grep.c:662
+msgid "use basic POSIX regular expressions (default)"
+msgstr "기본 POSIX ì •ê·œì‹ì„ 사용합니다 (기본값)"
+
+#: builtin/grep.c:665
+msgid "interpret patterns as fixed strings"
+msgstr "íŒ¨í„´ì„ ê³ ì • 문ìžì—´ë¡œ í•´ì„합니다"
+
+#: builtin/grep.c:668
+msgid "use Perl-compatible regular expressions"
+msgstr "펄과 호환ë˜ëŠ” ì •ê·œì‹ì„ 사용합니다"
+
+#: builtin/grep.c:671
+msgid "show line numbers"
+msgstr "줄 번호를 표시합니다"
+
+#: builtin/grep.c:672
+msgid "don't show filenames"
+msgstr "íŒŒì¼ ì´ë¦„ì„ í‘œì‹œí•˜ì§€ 않습니다"
+
+#: builtin/grep.c:673
+msgid "show filenames"
+msgstr "íŒŒì¼ ì´ë¦„ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/grep.c:675
+msgid "show filenames relative to top directory"
+msgstr "íŒŒì¼ ì´ë¦„ì„ ìµœìƒìœ„ 디렉터리 ìƒëŒ€ 경로로 표시합니다"
+
+#: builtin/grep.c:677
+msgid "show only filenames instead of matching lines"
+msgstr "ì¼ì¹˜í•˜ëŠ” ì¤„ì„ í‘œì‹œí•˜ì§€ ì•Šê³  íŒŒì¼ ì´ë¦„만 표시합니다"
+
+#: builtin/grep.c:679
+msgid "synonym for --files-with-matches"
+msgstr "--files-with-matches 옵션과 ë™ì¼"
+
+#: builtin/grep.c:682
+msgid "show only the names of files without match"
+msgstr "ì¼ì¹˜í•˜ì§€ 않는 파ì¼ì˜ ì´ë¦„만 표시합니다"
+
+#: builtin/grep.c:684
+msgid "print NUL after filenames"
+msgstr "íŒŒì¼ ì´ë¦„ 다ìŒì— NULì„ ì¶œë ¥í•©ë‹ˆë‹¤"
+
+#: builtin/grep.c:686
+msgid "show the number of matches instead of matching lines"
+msgstr "ì¼ì¹˜í•˜ëŠ” ì¤„ì„ í‘œì‹œí•˜ì§€ ì•Šê³  ì¼ì¹˜í•˜ëŠ” 수를 표시합니다"
+
+#: builtin/grep.c:687
+msgid "highlight matches"
+msgstr "ì¼ì¹˜í•˜ëŠ” ë¶€ë¶„ì„ ê°•ì¡°í•©ë‹ˆë‹¤"
+
+#: builtin/grep.c:689
+msgid "print empty line between matches from different files"
+msgstr "다른 íŒŒì¼ ì‚¬ì´ì— ì¼ì¹˜í•˜ëŠ” ë¶€ë¶„ì˜ ì‚¬ì´ì— 빈 ì¤„ì„ ì¶œë ¥í•©ë‹ˆë‹¤"
+
+#: builtin/grep.c:691
+msgid "show filename only once above matches from same file"
+msgstr "ê°™ì€ íŒŒì¼ì—ì„œ 여러 개가 ì¼ì¹˜í•˜ë©´ íŒŒì¼ ì´ë¦„ì„ í•œ 번만 표시합니다"
+
+#: builtin/grep.c:694
+msgid "show <n> context lines before and after matches"
+msgstr "ì¼ì¹˜í•˜ëŠ” 부분 ì•žë’¤ì— ì»¨í…스트를 <n>줄 표시합니다"
+
+#: builtin/grep.c:697
+msgid "show <n> context lines before matches"
+msgstr "ì¼ì¹˜í•˜ëŠ” 부분 ì•žì— ì»¨í…스트를 <n>줄 표시합니다"
+
+#: builtin/grep.c:699
+msgid "show <n> context lines after matches"
+msgstr "ì¼ì¹˜í•˜ëŠ” 부분 ë’¤ì— ì»¨í…스트를 <n>줄 표시합니다"
+
+#: builtin/grep.c:700
+msgid "shortcut for -C NUM"
+msgstr "-C NUM ì˜µì…˜ì˜ ì¤„ìž„"
+
+#: builtin/grep.c:703
+msgid "show a line with the function name before matches"
+msgstr "ì¼ì¹˜ 항목 ì•žì— í•¨ìˆ˜ ì´ë¦„ ì¤„ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/grep.c:705
+msgid "show the surrounding function"
+msgstr "들어 있는 함수를 표시합니다"
+
+#: builtin/grep.c:708
+msgid "read patterns from file"
+msgstr "파ì¼ì—ì„œ íŒ¨í„´ì„ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/grep.c:710
+msgid "match <pattern>"
+msgstr "<패턴>ê³¼ ì¼ì¹˜"
+
+#: builtin/grep.c:712
+msgid "combine patterns specified with -e"
+msgstr "-e 옵션으로 지정한 íŒ¨í„´ì„ ê²°í•©í•©ë‹ˆë‹¤"
+
+#: builtin/grep.c:724
+msgid "indicate hit with exit status without output"
+msgstr "출력하지 ì•Šê³  ì¼ì¹˜í•˜ëŠ” í•­ëª©ì„ exit() ìƒíƒœ 번호로 리턴합니다"
+
+#: builtin/grep.c:726
+msgid "show only matches from files that match all patterns"
+msgstr "모든 패턴과 ì¼ì¹˜í•˜ëŠ” 파ì¼ì˜ ì¼ì¹˜í•˜ëŠ” 부분만 표시합니다"
+
+#: builtin/grep.c:728
+msgid "show parse tree for grep expression"
+msgstr "grep 표현ì‹ì— 대한 파싱 트리를 표시합니다"
+
+#: builtin/grep.c:732
+msgid "pager"
+msgstr "페ì´ì €"
+
+#: builtin/grep.c:732
+msgid "show matching files in the pager"
+msgstr "ì¼ì¹˜í•˜ëŠ” 파ì¼ì„ 페ì´ì € 프로그램ì—ì„œ 표시합니다"
+
+#: builtin/grep.c:735
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "grep(1) ì‹¤í–‰ì„ í—ˆìš©í•©ë‹ˆë‹¤ (ì´ ë¹Œë“œì—서는 무시)"
+
+#: builtin/grep.c:793
+msgid "no pattern given."
+msgstr "íŒ¨í„´ì„ ì§€ì •í•˜ì§€ 않았습니다."
+
+#: builtin/grep.c:851
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager ì˜µì…˜ì€ ìž‘ì—… í´ë”ì—서만 ë™ìž‘합니다"
+
+#: builtin/grep.c:877
+msgid "--cached or --untracked cannot be used with --no-index."
+msgstr "--cached ë˜ëŠ” --untracked ì˜µì…˜ì€ --no-index 옵션과 ê°™ì´ ì“¸ 수 없습니다."
+
+#: builtin/grep.c:882
+msgid "--no-index or --untracked cannot be used with revs."
+msgstr "--no-index ë˜ëŠ” --untracked ì˜µì…˜ì€ ë¦¬ë¹„ì „ê³¼ ê°™ì´ ì“¸ 수 없습니다."
+
+#: builtin/grep.c:885
+msgid "--[no-]exclude-standard cannot be used for tracked contents."
+msgstr "--[no-]exclude-standard ì˜µì…˜ì€ ì¶”ì ë˜ëŠ” ë‚´ìš©ì— ëŒ€í•´ 쓸 수 없습니다."
+
+#: builtin/grep.c:893
+msgid "both --cached and trees are given."
+msgstr "--cached 옵션과 트리를 ëª¨ë‘ ì§€ì •í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/hash-object.c:80
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <종류>] [-w] [--path=<파ì¼> | --no-filters] [--stdin] "
+"[--] <파ì¼>..."
+
+#: builtin/hash-object.c:81
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
+
+#: builtin/hash-object.c:92
+msgid "type"
+msgstr "종류"
+
+#: builtin/hash-object.c:92
+msgid "object type"
+msgstr "오브ì íŠ¸ 종류"
+
+#: builtin/hash-object.c:93
+msgid "write the object into the object database"
+msgstr "오브ì íŠ¸ë¥¼ 오브ì íŠ¸ ë°ì´í„°ë² ì´ìŠ¤ë¡œ ì”니다"
+
+#: builtin/hash-object.c:95
+msgid "read the object from stdin"
+msgstr "표준 ìž…ë ¥ì—ì„œ 오브ì íŠ¸ë¥¼ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/hash-object.c:97
+msgid "store file as is without filters"
+msgstr "파ì¼ì„ í•„í„° ì—†ì´ ê·¸ëŒ€ë¡œ 저장합니다"
+
+#: builtin/hash-object.c:98
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr "ìž„ì˜ì˜ 쓰레기 ë°ì´í„°ë¥¼ 해시해 ì†ìƒëœ 오브ì íŠ¸ë¥¼ 만듭니다 (디버깅용)"
+
+#: builtin/hash-object.c:99
+msgid "process file as it were from this path"
+msgstr "파ì¼ì´ ì´ ê²½ë¡œì—ì„œ 온 것처럼 처리합니다"
+
+#: builtin/help.c:41
+msgid "print all available commands"
+msgstr "사용 가능한 모든 ëª…ë ¹ì˜ ëª©ë¡ì„ 표시합니다"
+
+#: builtin/help.c:42
+msgid "print list of useful guides"
+msgstr "유용한 안내서 목ë¡ì„ 표시합니다"
+
+#: builtin/help.c:43
+msgid "show man page"
+msgstr "맨 페ì´ì§€ë¥¼ 표시합니다"
+
+#: builtin/help.c:44
+msgid "show manual in web browser"
+msgstr "웹 브ë¼ìš°ì €ì—ì„œ 설명서를 표시합니다"
+
+#: builtin/help.c:46
+msgid "show info page"
+msgstr "ì¸í¬ 페ì´ì§€ë¥¼ 표시합니다"
+
+#: builtin/help.c:52
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr "git help [--all] [--guides] [--man | --web | --info] [<명령>]"
+
+#: builtin/help.c:64
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "'%s' ë„ì›€ë§ í¬ë§·ì„ ì¸ì‹í•  수 없습니다"
+
+#: builtin/help.c:91
+msgid "Failed to start emacsclient."
+msgstr "emacsclient ì‹œìž‘ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/help.c:104
+msgid "Failed to parse emacsclient version."
+msgstr "emacsclient 버전 íŒŒì‹±ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/help.c:112
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr "emacsclient '%d' ë²„ì „ì€ ë„ˆë¬´ 과거 (< 22) 버전입니다."
+
+#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
+#, c-format
+msgid "failed to exec '%s': %s"
+msgstr "실행 실패: '%s': %s"
+
+#: builtin/help.c:208
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"'%s': 지ì›í•˜ì§€ 않는 맨 페ì´ì§€ 보기 프로그램 경로.\n"
+"ëŒ€ì‹ ì— 'man.<ë„구>.cmd' ì˜µì…˜ì„ ì‚¬ìš©í•´ 보십시오."
+
+#: builtin/help.c:220
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"'%s': 지ì›í•˜ì§€ 않는 맨 페ì´ì§€ 보기 프로그램 명령.\n"
+"ëŒ€ì‹ ì— 'man.<ë„구>.path' ì˜µì…˜ì„ ì‚¬ìš©í•´ 보십시오."
+
+#: builtin/help.c:337
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "'%s': ì•Œ 수 없는 맨 페ì´ì§€ 보기 프로그램."
+
+#: builtin/help.c:354
+msgid "no man viewer handled the request"
+msgstr "ìš”ì²­ì„ ì²˜ë¦¬í•œ 맨 페ì´ì§€ 보기 í”„ë¡œê·¸ëž¨ì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: builtin/help.c:362
+msgid "no info viewer handled the request"
+msgstr "ìš”ì²­ì„ ì²˜ë¦¬í•œ ì¸í¬ 페ì´ì§€ 보기 í”„ë¡œê·¸ëž¨ì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: builtin/help.c:411
+msgid "Defining attributes per path"
+msgstr "경로마다 ì†ì„± ì •ì˜í•˜ê¸°"
+
+#: builtin/help.c:412
+msgid "Everyday Git With 20 Commands Or So"
+msgstr "매ì¼ë§¤ì¼ 사용하는 20ê°œ ë‚´ì™¸ì˜ ê¹ƒ 명령"
+
+#: builtin/help.c:413
+msgid "A Git glossary"
+msgstr "깃 용어 사전"
+
+#: builtin/help.c:414
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "ì˜ë„ì ìœ¼ë¡œ 추ì í•˜ì§€ 않는 파ì¼ì„ 무시하게 지정하기"
+
+#: builtin/help.c:415
+msgid "Defining submodule properties"
+msgstr "하위 모듈 ì†ì„± ì •ì˜í•˜ê¸°"
+
+#: builtin/help.c:416
+msgid "Specifying revisions and ranges for Git"
+msgstr "ê¹ƒì˜ ë¦¬ë¹„ì „ ë° ë²”ìœ„ë¥¼ 지정하기"
+
+#: builtin/help.c:417
+msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+msgstr "깃 ë”°ë¼í•˜ê¸° 안내서 (버전 1.5.1 ì´í›„)"
+
+#: builtin/help.c:418
+msgid "An overview of recommended workflows with Git"
+msgstr "추천하는 깃 활용 ìž‘ì—… ìˆœì„œì˜ ê°œìš”"
+
+#: builtin/help.c:430
+msgid "The common Git guides are:\n"
+msgstr "ìžì£¼ 사용하는 깃 안내서는 다ìŒê³¼ 같습니다:\n"
+
+#: builtin/help.c:451 builtin/help.c:468
+#, c-format
+msgid "usage: %s%s"
+msgstr "사용법: %s%s"
+
+#: builtin/help.c:484
+#, c-format
+msgid "`git %s' is aliased to `%s'"
+msgstr "`git %s' ëª…ë ¹ì€ `%s' ëª…ë ¹ì˜ ë‹¨ì¶•ìž…ë‹ˆë‹¤"
+
+#: builtin/index-pack.c:152
+#, c-format
+msgid "unable to open %s"
+msgstr "%sì„(를) ì—´ 수 없습니다"
+
+#: builtin/index-pack.c:202
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "오브ì íŠ¸ 종류가 맞지 않습니다 (%s)"
+
+#: builtin/index-pack.c:222
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "예ìƒí•œ %s 오브ì íŠ¸ë¥¼ 받지 않았습니다"
+
+#: builtin/index-pack.c:225
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "%s 오브ì íŠ¸: 예ìƒí•œ 종류 %s, 실제 %s"
+
+#: builtin/index-pack.c:267
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "%d ë°”ì´íŠ¸ë¥¼ 채울 수 없습니다"
+
+#: builtin/index-pack.c:277
+msgid "early EOF"
+msgstr "너무 빨리 파ì¼ì´ ë남"
+
+#: builtin/index-pack.c:278
+msgid "read error on input"
+msgstr "ìž…ë ¥ì— ì½ê¸° 오류"
+
+#: builtin/index-pack.c:290
+msgid "used more bytes than were available"
+msgstr "있는 ë°”ì´íŠ¸ë³´ë‹¤ ë” ë§Žì´ ì‚¬ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/index-pack.c:297
+msgid "pack too large for current definition of off_t"
+msgstr "현재 ì •ì˜ëœ off_tì— ë¹„í•´ 묶ìŒì´ 너무 í½ë‹ˆë‹¤"
+
+#: builtin/index-pack.c:313
+#, c-format
+msgid "unable to create '%s'"
+msgstr "'%s'ì„(를) 만들 수 없습니다"
+
+#: builtin/index-pack.c:318
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr "'%s' ë¬¶ìŒ íŒŒì¼ì„ ì—´ 수 없습니다"
+
+#: builtin/index-pack.c:332
+msgid "pack signature mismatch"
+msgstr "ë¬¶ìŒ ì„œëª…ì´ ë§žì§€ 않습니다"
+
+#: builtin/index-pack.c:334
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "묶ìŒì˜ %<PRIu32> ë²„ì „ì„ ì§€ì›í•˜ì§€ 않습니다"
+
+#: builtin/index-pack.c:352
+#, c-format
+msgid "pack has bad object at offset %lu: %s"
+msgstr "묶ìŒì˜ %lu ì˜¤í”„ì…‹ì— ìž˜ëª»ëœ ì˜¤ë¸Œì íŠ¸ê°€ 있습니다: %s"
+
+#: builtin/index-pack.c:473
+#, c-format
+msgid "inflate returned %d"
+msgstr "inflateê°€ %dë²ˆì„ ë¦¬í„´í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/index-pack.c:522
+msgid "offset value overflow for delta base object"
+msgstr "ë¸íƒ€ ë² ì´ìŠ¤ 오브ì íŠ¸ì— 대해 오프셋 ê°’ì´ ì˜¤ë²„í”Œë¡œìš°"
+
+#: builtin/index-pack.c:530
+msgid "delta base offset is out of bound"
+msgstr "ë¸íƒ€ ë² ì´ìŠ¤ ì˜¤í”„ì…‹ì´ ë²”ìœ„ë¥¼ 벗어났습니다"
+
+#: builtin/index-pack.c:538
+#, c-format
+msgid "unknown object type %d"
+msgstr "ì•Œ 수 없는 오브ì íŠ¸ 종류 %d번"
+
+#: builtin/index-pack.c:569
+msgid "cannot pread pack file"
+msgstr "ë¬¶ìŒ íŒŒì¼ì— 대해 pread를 í•  수 없습니다"
+
+#: builtin/index-pack.c:571
+#, c-format
+msgid "premature end of pack file, %lu byte missing"
+msgid_plural "premature end of pack file, %lu bytes missing"
+msgstr[0] "ë¬¶ìŒ íŒŒì¼ì´ 너무 ì¼ì° ë남. %lu ë°”ì´íŠ¸ 부족"
+
+#: builtin/index-pack.c:597
+msgid "serious inflate inconsistency"
+msgstr "심ê°í•œ inflate 부조화"
+
+#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
+#: builtin/index-pack.c:806 builtin/index-pack.c:815
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr "SHA1 충ëŒì´ %sì—ì„œ 발견ë˜ì—ˆìŠµë‹ˆë‹¤!"
+
+#: builtin/index-pack.c:746 builtin/pack-objects.c:162
+#: builtin/pack-objects.c:254
+#, c-format
+msgid "unable to read %s"
+msgstr "%sì„(를) ì½ì„ 수 없습니다"
+
+#: builtin/index-pack.c:812
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "기존 %s 오브ì íŠ¸ë¥¼ ì½ì„ 수 없습니다"
+
+#: builtin/index-pack.c:826
+#, c-format
+msgid "invalid blob object %s"
+msgstr "ìž˜ëª»ëœ ë¸”ë¡­ 오브ì íŠ¸ %s"
+
+#: builtin/index-pack.c:840
+#, c-format
+msgid "invalid %s"
+msgstr "ìž˜ëª»ëœ %s"
+
+#: builtin/index-pack.c:843
+msgid "Error in object"
+msgstr "오브ì íŠ¸ì— 오류"
+
+#: builtin/index-pack.c:845
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "%sì˜ ëª¨ë“  하위 오브ì íŠ¸ì— 접근할 수 없습니다"
+
+#: builtin/index-pack.c:917 builtin/index-pack.c:948
+msgid "failed to apply delta"
+msgstr "ë¸íƒ€ë¥¼ ì ìš©í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/index-pack.c:1118
+msgid "Receiving objects"
+msgstr "오브ì íŠ¸ë¥¼ 받는 중"
+
+#: builtin/index-pack.c:1118
+msgid "Indexing objects"
+msgstr "오브ì íŠ¸ ì¸ë±ìŠ¤ë¥¼ 만드는 중"
+
+#: builtin/index-pack.c:1150
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "묶ìŒì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤ (SHA1 ì¼ì¹˜í•˜ì§€ ì•ŠìŒ)"
+
+#: builtin/index-pack.c:1155
+msgid "cannot fstat packfile"
+msgstr "ë¬¶ìŒ íŒŒì¼ì— 대해 fstat()í•  수 없습니다"
+
+#: builtin/index-pack.c:1158
+msgid "pack has junk at the end"
+msgstr "묶ìŒì˜ ëì— ì“°ë ˆê¸° ë°ì´í„°ê°€ 있습니다"
+
+#: builtin/index-pack.c:1169
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "parse_pack_objects()ì—ì„œ 극심한 혼란"
+
+#: builtin/index-pack.c:1194
+msgid "Resolving deltas"
+msgstr "ë¸íƒ€ë¥¼ 알아내는 중"
+
+#: builtin/index-pack.c:1205
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "스레드를 만들 수 없습니다: %s"
+
+#: builtin/index-pack.c:1247
+msgid "confusion beyond insanity"
+msgstr "극심한 혼란"
+
+#: builtin/index-pack.c:1253
+#, c-format
+msgid "completed with %d local objects"
+msgstr "로컬 오브ì íŠ¸ %dê°œ 마침"
+
+#: builtin/index-pack.c:1263
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "%sì— ëŒ€í•´ 예ìƒì¹˜ 못한 í…Œì¼ ì²´í¬ì„¬ (ë””ìŠ¤í¬ ì†ìƒ?)"
+
+#: builtin/index-pack.c:1267
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] "묶ìŒì— 알아내지 못한 ë¸íƒ€ %d개가 있습니다"
+
+#: builtin/index-pack.c:1291
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "추가한 오브ì íŠ¸ë¥¼ deflateí•  수 없습니다 (%d)"
+
+#: builtin/index-pack.c:1367
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "%s 로컬 오브ì íŠ¸ê°€ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: builtin/index-pack.c:1391
+msgid "error while closing pack file"
+msgstr "ë¬¶ìŒ íŒŒì¼ì„ ë‹«ëŠ”ë° ì˜¤ë¥˜"
+
+#: builtin/index-pack.c:1404
+#, c-format
+msgid "cannot write keep file '%s'"
+msgstr "'%s' ë³´ì¡´ 파ì¼ì„ 쓸 수 없습니다"
+
+#: builtin/index-pack.c:1412
+#, c-format
+msgid "cannot close written keep file '%s'"
+msgstr "ì“´ '%s' ë³´ì¡´ 파ì¼ì„ 닫지 못했습니다"
+
+#: builtin/index-pack.c:1425
+msgid "cannot store pack file"
+msgstr "ë¬¶ìŒ íŒŒì¼ì„ 저장할 수 없습니다"
+
+#: builtin/index-pack.c:1436
+msgid "cannot store index file"
+msgstr "ì¸ë±ìŠ¤ 파ì¼ì„ 저장할 수 없습니다"
+
+#: builtin/index-pack.c:1469
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "ìž˜ëª»ëœ pack.indexversion=%<PRIu32>"
+
+#: builtin/index-pack.c:1475
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "ìž˜ëª»ëœ ìŠ¤ë ˆë“œ 수를 지정했습니다 (%d)"
+
+#: builtin/index-pack.c:1479 builtin/index-pack.c:1663
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "스레드 ê¸°ëŠ¥ì´ ì—†ìŠµë‹ˆë‹¤. %s 무시"
+
+#: builtin/index-pack.c:1537
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "기존 '%s' ë¬¶ìŒ íŒŒì¼ì„ ì—´ 수 없습니다"
+
+#: builtin/index-pack.c:1539
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "'%s'ì— ëŒ€í•œ 기존 ë¬¶ìŒ idx 파ì¼ì„ ì—´ 수 없습니다"
+
+#: builtin/index-pack.c:1586
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "ë¸íƒ€ 아님: 오브ì íŠ¸ %dê°œ"
+
+#: builtin/index-pack.c:1593
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] "ì²´ì¸ ê¸¸ì´ = %d: 오브ì íŠ¸ %luê°œ"
+
+#: builtin/index-pack.c:1623
+msgid "Cannot come back to cwd"
+msgstr "현재 디렉터리로 ëŒì•„올 수 없습니다"
+
+#: builtin/index-pack.c:1675 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1694
+#, c-format
+msgid "bad %s"
+msgstr "ìž˜ëª»ëœ %s"
+
+#: builtin/index-pack.c:1708
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin ì˜µì…˜ì€ --stdin 옵션과 ê°™ì´ ì“¸ 수 없습니다"
+
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1721
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "'%s' 묶ìŒíŒŒì¼ ì´ë¦„ì´ '.pack'으로 ë나지 않습니다"
+
+#: builtin/index-pack.c:1729
+msgid "--verify with no packfile name given"
+msgstr "--verify ì˜µì…˜ì— ë¬¶ìŒíŒŒì¼ ì´ë¦„ì„ ì§€ì •í•˜ì§€ 않았습니다"
+
+#: builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "'%s'ì„(를) stat()í•  수 없습니다"
+
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "'%s' ì„œì‹ì„ stat()í•  수 없습니다"
+
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "'%s'ì„(를) opendir()í•  수 없습니다"
+
+#: builtin/init-db.c:77
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "'%s'ì„(를) readlink()í•  수 없습니다"
+
+#: builtin/init-db.c:79
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "'%s'ì„(를) '%s'ì— symlink()í•  수 없습니다"
+
+#: builtin/init-db.c:85
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "'%s'ì„(를) '%s'ì— ë³µì‚¬í•  수 없습니다"
+
+#: builtin/init-db.c:89
+#, c-format
+msgid "ignoring template %s"
+msgstr "%s ì„œì‹ì„ 무시합니다"
+
+#: builtin/init-db.c:118
+#, c-format
+msgid "templates not found %s"
+msgstr "%sì— ì„œì‹ì´ 없습니다"
+
+#: builtin/init-db.c:131
+#, c-format
+msgid "not copying templates of a wrong format version %d from '%s'"
+msgstr "'%2$s'ì—ì„œ ìž˜ëª»ëœ í˜•ì‹ ë²„ì „ %1$dì˜ ì„œì‹ì„ 복사하지 않습니다"
+
+#: builtin/init-db.c:309 builtin/init-db.c:312
+#, c-format
+msgid "%s already exists"
+msgstr "%s 파ì¼ì´ ì´ë¯¸ 있습니다"
+
+#: builtin/init-db.c:340
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "íŒŒì¼ ì¢…ë¥˜ %dë²ˆì„ ì²˜ë¦¬í•  수 없습니다"
+
+#: builtin/init-db.c:343
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "%sì„(를) %s(으)ë¡œ 옮길 수 없습니다"
+
+#. TRANSLATORS: The first '%s' is either "Reinitialized
+#. existing" or "Initialized empty", the second " shared" or
+#. "", and the last '%s%s' is the verbatim directory name.
+#: builtin/init-db.c:399
+#, c-format
+msgid "%s%s Git repository in %s%s\n"
+msgstr "%s%s 깃 저장소, 위치 %s%s\n"
+
+#: builtin/init-db.c:400
+msgid "Reinitialized existing"
+msgstr "다시 초기화: 기존"
+
+#: builtin/init-db.c:400
+msgid "Initialized empty"
+msgstr "초기화: 빈"
+
+#: builtin/init-db.c:401
+msgid " shared"
+msgstr " 공유"
+
+#: builtin/init-db.c:448
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<ì„œì‹-디렉터리>] [--shared[=<권"
+"한>]] [<디렉터리>]"
+
+#: builtin/init-db.c:471
+msgid "permissions"
+msgstr "권한"
+
+#: builtin/init-db.c:472
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr "깃 저장소를 다른 사용ìžê°€ 공유할 수 있게 지정"
+
+#: builtin/init-db.c:506 builtin/init-db.c:511
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "%sì— ëŒ€í•´ mkdir를 í•  수 없습니다"
+
+#: builtin/init-db.c:515
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "%sì— ëŒ€í•´ chdir를 í•  수 없습니다"
+
+#: builtin/init-db.c:536
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (ë˜ëŠ” --work-tree=<디렉터리>) 허용ë˜ì§€ ì•ŠìŒ. %s (ë˜ëŠ” --git-"
+"dir=<directory>) ì§€ì •ì´ ì—†ìœ¼ë©´"
+
+#: builtin/init-db.c:564
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "ìž‘ì—… í´ë” '%s'ì— ì ‘ê·¼í•  수 없습니다"
+
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
+"[<file>...]"
+msgstr ""
+"git interpret-trailers [--trim-empty] [(--trailer <토í°>[(=|:)<ê°’>])...] [<파"
+"ì¼>...]"
+
+#: builtin/interpret-trailers.c:25
+msgid "trim empty trailers"
+msgstr "빈 트레ì¼ëŸ¬ë¥¼ 잘ë¼ëƒ…니다"
+
+#: builtin/interpret-trailers.c:26
+msgid "trailer"
+msgstr "트레ì¼ëŸ¬"
+
+#: builtin/interpret-trailers.c:27
+msgid "trailer(s) to add"
+msgstr "추가할 트레ì¼ëŸ¬"
+
+#: builtin/log.c:43
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<옵션>] [<리비전-범위>] [[--] <경로>...]"
+
+#: builtin/log.c:44
+msgid "git show [<options>] <object>..."
+msgstr "git show [<옵션>] <오브ì íŠ¸>..."
+
+#: builtin/log.c:83
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "ìž˜ëª»ëœ --decorate 옵션: %s"
+
+#: builtin/log.c:131
+msgid "suppress diff output"
+msgstr "diff를 출력하지 않습니다"
+
+#: builtin/log.c:132
+msgid "show source"
+msgstr "소스를 표시합니다"
+
+#: builtin/log.c:133
+msgid "Use mail map file"
+msgstr "ë©”ì¼ ë§µ 파ì¼ì„ 사용합니다"
+
+#: builtin/log.c:134
+msgid "decorate options"
+msgstr "꾸미기 옵션"
+
+#: builtin/log.c:137
+msgid "Process line range n,m in file, counting from 1"
+msgstr "파ì¼ì—ì„œ n,m ë²”ìœ„ì˜ ì¤„ì„ ì²˜ë¦¬í•©ë‹ˆë‹¤ (1부터 시작)"
+
+#: builtin/log.c:233
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "최종 출력: %d %s\n"
+
+#: builtin/log.c:465
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: ìž˜ëª»ëœ íŒŒì¼"
+
+#: builtin/log.c:479 builtin/log.c:572
+#, c-format
+msgid "Could not read object %s"
+msgstr "%s 오브ì íŠ¸ë¥¼ ì½ì„ 수 없습니다"
+
+#: builtin/log.c:596
+#, c-format
+msgid "Unknown type: %d"
+msgstr "알 수 없는 종류: %d"
+
+#: builtin/log.c:714
+msgid "format.headers without value"
+msgstr "format.headers ì„¤ì •ì— ê°’ì´ ì—†ìŒ"
+
+#: builtin/log.c:798
+msgid "name of output directory is too long"
+msgstr "출력 ë””ë ‰í„°ë¦¬ì˜ ì´ë¦„ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤"
+
+#: builtin/log.c:813
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr "%s 패치 파ì¼ì„ ì—´ 수 없습니다"
+
+#: builtin/log.c:827
+msgid "Need exactly one range."
+msgstr "정확히 í•˜ë‚˜ì˜ ë²”ìœ„ê°€ 필요합니다."
+
+#: builtin/log.c:837
+msgid "Not a range."
+msgstr "범위가 아닙니다."
+
+#: builtin/log.c:943
+msgid "Cover letter needs email format"
+msgstr "커버레터는 ì „ìžë©”ì¼ í˜•ì‹ì´ì–´ì•¼ 합니다"
+
+#: builtin/log.c:1022
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "정신나간 in-reply-to í—¤ë”: %s"
+
+#: builtin/log.c:1050
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<옵션>] [<시작시ê°> | <리비전-범위>]"
+
+#: builtin/log.c:1095
+msgid "Two output directories?"
+msgstr "출력 디렉터리가 ë‘ê°œ?"
+
+#: builtin/log.c:1211
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "í•˜ë‚˜ì˜ íŒ¨ì¹˜ì— ëŒ€í•´ì„œë„ [PATCh n/m]ì„ ë¶™ìž…ë‹ˆë‹¤"
+
+#: builtin/log.c:1214
+msgid "use [PATCH] even with multiple patches"
+msgstr "여러 ê°œ íŒ¨ì¹˜ì— ëŒ€í•´ì„œë„ [PATCH]를 붙입니다"
+
+#: builtin/log.c:1218
+msgid "print patches to standard out"
+msgstr "패치를 표준 출력으로 표시합니다"
+
+#: builtin/log.c:1220
+msgid "generate a cover letter"
+msgstr "커버레터를 만듭니다"
+
+#: builtin/log.c:1222
+msgid "use simple number sequence for output file names"
+msgstr "출력 íŒŒì¼ ì´ë¦„ì— ê°„ë‹¨í•œ ì¼ë ¨ 번호를 사용합니다"
+
+#: builtin/log.c:1223
+msgid "sfx"
+msgstr "확장ìž"
+
+#: builtin/log.c:1224
+msgid "use <sfx> instead of '.patch'"
+msgstr "'.patch' 대신 <확장ìž>를 사용합니다"
+
+#: builtin/log.c:1226
+msgid "start numbering patches at <n> instead of 1"
+msgstr "패치 번호를 1 대신 <n>ì—ì„œ 시작합니다"
+
+#: builtin/log.c:1228
+msgid "mark the series as Nth re-roll"
+msgstr "시리즈를 N번째 re-roll로 표시합니다"
+
+#: builtin/log.c:1230
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr "[PATCH] 대신 [<ì ‘ë‘ì–´>]를 사용합니다"
+
+#: builtin/log.c:1233
+msgid "store resulting files in <dir>"
+msgstr "ê²°ê³¼ 파ì¼ì„ <디렉터리>ì— ì €ìž¥í•©ë‹ˆë‹¤"
+
+#: builtin/log.c:1236
+msgid "don't strip/add [PATCH]"
+msgstr "[PATCH]를 ìžë¥´ê±°ë‚˜ 추가하지 않습니다"
+
+#: builtin/log.c:1239
+msgid "don't output binary diffs"
+msgstr "ë°”ì´ë„ˆë¦¬ diff를 만들지 않습니다"
+
+#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr "From í—¤ë”ì—ì„œ ëª¨ë‘ 0ì¸ í•´ì‹œë¥¼ 출력합니다"
+
+#: builtin/log.c:1243
+msgid "don't include a patch matching a commit upstream"
+msgstr "ì—…ìŠ¤íŠ¸ë¦¼ì— ìžˆëŠ” 패치를 í¬í•¨í•˜ì§€ 않습니다"
+
+#: builtin/log.c:1245
+msgid "show patch format instead of default (patch + stat)"
+msgstr "기본값 (패치 + 통계) 대신 패치 형ì‹ì„ 표시합니다"
+
+#: builtin/log.c:1247
+msgid "Messaging"
+msgstr "메시징"
+
+#: builtin/log.c:1248
+msgid "header"
+msgstr "í—¤ë”"
+
+#: builtin/log.c:1249
+msgid "add email header"
+msgstr "ì „ìžë©”ì¼ í—¤ë”"
+
+#: builtin/log.c:1250 builtin/log.c:1252
+msgid "email"
+msgstr "ì „ìžë©”ì¼"
+
+#: builtin/log.c:1250
+msgid "add To: header"
+msgstr "To: í—¤ë”를 추가합니다"
+
+#: builtin/log.c:1252
+msgid "add Cc: header"
+msgstr "Cc: í—¤ë”를 추가합니다"
+
+#: builtin/log.c:1254
+msgid "ident"
+msgstr "ì‹ ì›"
+
+#: builtin/log.c:1255
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr "<ì‹ ì›>ì—ì„œ From 주소를 설정합니다 (없으면 커미터 주소 ì‹ ì› ì‚¬ìš©)"
+
+#: builtin/log.c:1257
+msgid "message-id"
+msgstr "메시지-ID"
+
+#: builtin/log.c:1258
+msgid "make first mail a reply to <message-id>"
+msgstr "첫 ë©”ì¼ì„ <메시지-ID>ì— ëŒ€í•œ 답장 ë©”ì¼ë¡œ 만듭니다"
+
+#: builtin/log.c:1259 builtin/log.c:1262
+msgid "boundary"
+msgstr "경계"
+
+#: builtin/log.c:1260
+msgid "attach the patch"
+msgstr "패치를 첨부합니다"
+
+#: builtin/log.c:1263
+msgid "inline the patch"
+msgstr "패치를 ë³¸ë¬¸ì— í¬í•¨í•©ë‹ˆë‹¤"
+
+#: builtin/log.c:1267
+msgid "enable message threading, styles: shallow, deep"
+msgstr "ë©”ì‹œì§€ì— ìŠ¤ë ˆë“œë¥¼ 사용, 스타ì¼: shallow, deep"
+
+#: builtin/log.c:1269
+msgid "signature"
+msgstr "서명"
+
+#: builtin/log.c:1270
+msgid "add a signature"
+msgstr "ì„œëª…ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
+
+#: builtin/log.c:1272
+msgid "add a signature from a file"
+msgstr "파ì¼ì—ì„œ ì„œëª…ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
+
+#: builtin/log.c:1273
+msgid "don't print the patch filenames"
+msgstr "패치 íŒŒì¼ ì´ë¦„ì„ í‘œì‹œí•˜ì§€ 않습니다"
+
+#: builtin/log.c:1362
+msgid "-n and -k are mutually exclusive."
+msgstr "-n ë° -k ì˜µì…˜ì€ í•˜ë‚˜ë§Œ ì¨ì•¼ 합니다."
+
+#: builtin/log.c:1364
+msgid "--subject-prefix and -k are mutually exclusive."
+msgstr "--subject-prefix ë° -k ì˜µì…˜ì€ í•˜ë‚˜ë§Œ ì¨ì•¼ 합니다."
+
+#: builtin/log.c:1372
+msgid "--name-only does not make sense"
+msgstr "--name-only ì˜µì…˜ì€ ì•žë’¤ê°€ 맞지 않습니다"
+
+#: builtin/log.c:1374
+msgid "--name-status does not make sense"
+msgstr "--name-status ì˜µì…˜ì€ ì•žë’¤ê°€ 맞지 않습니다"
+
+#: builtin/log.c:1376
+msgid "--check does not make sense"
+msgstr "--check ì˜µì…˜ì€ ì•žë’¤ê°€ 맞지 않습니다"
+
+#: builtin/log.c:1401
+msgid "standard output, or directory, which one?"
+msgstr "표준 출력ì´ë‚˜ 디렉터리 ì¤‘ì— í•˜ë‚˜ë§Œ 지정해야 합니다."
+
+#: builtin/log.c:1403
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr "'%s' 디렉터리를 만들 수 없습니다"
+
+#: builtin/log.c:1500
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "'%s' 서명 파ì¼ì„ ì½ì„ 수 없습니다"
+
+#: builtin/log.c:1563
+msgid "Failed to create output files"
+msgstr "출력 파ì¼ì„ ë§Œë“œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/log.c:1611
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<업스트림> [<헤드> [<한계값>]]]"
+
+#: builtin/log.c:1665
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr "추ì ë˜ëŠ” 리모트 브랜치를 ì°¾ì„ ìˆ˜ 없습니다. <업스트림>ì„ ìˆ˜ë™ìœ¼ë¡œ 지정하십시오.\n"
+
+#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
+#, c-format
+msgid "Unknown commit %s"
+msgstr "알 수 없는 커밋 %s"
+
+#: builtin/ls-files.c:358
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<옵션>] [<파ì¼>...]"
+
+#: builtin/ls-files.c:415
+msgid "identify the file status with tags"
+msgstr "íŒŒì¼ ìƒíƒœë¥¼ 태그와 ê°™ì´ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/ls-files.c:417
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "'변경ë˜ì§€ 않았다고 가정' 파ì¼ì— 소문ìžë¥¼ 사용합니다"
+
+#: builtin/ls-files.c:419
+msgid "show cached files in the output (default)"
+msgstr "ì¶œë ¥ì— ìºì‹œëœ 파ì¼ì„ 표시합니다 (기본값)"
+
+#: builtin/ls-files.c:421
+msgid "show deleted files in the output"
+msgstr "ì¶œë ¥ì— ì‚­ì œëœ íŒŒì¼ì„ 표시합니다"
+
+#: builtin/ls-files.c:423
+msgid "show modified files in the output"
+msgstr "ì¶œë ¥ì— ìˆ˜ì •ëœ íŒŒì¼ì„ 표시합니다"
+
+#: builtin/ls-files.c:425
+msgid "show other files in the output"
+msgstr "ì¶œë ¥ì— ê¸°íƒ€ 파ì¼ì„ 표시합니다"
+
+#: builtin/ls-files.c:427
+msgid "show ignored files in the output"
+msgstr "ì¶œë ¥ì— ë¬´ì‹œëœ íŒŒì¼ì„ 표시합니다"
+
+#: builtin/ls-files.c:430
+msgid "show staged contents' object name in the output"
+msgstr "ì¶œë ¥ì— ì»¤ë°‹ í‘œì‹œëœ ë‚´ìš©ì˜ ì˜¤ë¸Œì íŠ¸ ì´ë¦„ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/ls-files.c:432
+msgid "show files on the filesystem that need to be removed"
+msgstr "íŒŒì¼ ì‹œìŠ¤í…œì—ì„œ 제거해야 하는 파ì¼ì„ 표시합니다"
+
+#: builtin/ls-files.c:434
+msgid "show 'other' directories' names only"
+msgstr "기타 ë””ë ‰í„°ë¦¬ì˜ ì´ë¦„만 표시합니다"
+
+#: builtin/ls-files.c:437
+msgid "don't show empty directories"
+msgstr "빈 디렉터리 표시하지 않기"
+
+#: builtin/ls-files.c:440
+msgid "show unmerged files in the output"
+msgstr "ì¶œë ¥ì— ë³‘í•©í•˜ì§€ ì•Šì€ íŒŒì¼ì„ 표시합니다"
+
+#: builtin/ls-files.c:442
+msgid "show resolve-undo information"
+msgstr "resolve-undo 정보를 표시합니다"
+
+#: builtin/ls-files.c:444
+msgid "skip files matching pattern"
+msgstr "íŒ¨í„´ì— ì¼ì¹˜í•˜ëŠ” 파ì¼ì„ 건너ëœë‹ˆë‹¤"
+
+#: builtin/ls-files.c:447
+msgid "exclude patterns are read from <file>"
+msgstr "제외할 íŒ¨í„´ì„ <파ì¼>ì—ì„œ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/ls-files.c:450
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr "<파ì¼>ì—ì„œ 추가ì ì¸ 디렉토리별 제외 íŒ¨í„´ì„ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/ls-files.c:452
+msgid "add the standard git exclusions"
+msgstr "표준 깃 제외 íŒ¨í„´ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
+
+#: builtin/ls-files.c:455
+msgid "make the output relative to the project top directory"
+msgstr "최ìƒìœ„ 디렉토리 ìƒëŒ€ 경로로 출력합니다"
+
+#: builtin/ls-files.c:458
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "<파ì¼>ì´ ì¸ë±ìŠ¤ ì•ˆì— ì—†ìœ¼ë©´ 오류로 취급합니다"
+
+#: builtin/ls-files.c:459
+msgid "tree-ish"
+msgstr "트리-따위"
+
+#: builtin/ls-files.c:460
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr "<트리-따위> 뒤로 제거한 경로가 있다고 가정합니다"
+
+#: builtin/ls-files.c:462
+msgid "show debugging data"
+msgstr "디버깅 ë°ì´í„°ë¥¼ 표시합니다"
+
+#: builtin/ls-tree.c:28
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<옵션>] <트리-따위> [<경로>...]"
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr "트리만 표시"
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr "하위 트리로 재귀ì ìœ¼ë¡œ ì ìš©"
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr "재귀ì ìœ¼ë¡œ ì ìš©í•  ë•Œ 트리 표시"
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr "í•­ëª©ì„ NUL ë°”ì´íŠ¸ë¡œ ë냅니다"
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr "오브ì íŠ¸ í¬ê¸° í¬í•¨"
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr "íŒŒì¼ ì´ë¦„만 ëª©ë¡ í‘œì‹œ"
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr "ì „ì²´ 경로 ì´ë¦„ 사용"
+
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr "ì „ì²´ 트리 ëª©ë¡ í‘œì‹œ, 현재 디렉터리만 ì•„ë‹ˆë¼ (--full-name 옵션 í¬í•¨)"
+
+#: builtin/merge.c:45
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<옵션>] [<커밋>...]"
+
+#: builtin/merge.c:46
+msgid "git merge [<options>] <msg> HEAD <commit>"
+msgstr "git merge [<옵션>] <메시지> HEAD <커밋>"
+
+#: builtin/merge.c:47
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:100
+msgid "switch `m' requires a value"
+msgstr "`m' 옵션ì—는 ê°’ì´ í•„ìš”í•©ë‹ˆë‹¤"
+
+#: builtin/merge.c:137
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "'%s' 병합 ì „ëžµì„ ì°¾ì„ ìˆ˜ 없습니다.\n"
+
+#: builtin/merge.c:138
+#, c-format
+msgid "Available strategies are:"
+msgstr "사용 가능한 ì „ëžµì€:"
+
+#: builtin/merge.c:143
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "사용 가능한 ì‚¬ìš©ìž ì„¤ì • ì „ëžµì€:"
+
+#: builtin/merge.c:193 builtin/pull.c:119
+msgid "do not show a diffstat at the end of the merge"
+msgstr "ë³‘í•©ì´ ëë‚  ë•Œ diffstatì„ í‘œì‹œí•˜ì§€ 않습니다"
+
+#: builtin/merge.c:196 builtin/pull.c:122
+msgid "show a diffstat at the end of the merge"
+msgstr "ë³‘í•©ì´ ëë‚  ë•Œ diffstatì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/merge.c:197 builtin/pull.c:125
+msgid "(synonym to --stat)"
+msgstr "(--stat 옵션과 ë™ì¼)"
+
+#: builtin/merge.c:199 builtin/pull.c:128
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr "병합 ì»¤ë°‹ì˜ ë©”ì‹œì§€ì— shortlog í•­ëª©ì„ (최대 <n>ê°œ) 추가합니다"
+
+#: builtin/merge.c:202 builtin/pull.c:131
+msgid "create a single commit instead of doing a merge"
+msgstr "병합하는 대신 í•˜ë‚˜ì˜ ì»¤ë°‹ì„ ë§Œë“­ë‹ˆë‹¤"
+
+#: builtin/merge.c:204 builtin/pull.c:134
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "ë³‘í•©ì´ ì„±ê³µí•˜ë©´ ì»¤ë°‹ì„ í•©ë‹ˆë‹¤ (기본값)"
+
+#: builtin/merge.c:206 builtin/pull.c:137
+msgid "edit message before committing"
+msgstr "커밋 ì „ì— ë©”ì‹œì§€ë¥¼ 편집합니다"
+
+#: builtin/merge.c:207
+msgid "allow fast-forward (default)"
+msgstr "ì •ë°©í–¥ ì§„í–‰ì„ í—ˆìš©í•©ë‹ˆë‹¤ (기본값)"
+
+#: builtin/merge.c:209 builtin/pull.c:143
+msgid "abort if fast-forward is not possible"
+msgstr "ì •ë°©í–¥ ì§„í–‰ì´ ë¶ˆê°€ëŠ¥í•˜ë©´ 중지합니다"
+
+#: builtin/merge.c:213
+msgid "Verify that the named commit has a valid GPG signature"
+msgstr "ì´ë¦„ ë¶™ì¸ ì»¤ë°‹ì— ì˜¬ë°”ë¥¸ GPG ì„œëª…ì´ ìžˆëŠ”ì§€ ê²€ì¦í•©ë‹ˆë‹¤"
+
+#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
+#: builtin/revert.c:89
+msgid "strategy"
+msgstr "ì „ëžµ"
+
+#: builtin/merge.c:215 builtin/pull.c:149
+msgid "merge strategy to use"
+msgstr "사용할 병합 전략"
+
+#: builtin/merge.c:216 builtin/pull.c:152
+msgid "option=value"
+msgstr "옵션=값"
+
+#: builtin/merge.c:217 builtin/pull.c:153
+msgid "option for selected merge strategy"
+msgstr "ì„ íƒí•œ 병합 ì „ëžµì— ëŒ€í•œ 옵션"
+
+#: builtin/merge.c:219
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "병합 커밋 메시지 (ì •ë°©í–¥ì´ ì•„ë‹Œ ë³‘í•©ì— ëŒ€í•´)"
+
+#: builtin/merge.c:223
+msgid "abort the current in-progress merge"
+msgstr "현재 진행 ì¤‘ì¸ ë³‘í•©ì„ ì¤‘ì§€í•©ë‹ˆë‹¤"
+
+#: builtin/merge.c:251
+msgid "could not run stash."
+msgstr "stash를 실행할 수 없습니다."
+
+#: builtin/merge.c:256
+msgid "stash failed"
+msgstr "stash 실패"
+
+#: builtin/merge.c:261
+#, c-format
+msgid "not a valid object: %s"
+msgstr "올바른 오브ì íŠ¸ê°€ 아닙니다: %s"
+
+#: builtin/merge.c:280 builtin/merge.c:297
+msgid "read-tree failed"
+msgstr "read-tree 실패"
+
+#: builtin/merge.c:327
+msgid " (nothing to squash)"
+msgstr " (í•©ì¹  ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤)"
+
+#: builtin/merge.c:340
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "커밋 합치기 -- HEAD를 ì—…ë°ì´íŠ¸í•˜ì§€ 않습니다\n"
+
+#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
+#: builtin/merge.c:988
+#, c-format
+msgid "Could not write to '%s'"
+msgstr "'%s'ì— ì“¸ 수 없습니다"
+
+#: builtin/merge.c:372
+msgid "Writing SQUASH_MSG"
+msgstr "SQUASH_MSG를 쓰는 중"
+
+#: builtin/merge.c:374
+msgid "Finishing SQUASH_MSG"
+msgstr "SQUASH_MSG를 마치는 중"
+
+#: builtin/merge.c:397
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "병합 메시지가 없습니다 -- HEAD를 ì—…ë°ì´íŠ¸í•˜ì§€ 않습니다\n"
+
+#: builtin/merge.c:447
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s'ì´(ê°€) ì»¤ë°‹ì„ ê°€ë¦¬í‚¤ì§€ 않습니다"
+
+#: builtin/merge.c:537
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "ìž˜ëª»ëœ branch.%s.mergeoptions 문ìžì—´: %s"
+
+#: builtin/merge.c:656
+msgid "Not handling anything other than two heads merge."
+msgstr "ë‘ ê°œì˜ í—¤ë“œ 병합 외ì—는 처리하지 않습니다."
+
+#: builtin/merge.c:670
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "merge-recursiveì— ëŒ€í•´ ì•Œ 수 없는 옵션: -X%s"
+
+#: builtin/merge.c:683
+#, c-format
+msgid "unable to write %s"
+msgstr "%sì— ì“¸ 수 없습니다"
+
+#: builtin/merge.c:772
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "'%s'ì—ì„œ ì½ì„ 수 없습니다"
+
+#: builtin/merge.c:781
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "ë³‘í•©ì„ ì»¤ë°‹í•˜ì§€ 않습니다. ë³‘í•©ì„ ë§ˆì¹˜ë ¤ë©´ 'git commit'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤.\n"
+
+#: builtin/merge.c:787
+#, c-format
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"왜 ì´ ë³‘í•©ì´ í•„ìš”í•œì§€ë¥¼ 설명하는 커밋 메시지를 입력하십시오. 특히\n"
+"업스트림 ì—…ë°ì´íŠ¸ë¥¼ ì–´ë–¤ 목ì ìš© 브랜치로 병합할 때는 반드시 그렇게\n"
+"하십시오.\n"
+"\n"
+"'%c' 문ìžë¡œ 시작하는 ì¤„ì€ ë¬´ì‹œë˜ê³ , 메시지가 비어 있으면 커밋ì„\n"
+"중지합니다.\n"
+
+#: builtin/merge.c:811
+msgid "Empty commit message."
+msgstr "빈 커밋 메시지."
+
+#: builtin/merge.c:823
+#, c-format
+msgid "Wonderful.\n"
+msgstr "훌륭합니다.\n"
+
+#: builtin/merge.c:878
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr "ìžë™ ë³‘í•©ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. 충ëŒì„ 바로잡고 ê²°ê³¼ë¬¼ì„ ì»¤ë°‹í•˜ì‹­ì‹œì˜¤.\n"
+
+#: builtin/merge.c:894
+#, c-format
+msgid "'%s' is not a commit"
+msgstr "'%s'ì€(는) ì»¤ë°‹ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: builtin/merge.c:935
+msgid "No current branch."
+msgstr "현재 브랜치가 없습니다."
+
+#: builtin/merge.c:937
+msgid "No remote for the current branch."
+msgstr "현재 ë¸Œëžœì¹˜ì— ëŒ€í•œ 리모트가 없습니다."
+
+#: builtin/merge.c:939
+msgid "No default upstream defined for the current branch."
+msgstr "현재 ë¸Œëžœì¹˜ì— ëŒ€í•´ 기본 ì—…ìŠ¤íŠ¸ë¦¼ì„ ì§€ì •í•˜ì§€ 않았습니다."
+
+#: builtin/merge.c:944
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "리모트 %2$sì—ì„œ %1$sì— ëŒ€í•œ 리모트 ì¶”ì  ë¸Œëžœì¹˜ê°€ 없습니다"
+
+#: builtin/merge.c:1079
+#, c-format
+msgid "could not close '%s'"
+msgstr "'%s'ì„(를) ë‹«ì„ ìˆ˜ 없습니다"
+
+#: builtin/merge.c:1206
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "중지할 병합 ìž‘ì—…ì´ ì—†ìŠµë‹ˆë‹¤. (MERGE_HEADê°€ ì—†ìŒ)"
+
+#: builtin/merge.c:1222
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"ë³‘í•©ì„ ë§ˆì¹˜ì§€ 않았습니다. (MERGE_HEAD 있ìŒ)\n"
+"병합하기 ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ì‹­ì‹œì˜¤."
+
+#: builtin/merge.c:1229
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"커밋 빼오기를 마치지 않았습니다. (COMMIT_PICK_HEAD 있ìŒ)\n"
+"병합하기 ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ì‹­ì‹œì˜¤."
+
+#: builtin/merge.c:1232
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "커밋 빼오기를 마치지 않았습니다. (CHERRY_PICK_HEAD 있ìŒ)"
+
+#: builtin/merge.c:1241
+msgid "You cannot combine --squash with --no-ff."
+msgstr "--squash ì˜µì…˜ì„ --no-ff 옵션과 ê°™ì´ ì“¸ 수 없습니다."
+
+#: builtin/merge.c:1249
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "ì»¤ë°‹ì„ ì§€ì •í•˜ì§€ 않았고 merge.defaultToUpstream를 설정하지 않았습니다."
+
+#: builtin/merge.c:1266
+msgid "Squash commit into empty head not supported yet"
+msgstr "빈 헤드로 ì»¤ë°‹ì„ í•©ì¹˜ê¸°ëŠ” 지ì›í•˜ì§€ 않습니다"
+
+#: builtin/merge.c:1268
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "ì •ë°©í–¥ì´ ì•„ë‹Œ ì»¤ë°‹ì€ ë¹ˆ 헤드ì—서는 앞뒤가 맞지 않습니다"
+
+#: builtin/merge.c:1274
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - 병합할 수 있는 í•­ëª©ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: builtin/merge.c:1276
+msgid "Can merge only exactly one commit into empty head"
+msgstr "빈 헤드ì—는 정확히 í•˜ë‚˜ì˜ ì»¤ë°‹ë§Œ 병합할 수 있습니다"
+
+#: builtin/merge.c:1331
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "%s ì»¤ë°‹ì— ì‹ ë¢°í•˜ì§€ 않는 (서명ìžê°€ %së¼ê³  하는) GPG ì„œëª…ì´ ìžˆìŠµë‹ˆë‹¤."
+
+#: builtin/merge.c:1334
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "%s ì»¤ë°‹ì— ìž˜ëª»ëœ (서명ìžê°€ %së¼ê³  하는) GPG ì„œëª…ì´ ìžˆìŠµë‹ˆë‹¤."
+
+#: builtin/merge.c:1337
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "%s ì»¤ë°‹ì— GPG ì„œëª…ì´ ì—†ìŠµë‹ˆë‹¤."
+
+#: builtin/merge.c:1340
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "%s ì»¤ë°‹ì— %sì˜ ì˜¬ë°”ë¥¸ GPG ì„œëª…ì´ ì—†ìŠµë‹ˆë‹¤\n"
+
+#: builtin/merge.c:1423
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "ì—…ë°ì´íŠ¸ 중 %s..%s\n"
+
+#: builtin/merge.c:1460
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "아주 간단한 ì¸ë±ìŠ¤ 내부 ë³‘í•©ì„ ì‹œë„합니다...\n"
+
+#: builtin/merge.c:1467
+#, c-format
+msgid "Nope.\n"
+msgstr "아님.\n"
+
+#: builtin/merge.c:1499
+msgid "Not possible to fast-forward, aborting."
+msgstr "ì •ë°©í–¥ì´ ë¶ˆê°€ëŠ¥í•˜ë¯€ë¡œ, 중지합니다."
+
+#: builtin/merge.c:1522 builtin/merge.c:1601
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "트리를 본래 위치로 ë˜ëŒë¦½ë‹ˆë‹¤...\n"
+
+#: builtin/merge.c:1526
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "병합 ì „ëžµ %s ì‹œë„...\n"
+
+#: builtin/merge.c:1592
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "ë³‘í•©ì„ ì²˜ë¦¬í•œ ì „ëžµì´ ì—†ìŠµë‹ˆë‹¤.\n"
+
+#: builtin/merge.c:1594
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "ì „ëžµ %s(으)ë¡œ ë³‘í•©ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤.\n"
+
+#: builtin/merge.c:1603
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "ìˆ˜ë™ í•´ê²°ì˜ ì¤€ë¹„ë¥¼ 위해 %s ì „ëžµì„ ì‚¬ìš©í•©ë‹ˆë‹¤.\n"
+
+#: builtin/merge.c:1615
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr "ìžë™ ë³‘í•©ì´ ìž˜ 진행ë˜ì—ˆìŠµë‹ˆë‹¤. 요청한대로 커밋 ì „ì— ì¤‘ì§€í•©ë‹ˆë‹¤\n"
+
+#: builtin/merge-base.c:29
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <커밋> <커밋>..."
+
+#: builtin/merge-base.c:30
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <커밋>..."
+
+#: builtin/merge-base.c:31
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <커밋>..."
+
+#: builtin/merge-base.c:32
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <커밋> <커밋>"
+
+#: builtin/merge-base.c:33
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <ë ˆí¼ëŸ°ìŠ¤> [<커밋>]"
+
+#: builtin/merge-base.c:214
+msgid "output all common ancestors"
+msgstr "모든 과거 공통 ì»¤ë°‹ì„ ì¶œë ¥í•©ë‹ˆë‹¤"
+
+#: builtin/merge-base.c:216
+msgid "find ancestors for a single n-way merge"
+msgstr "í•˜ë‚˜ì˜ n-ë°©í–¥ ë³‘í•©ì— ëŒ€í•œ 과거 ì»¤ë°‹ì„ ì°¾ìŠµë‹ˆë‹¤"
+
+#: builtin/merge-base.c:218
+msgid "list revs not reachable from others"
+msgstr "다른 ê³³ì—ì„œ ì ‘ê·¼ 불가능한 리비전 목ë¡ì„ 출력합니다"
+
+#: builtin/merge-base.c:220
+msgid "is the first one ancestor of the other?"
+msgstr "첫번째가 다른 ê²ƒì˜ ê³¼ê±° 커밋ì¸ì§€ 여부?"
+
+#: builtin/merge-base.c:222
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "<ë ˆí¼ëŸ°ìŠ¤>ì˜ reflogì—ì„œ <커밋>ì´ ë¶„ë¦¬ëœ ìœ„ì¹˜ë¥¼ 찾습니다"
+
+#: builtin/merge-file.c:8
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr "git merge-file [<옵션>] [-L <ì´ë¦„1> [-L <orig> [-L <ì´ë¦„2>]]] <파ì¼1> <본래-파ì¼> <파ì¼2>"
+
+#: builtin/merge-file.c:33
+msgid "send results to standard output"
+msgstr "결과를 표준 출력으로 보냅니다"
+
+#: builtin/merge-file.c:34
+msgid "use a diff3 based merge"
+msgstr "diff3 기반 ë³‘í•©ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/merge-file.c:35
+msgid "for conflicts, use our version"
+msgstr "충ëŒì´ ë°œìƒí•˜ë©´, 우리쪽 ë²„ì „ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use their version"
+msgstr "충ëŒì´ ë°œìƒí•˜ë©´, ìƒëŒ€íŽ¸ ë²„ì „ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use a union version"
+msgstr "충ëŒì´ ë°œìƒí•˜ë©´, 합친 ë²„ì „ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/merge-file.c:42
+msgid "for conflicts, use this marker size"
+msgstr "충ëŒì´ ë°œìƒí•˜ë©´, ì´ í¬ê¸°ë¡œ 표시합니다"
+
+#: builtin/merge-file.c:43
+msgid "do not warn about conflicts"
+msgstr "충ëŒì— 대해 경고하지 않습니다"
+
+#: builtin/merge-file.c:45
+msgid "set labels for file1/orig-file/file2"
+msgstr "<파ì¼1>/<본래-파ì¼>/<파ì¼2>ì— ëŒ€í•œ ë ˆì´ë¸”ì„ ì„¤ì •í•©ë‹ˆë‹¤"
+
+#: builtin/mktree.c:64
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
+
+#: builtin/mktree.c:150
+msgid "input is NUL terminated"
+msgstr "ìž…ë ¥ì´ NULë¡œ ë납니다"
+
+#: builtin/mktree.c:151 builtin/write-tree.c:24
+msgid "allow missing objects"
+msgstr "없는 오브ì íŠ¸ë¥¼ 허용합니다"
+
+#: builtin/mktree.c:152
+msgid "allow creation of more than one tree"
+msgstr "여러개 트리 만들기를 허용합니다"
+
+#: builtin/mv.c:15
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<옵션>] <ì›ë³¸>... <대ìƒ>"
+
+#: builtin/mv.c:69
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "%s 디렉터리가 ì¸ë±ìŠ¤ì— 있고 하위 ëª¨ë“ˆì´ ì—†ìŠµë‹ˆë‹¤?"
+
+#: builtin/mv.c:71
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr "계ì†í•˜ë ¤ë©´ .gitmodulesì˜ ë³€ê²½ ì‚¬í•­ì„ ìŠ¤í…Œì´ì§€ì— 넣거나 stash 하십시오"
+
+#: builtin/mv.c:89
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*sì´(ê°€) ì¸ë±ìŠ¤ì— 있습니다"
+
+#: builtin/mv.c:111
+msgid "force move/rename even if target exists"
+msgstr "대ìƒì´ ì´ë¯¸ ìžˆì–´ë„ ê°•ì œë¡œ 옮기기/ì´ë¦„ 바꾸기를 합니다"
+
+#: builtin/mv.c:112
+msgid "skip move/rename errors"
+msgstr "옮기기/ì´ë¦„ 바꾸기 오류를 건너 ëœë‹ˆë‹¤"
+
+#: builtin/mv.c:151
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "대ìƒì´ ('%s') 디렉터리가 아닙니다"
+
+#: builtin/mv.c:162
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "'%s'ì„(를) '%s'(으)ë¡œ ì´ë¦„ 바꾸기합니다\n"
+
+#: builtin/mv.c:166
+msgid "bad source"
+msgstr "ìž˜ëª»ëœ ì›ë³¸"
+
+#: builtin/mv.c:169
+msgid "can not move directory into itself"
+msgstr "디렉터리를 ìžê¸° ìžì‹ ìœ¼ë¡œ 옮길 수 없습니다"
+
+#: builtin/mv.c:172
+msgid "cannot move directory over file"
+msgstr "디렉터리를 파ì¼ë¡œ 옮길 수 없습니다"
+
+#: builtin/mv.c:181
+msgid "source directory is empty"
+msgstr "ì›ë³¸ 디렉터리가 비어 있습니다"
+
+#: builtin/mv.c:206
+msgid "not under version control"
+msgstr "버전 컨트롤 ì¤‘ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: builtin/mv.c:209
+msgid "destination exists"
+msgstr "대ìƒì´ 있습니다"
+
+#: builtin/mv.c:217
+#, c-format
+msgid "overwriting '%s'"
+msgstr "'%s' ë®ì–´ì“°ê¸°"
+
+#: builtin/mv.c:220
+msgid "Cannot overwrite"
+msgstr "ë®ì–´ì“¸ 수 없습니다"
+
+#: builtin/mv.c:223
+msgid "multiple sources for the same target"
+msgstr "ë™ì¼í•œ 대ìƒì— 대해 여러 ê°œ ì›ë³¸"
+
+#: builtin/mv.c:225
+msgid "destination directory does not exist"
+msgstr "ëŒ€ìƒ ë””ë ‰í„°ë¦¬ê°€ 없습니다"
+
+#: builtin/mv.c:232
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, ì›ë³¸=%s, 대ìƒ=%s"
+
+#: builtin/mv.c:253
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "ì´ë¦„ 바꾸기, '%s'ì—ì„œ '%s'(으)ë¡œ\n"
+
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "'%s'ì˜ ì´ë¦„ 바꾸기가 실패했습니다"
+
+#: builtin/name-rev.c:251
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<옵션>] <커밋>..."
+
+#: builtin/name-rev.c:252
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<옵션>] --all"
+
+#: builtin/name-rev.c:253
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<옵션>] --stdin"
+
+#: builtin/name-rev.c:305
+msgid "print only names (no SHA-1)"
+msgstr "ì´ë¦„만 표시 (SHA-1 ì—†ì´)"
+
+#: builtin/name-rev.c:306
+msgid "only use tags to name the commits"
+msgstr "ì»¤ë°‹ì„ ì§€ì •í•  ë•Œ 태그만 사용합니다"
+
+#: builtin/name-rev.c:308
+msgid "only use refs matching <pattern>"
+msgstr "<패턴>ê³¼ ì¼ì¹˜í•˜ëŠ” ë ˆí¼ëŸ°ìŠ¤ë§Œ 사용합니다"
+
+#: builtin/name-rev.c:310
+msgid "list all commits reachable from all refs"
+msgstr "모든 ë ˆí¼ëŸ°ìŠ¤ì—ì„œ ì ‘ê·¼ 가능한 모든 커밋 목ë¡ì„ 표시합니다"
+
+#: builtin/name-rev.c:311
+msgid "read from stdin"
+msgstr "표준입력ì—ì„œ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/name-rev.c:312
+msgid "allow to print `undefined` names (default)"
+msgstr "`ì •ì˜ë˜ì§€ ì•Šì€' ì´ë¦„ 표시를 허용합니다 (기본값)"
+
+#: builtin/name-rev.c:318
+msgid "dereference tags in the input (internal use)"
+msgstr "ìž…ë ¥ì˜ íƒœê·¸ ë ˆí¼ëŸ°ìŠ¤ë¥¼ ë”°ë¼ê°‘니다 (내부 사용)"
+
+#: builtin/notes.c:25
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <노트-ë ˆí¼ëŸ°ìŠ¤>] [list [<오브ì íŠ¸>]]"
+
+#: builtin/notes.c:26
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <메시지> | -F <파"
+"ì¼> | (-c | -C) <오브ì íŠ¸>] [<오브ì íŠ¸>]"
+
+#: builtin/notes.c:27
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <노트-ë ˆí¼ëŸ°ìŠ¤>] copy [-f] <ì›ë³¸-오브ì íŠ¸> <대ìƒ-오브ì íŠ¸>"
+
+#: builtin/notes.c:28
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <쪽지-ë ˆí¼ëŸ°ìŠ¤>] append [--allow-empty] [-m <메시지> | -F <"
+"파ì¼> | (-c | -C) <오브ì íŠ¸>] [<오브ì íŠ¸>]"
+
+#: builtin/notes.c:29
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <쪽지-ë ˆí¼ëŸ°ìŠ¤>] edit [--allow-empty] [<오브ì íŠ¸>]"
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <notes-ref>] show [<오브ì íŠ¸>]"
+
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr "git notes [--ref <노트-ë ˆí¼ëŸ°ìŠ¤>] merge [-v | -q] [-s <ì „ëžµ>] <노트-ë ˆí¼ëŸ°ìŠ¤>"
+
+#: builtin/notes.c:32
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
+
+#: builtin/notes.c:33
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
+
+#: builtin/notes.c:34
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <노트-ë ˆí¼ëŸ°ìŠ¤>] remove [<오브ì íŠ¸>...]"
+
+#: builtin/notes.c:35
+msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
+msgstr "git notes [--ref <노트-ë ˆí¼ëŸ°ìŠ¤>] prune [-n | -v]"
+
+#: builtin/notes.c:36
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <노트-ë ˆí¼ëŸ°ìŠ¤>] get-ref"
+
+#: builtin/notes.c:41
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<오브ì íŠ¸>]]"
+
+#: builtin/notes.c:46
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<옵션>] [<오브ì íŠ¸>]"
+
+#: builtin/notes.c:51
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<옵션>] <ì›ë³¸-오브ì íŠ¸> <대ìƒ-오브ì íŠ¸>"
+
+#: builtin/notes.c:52
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<ì›ë³¸-오브ì íŠ¸> <대ìƒ-오브ì íŠ¸>]..."
+
+#: builtin/notes.c:57
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<옵션>] [<오브ì íŠ¸>]"
+
+#: builtin/notes.c:62
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<오브ì íŠ¸>]"
+
+#: builtin/notes.c:67
+msgid "git notes show [<object>]"
+msgstr "git notes show [<오브ì íŠ¸>]"
+
+#: builtin/notes.c:72
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<옵션>] <쪽지-ë ˆí¼ëŸ°ìŠ¤>"
+
+#: builtin/notes.c:73
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<옵션>]"
+
+#: builtin/notes.c:74
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<옵션>]"
+
+#: builtin/notes.c:79
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<오브ì íŠ¸>]"
+
+#: builtin/notes.c:84
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<옵션>]"
+
+#: builtin/notes.c:89
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
+
+#: builtin/notes.c:147
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "'%s' 오브ì íŠ¸ì— 대해 'show'를 시작할 수 없습니다"
+
+#: builtin/notes.c:151
+msgid "could not read 'show' output"
+msgstr "'show' ì¶œë ¥ì„ ì½ì„ 수 없습니다"
+
+#: builtin/notes.c:159
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "오브ì íŠ¸ '%s'ì— ëŒ€í•´ 'show'를 ë§ˆì¹˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "'%s' 파ì¼ì„ 만들 수 없습니다"
+
+#: builtin/notes.c:193
+msgid "Please supply the note contents using either -m or -F option"
+msgstr "노트 ë‚´ìš©ì„ -m ë˜ëŠ” -F 옵션으로 입력하십시오"
+
+#: builtin/notes.c:202
+msgid "unable to write note object"
+msgstr "노트 오브ì íŠ¸ë¥¼ 쓸 수 없습니다"
+
+#: builtin/notes.c:204
+#, c-format
+msgid "The note contents have been left in %s"
+msgstr "노트 ë‚´ìš©ì€ %sì— ë‚¨ìŠµë‹ˆë‹¤"
+
+#: builtin/notes.c:232 builtin/tag.c:440
+#, c-format
+msgid "cannot read '%s'"
+msgstr "'%s'ì„(를) ì½ì„ 수 없습니다"
+
+#: builtin/notes.c:234 builtin/tag.c:443
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "'%s'ì„(를) 열거나 ì½ì„ 수 없습니다"
+
+#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
+#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
+#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
+#: builtin/notes.c:877 builtin/tag.c:456
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "'%s'ì„(를) 올바른 ë ˆí¼ëŸ°ìŠ¤ë¡œ ì•Œì•„ë‚´ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/notes.c:256
+#, c-format
+msgid "Failed to read object '%s'."
+msgstr "'%s' 오브ì íŠ¸ ì½ê¸°ì— 실패했습니다."
+
+#: builtin/notes.c:260
+#, c-format
+msgid "Cannot read note data from non-blob object '%s'."
+msgstr "ë¸”ë¡­ì´ ì•„ë‹Œ '%s' 오브ì íŠ¸ì— 대해 노트 ë°ì´í„°ë¥¼ ì½ì„ 수 없습니다."
+
+#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
+#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
+#: builtin/notes.c:942
+msgid "too many parameters"
+msgstr "파ë¼ë¯¸í„°ê°€ 너무 많습니다"
+
+#: builtin/notes.c:372 builtin/notes.c:659
+#, c-format
+msgid "No note found for object %s."
+msgstr "%s 오브ì íŠ¸ì— 대해 노트가 없습니다."
+
+#: builtin/notes.c:393 builtin/notes.c:556
+msgid "note contents as a string"
+msgstr "문ìžì—´ë¡œ 노트 ë‚´ìš©"
+
+#: builtin/notes.c:396 builtin/notes.c:559
+msgid "note contents in a file"
+msgstr "íŒŒì¼ ì•ˆì— ë…¸íŠ¸ ë‚´ìš©"
+
+#: builtin/notes.c:399 builtin/notes.c:562
+msgid "reuse and edit specified note object"
+msgstr "지정한 노트 오브ì íŠ¸ë¥¼ 재사용하고 편집합니다"
+
+#: builtin/notes.c:402 builtin/notes.c:565
+msgid "reuse specified note object"
+msgstr "지정한 노트 오브ì íŠ¸ë¥¼ 재사용합니다"
+
+#: builtin/notes.c:405 builtin/notes.c:568
+msgid "allow storing empty note"
+msgstr "빈 노트 ì €ìž¥ì„ í—ˆìš©í•©ë‹ˆë‹¤"
+
+#: builtin/notes.c:406 builtin/notes.c:477
+msgid "replace existing notes"
+msgstr "기존 노트를 바꿉니다"
+
+#: builtin/notes.c:431
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr "노트를 추가할 수 없습니다. %s 오브ì íŠ¸ì— 대한 기존 노트가 있습니다. 기존 노트를 ë®ì–´ì“°ë ¤ë©´ '-f' ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤"
+
+#: builtin/notes.c:446 builtin/notes.c:525
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr "%s 오브ì íŠ¸ì— 대한 기존 노트를 ë®ì–´ì”니다\n"
+
+#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "%s 오브ì íŠ¸ì— 대한 노트를 제거합니다\n"
+
+#: builtin/notes.c:478
+msgid "read objects from stdin"
+msgstr "표준 ìž…ë ¥ì—ì„œ 오브ì íŠ¸ë¥¼ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/notes.c:480
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "<명령>ì— ëŒ€í•œ 다시쓰기 ì„¤ì •ì„ ì½ì–´ë“¤ìž…니다 (--stdin 옵션 í¬í•¨)"
+
+#: builtin/notes.c:498
+msgid "too few parameters"
+msgstr "파ë¼ë¯¸í„°ê°€ 너무 ì ìŠµë‹ˆë‹¤"
+
+#: builtin/notes.c:519
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr "노트를 복사할 수 없습니다. %s 오브ì íŠ¸ì— 대한 기존 노트가 있습니다. 기존 노트를 ë®ì–´ì“°ë ¤ë©´ '-f' ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤"
+
+#: builtin/notes.c:531
+#, c-format
+msgid "Missing notes on source object %s. Cannot copy."
+msgstr "ì›ë³¸ %s 오브ì íŠ¸ì— 대한 노트가 없습니다. 복사할 수 없습니다."
+
+#: builtin/notes.c:583
+#, 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 ""
+"-m/-F/-c/-C ì˜µì…˜ì€ 'edit' 하위 ëª…ë ¹ì— ëŒ€í•´ ì‚¬ìš©ì„ ê¶Œí•˜ì§€ 않습니다.\n"
+"ëŒ€ì‹ ì— 'git notes add -f -m/-F/-c/-C' ëª…ë ¹ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤.\n"
+
+#: builtin/notes.c:764
+msgid "General options"
+msgstr "ì¼ë°˜ 옵션"
+
+#: builtin/notes.c:766
+msgid "Merge options"
+msgstr "병합 옵션"
+
+#: builtin/notes.c:768
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr "주어진 ì „ëžµì„ ì‚¬ìš©í•´ 노트 충ëŒì„ 해결합니다 (manual/ours/theirs/union/cat_sort_uniq)"
+
+#: builtin/notes.c:770
+msgid "Committing unmerged notes"
+msgstr "병합하지 ì•Šì€ ë…¸íŠ¸ 커밋"
+
+#: builtin/notes.c:772
+msgid "finalize notes merge by committing unmerged notes"
+msgstr "병합하지 ì•Šì€ ë…¸íŠ¸ë¥¼ 커밋해 노트 ë³‘í•©ì„ ë§ˆì¹©ë‹ˆë‹¤"
+
+#: builtin/notes.c:774
+msgid "Aborting notes merge resolution"
+msgstr "노트 병합 해결 중지"
+
+#: builtin/notes.c:776
+msgid "abort notes merge"
+msgstr "노트 ë³‘í•©ì„ ì¤‘ì§€í•©ë‹ˆë‹¤"
+
+#: builtin/notes.c:853
+#, c-format
+msgid "A notes merge into %s is already in-progress at %s"
+msgstr "%s 위치로 노트 ë³‘í•©ì´ ì´ë¯¸ %sì—ì„œ 진행중입니다"
+
+#: builtin/notes.c:880
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "%s 오브ì íŠ¸ì— 노트가 없습니다\n"
+
+#: builtin/notes.c:892
+msgid "attempt to remove non-existent note is not an error"
+msgstr "없는 노트를 제거하려는 ì‹œë„를 오류가 ì•„ë‹Œ 것으로 취급합니다"
+
+#: builtin/notes.c:895
+msgid "read object names from the standard input"
+msgstr "표준 ìž…ë ¥ì—ì„œ 오브ì íŠ¸ ì´ë¦„ì„ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/notes.c:976
+msgid "notes-ref"
+msgstr "노트-ë ˆí¼ëŸ°ìŠ¤"
+
+#: builtin/notes.c:977
+msgid "use notes from <notes-ref>"
+msgstr "<노트-ë ˆí¼ëŸ°ìŠ¤>ì—ì„œ 노트를 사용합니다"
+
+#: builtin/notes.c:1012 builtin/remote.c:1647
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "알 수 없는 하위 명령: %s"
+
+#: builtin/pack-objects.c:28
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects --stdout [<옵션>...] [< <ë ˆí¼ëŸ°ìŠ¤ëª©ë¡> | < <오브ì íŠ¸ëª©ë¡>]"
+
+#: builtin/pack-objects.c:29
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects [<옵션>...] <ë² ì´ìŠ¤ì´ë¦„> [< <ë ˆí¼ëŸ°ìŠ¤ëª©ë¡> | < <오브ì íŠ¸ëª©ë¡"
+">]"
+
+#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#, c-format
+msgid "deflate error (%d)"
+msgstr "deflate 오류 (%d)"
+
+#: builtin/pack-objects.c:771
+msgid "Writing objects"
+msgstr "오브ì íŠ¸ 쓰는 중"
+
+#: builtin/pack-objects.c:1011
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr "묶ìŒì— 들어있지 ì•Šì€ ì˜¤ë¸Œì íŠ¸ê°€ 있으므로, 비트맵 쓰기를 하지 않습니다"
+
+#: builtin/pack-objects.c:2171
+msgid "Compressing objects"
+msgstr "오브ì íŠ¸ 압축하는 중"
+
+#: builtin/pack-objects.c:2568
+#, c-format
+msgid "unsupported index version %s"
+msgstr "지ì›í•˜ì§€ 않는 ì¸ë±ìŠ¤ 버전 %s"
+
+#: builtin/pack-objects.c:2572
+#, c-format
+msgid "bad index version '%s'"
+msgstr "ìž˜ëª»ëœ ì¸ë±ìŠ¤ 버전 '%s'"
+
+#: builtin/pack-objects.c:2602
+msgid "do not show progress meter"
+msgstr "ì§„í–‰ë¥ ì„ í‘œì‹œí•˜ì§€ 않습니다"
+
+#: builtin/pack-objects.c:2604
+msgid "show progress meter"
+msgstr "ì§„í–‰ë¥ ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/pack-objects.c:2606
+msgid "show progress meter during object writing phase"
+msgstr "오브ì íŠ¸ 쓰기 단계ì—ì„œ ì§„í–‰ë¥ ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/pack-objects.c:2609
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "ì§„í–‰ë¥ ì´ í‘œì‹œë  ë•Œ --all-progress와 비슷합니다"
+
+#: builtin/pack-objects.c:2610
+msgid "version[,offset]"
+msgstr "버전[,오프셋]"
+
+#: builtin/pack-objects.c:2611
+msgid "write the pack index file in the specified idx format version"
+msgstr "지정한 ë²„ì „ì˜ ì¸ë±ìŠ¤ 형ì‹ì— ë”°ë¼ ë¬¶ìŒ ì¸ë±ìŠ¤ 파ì¼ì„ ì”니다"
+
+#: builtin/pack-objects.c:2614
+msgid "maximum size of each output pack file"
+msgstr "출력 ë¬¶ìŒ íŒŒì¼ì˜ 최대 í¬ê¸°"
+
+#: builtin/pack-objects.c:2616
+msgid "ignore borrowed objects from alternate object store"
+msgstr "ë³´ì¡° 오브ì íŠ¸ 저장소ì—ì„œ 빌려온 오브ì íŠ¸ë¥¼ 무시합니다"
+
+#: builtin/pack-objects.c:2618
+msgid "ignore packed objects"
+msgstr "ë¬¶ìŒ ì˜¤ë¸Œì íŠ¸ë¥¼ 무시합니다"
+
+#: builtin/pack-objects.c:2620
+msgid "limit pack window by objects"
+msgstr "ë¬¶ìŒ ìœˆë„우를 오브ì íŠ¸ 단위로 제한합니다"
+
+#: builtin/pack-objects.c:2622
+msgid "limit pack window by memory in addition to object limit"
+msgstr "ë¬¶ìŒ ìœˆë„우를 오브ì íŠ¸ ë‹¨ìœ„ì— ì¶”ê°€ë¡œ 메모리 단위로 제한합니다"
+
+#: builtin/pack-objects.c:2624
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr "결과물 묶ìŒì—ì„œ 허용ë˜ëŠ” 최대 길ì´ì˜ ë¸íƒ€ ì²´ì¸"
+
+#: builtin/pack-objects.c:2626
+msgid "reuse existing deltas"
+msgstr "기존 ë¸íƒ€ë¥¼ 재사용합니다"
+
+#: builtin/pack-objects.c:2628
+msgid "reuse existing objects"
+msgstr "기존 오브ì íŠ¸ë¥¼ 재사용합니다"
+
+#: builtin/pack-objects.c:2630
+msgid "use OFS_DELTA objects"
+msgstr "OFS_DELTA 오브ì íŠ¸ë¥¼ 사용합니다"
+
+#: builtin/pack-objects.c:2632
+msgid "use threads when searching for best delta matches"
+msgstr "최ìƒì˜ ë¸íƒ€ ì¼ì¹˜ë¥¼ ê²€ìƒ‰í•˜ëŠ”ë° ìŠ¤ë ˆë“œë¥¼ 사용합니다"
+
+#: builtin/pack-objects.c:2634
+msgid "do not create an empty pack output"
+msgstr "빈 ë¬¶ìŒ ì¶œë ¥ì„ ë§Œë“¤ì§€ 않습니다"
+
+#: builtin/pack-objects.c:2636
+msgid "read revision arguments from standard input"
+msgstr "표준 ìž…ë ¥ì—ì„œ 리비전 ì¸ìžë¥¼ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/pack-objects.c:2638
+msgid "limit the objects to those that are not yet packed"
+msgstr "묶지 않는 오브ì íŠ¸ 수를 제한합니다"
+
+#: builtin/pack-objects.c:2641
+msgid "include objects reachable from any reference"
+msgstr "모든 ë ˆí¼ëŸ°ìŠ¤ì—ì„œ ì ‘ê·¼ 가능한 오브ì íŠ¸ë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
+
+#: builtin/pack-objects.c:2644
+msgid "include objects referred by reflog entries"
+msgstr "reflog 항목ì—ì„œ ë ˆí¼ëŸ°ìŠ¤í•  수 있는 오브ì íŠ¸ë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
+
+#: builtin/pack-objects.c:2647
+msgid "include objects referred to by the index"
+msgstr "ì¸ë±ìŠ¤ì—ì„œ< ë ˆí¼ëŸ°ìŠ¤í•˜ëŠ” 오브ì íŠ¸ë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
+
+#: builtin/pack-objects.c:2650
+msgid "output pack to stdout"
+msgstr "묶ìŒì„ 표준 출력으로 출력합니다"
+
+#: builtin/pack-objects.c:2652
+msgid "include tag objects that refer to objects to be packed"
+msgstr "묶ìŒì— 들어갈 오브ì íŠ¸ë¥¼ ë ˆí¼ëŸ°ìŠ¤í•˜ëŠ” 태그 오브ì íŠ¸ë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
+
+#: builtin/pack-objects.c:2654
+msgid "keep unreachable objects"
+msgstr "ì ‘ê·¼ 불가능 오브ì íŠ¸ë¥¼ 보존합니다"
+
+#: builtin/pack-objects.c:2655 parse-options.h:142
+msgid "time"
+msgstr "ì‹œê°"
+
+#: builtin/pack-objects.c:2656
+msgid "unpack unreachable objects newer than <time>"
+msgstr "<ì‹œê°>보다 새로운 ì ‘ê·¼ 불가능 오브ì íŠ¸ì˜ 묶ìŒì„ 풉니다"
+
+#: builtin/pack-objects.c:2659
+msgid "create thin packs"
+msgstr "ì–‡ì€ ë¬¶ìŒì„ 만듭니다"
+
+#: builtin/pack-objects.c:2661
+msgid "create packs suitable for shallow fetches"
+msgstr "ì–•ì€ ê°€ì ¸ì˜¤ê¸°ì— ì í•©í•œ 묶ìŒì„ 만듭니다"
+
+#: builtin/pack-objects.c:2663
+msgid "ignore packs that have companion .keep file"
+msgstr "해당하는 .keep 파ì¼ì´ 있는 묶ìŒì„ 무시합니다"
+
+#: builtin/pack-objects.c:2665
+msgid "pack compression level"
+msgstr "ë¬¶ìŒ ì••ì¶• 단계"
+
+# FIXME: graft?
+#: builtin/pack-objects.c:2667
+msgid "do not hide commits by grafts"
+msgstr "붙어 있는 ì»¤ë°‹ì„ ìˆ¨ê¸°ì§€ 않습니다"
+
+#: builtin/pack-objects.c:2669
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr "가능하면 비트맵 ì¸ë±ìŠ¤ë¥¼ 사용해 오브ì íŠ¸ 세기 ì†ë„를 높입니다"
+
+#: builtin/pack-objects.c:2671
+msgid "write a bitmap index together with the pack index"
+msgstr "ë¬¶ìŒ ì¸ë±ìŠ¤ì™€ ê°™ì´ ë¹„íŠ¸ë§µ ì¸ë±ìŠ¤ë¥¼ ì”니다"
+
+#: builtin/pack-objects.c:2762
+msgid "Counting objects"
+msgstr "오브ì íŠ¸ 개수 세는 중"
+
+#: builtin/pack-refs.c:6
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<옵션>]"
+
+#: builtin/pack-refs.c:14
+msgid "pack everything"
+msgstr "ëª¨ë‘ ë¬¶ìŠµë‹ˆë‹¤"
+
+#: builtin/pack-refs.c:15
+msgid "prune loose refs (default)"
+msgstr "ëŠìŠ¨í•œ ë ˆí¼ëŸ°ìŠ¤ë¥¼ 잘ë¼ëƒ…니다 (기본값)"
+
+#: builtin/prune-packed.c:7
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#: builtin/prune-packed.c:40
+msgid "Removing duplicate objects"
+msgstr "ì¤‘ë³µëœ ì˜¤ë¸Œì íŠ¸ 제거"
+
+#: builtin/prune.c:11
+msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--expire <ì‹œê°>] [--] [<헤드>...]"
+
+#: builtin/prune.c:105 builtin/worktree.c:124
+msgid "do not remove, show only"
+msgstr "제거하지 않고, 보여주기만 합니다"
+
+#: builtin/prune.c:106 builtin/worktree.c:125
+msgid "report pruned objects"
+msgstr "잘ë¼ë‚¸ 오브ì íŠ¸ë¥¼ 알립니다"
+
+#: builtin/prune.c:109 builtin/worktree.c:127
+msgid "expire objects older than <time>"
+msgstr "<ì‹œê°>보다 오래 ëœ ì˜¤ë¸Œì íŠ¸ê°€ 만료ë©ë‹ˆë‹¤"
+
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "precious-objects 저장소ì—ì„œ 잘ë¼ë‚¼ 수 없습니다"
+
+#: builtin/pull.c:69
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<옵션>] [<저장소> [<ë ˆí¼ëŸ°ìŠ¤ëª…세>...]]"
+
+#: builtin/pull.c:113
+msgid "Options related to merging"
+msgstr "병합 관련 옵션"
+
+#: builtin/pull.c:116
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "변경 ì‚¬í•­ì„ ì ìš©í•  ë•Œ 병합하는 대신 리베ì´ìŠ¤í•©ë‹ˆë‹¤"
+
+#: builtin/pull.c:140 builtin/revert.c:105
+msgid "allow fast-forward"
+msgstr "ì •ë°©í–¥ ì§„í–‰ì„ í—ˆìš©í•©ë‹ˆë‹¤"
+
+#: builtin/pull.c:146
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "지정한 ì»¤ë°‹ì— ì˜¬ë°”ë¥¸ GPG ì„œëª…ì´ ìžˆëŠ”ì§€ ê²€ì¦í•©ë‹ˆë‹¤"
+
+#: builtin/pull.c:160
+msgid "Options related to fetching"
+msgstr "가져오기 관련 옵션"
+
+#: builtin/pull.c:268
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "pull.ffì— ëŒ€í•´ ìž˜ëª»ëœ ê°’: %s"
+
+#: builtin/pull.c:352
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr "리베ì´ìŠ¤ë¡œ í’€ì„ í•  수 없습니다: 스테ì´ì§•í•˜ì§€ ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
+
+#: builtin/pull.c:358
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "추가로, ì¸ë±ìŠ¤ì— 커밋하지 ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
+
+#: builtin/pull.c:360
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr "리베ì´ìŠ¤ë¡œ í’€ì„ í•  수 없습니다: ì¸ë±ìŠ¤ì— 커밋하지 ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
+
+#: builtin/pull.c:436
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr "가져온 ë ˆí¼ëŸ°ìŠ¤ ì¤‘ì— ë¦¬ë² ì´ìŠ¤í•  ëŒ€ìƒ í›„ë³´ê°€ 없습니다."
+
+#: builtin/pull.c:438
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr "가져온 ë ˆí¼ëŸ°ìŠ¤ ì¤‘ì— ë³‘í•©í•  ëŒ€ìƒ í›„ë³´ê°€ 없습니다."
+
+#: builtin/pull.c:439
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+"보통 ì´ëŸ° 경우는 리모트 쪽ì—는 없는 와ì¼ë“œì¹´ë“œ ë ˆí¼ëŸ°ìŠ¤ëª…세가\n"
+"ì£¼ì–´ì¡Œì„ ë•Œ ì¼ì–´ë‚©ë‹ˆë‹¤."
+
+#: builtin/pull.c:442
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+"리모트 '%s'ì—ì„œ í’€ì„ ìš”ì²­í–ˆì§€ë§Œ, 브랜치를 지정하지 않았습니다.\n"
+"ì´ ë¦¬ëª¨íŠ¸ëŠ” 현재 ë¸Œëžœì¹˜ì— ëŒ€í•´ 기본으로 ì„¤ì •ëœ ë¦¬ëª¨íŠ¸ê°€\n"
+"아니기 때문ì—, 명령행ì—ì„œ 브랜치를 지정해야 합니다."
+
+#: builtin/pull.c:447
+msgid "You are not currently on a branch."
+msgstr "현재 ì–´ë–¤ 브랜치 위ì—ë„ ìžˆì§€ 않습니다."
+
+#: builtin/pull.c:449 builtin/pull.c:464
+msgid "Please specify which branch you want to rebase against."
+msgstr "ì–´ë–¤ 브랜치를 대ìƒìœ¼ë¡œ 리베ì´ìŠ¤í• ì§€ 지정하십시오."
+
+#: builtin/pull.c:451 builtin/pull.c:466
+msgid "Please specify which branch you want to merge with."
+msgstr "ì–´ë–¤ 브랜치를 대ìƒìœ¼ë¡œ 병합할지 지정하십시오."
+
+#: builtin/pull.c:452 builtin/pull.c:467
+msgid "See git-pull(1) for details."
+msgstr "ìžì„¸í•œ 정보는 git-pull(1) 페ì´ì§€ë¥¼ 참고하십시오."
+
+#: builtin/pull.c:462
+msgid "There is no tracking information for the current branch."
+msgstr "현재 ë¸Œëžœì¹˜ì— ì¶”ì  ì •ë³´ê°€ 없습니다."
+
+#: builtin/pull.c:471
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
+msgstr ""
+"ì´ ë¸Œëžœì¹˜ì— ëŒ€í•œ ì¶”ì  ì •ë³´ë¥¼ 설정하려면 다ìŒê³¼ ê°™ì´ í•  수 있습니다:\n"
+"\n"
+" git branch --set-upstream-to=%s/<브랜치> %s\n"
+
+#: builtin/pull.c:476
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"설정ì—ì„œ ë¦¬ëª¨íŠ¸ì˜ '%s' ë ˆí¼ëŸ°ìŠ¤ì™€ 병합하ë„ë¡ ì§€ì •í–ˆì§€ë§Œ,\n"
+"그런 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 가져오지 않았습니다."
+
+#: builtin/pull.c:830
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "만들어지지 ì•Šì€ ë¸Œëžœì¹˜ë¥¼ ì¸ë±ìŠ¤ì— ì¶”ê°€ëœ ë³€ê²½ 사항으로 ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤."
+
+#: builtin/pull.c:859
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"현재 브랜치 헤드를 ì—…ë°ì´íŠ¸í–ˆìŠµë‹ˆë‹¤.\n"
+"ìž‘ì—… í´ë”를 %s 커밋ì—ì„œ ì •ë°©í–¥\n"
+"진행합니다."
+
+#: builtin/pull.c:864
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+"ìž‘ì—… í´ë”를 ì •ë°©í–¥ 진행할 수 없습니다.\n"
+"ë‹¤ìŒ ëª…ë ¹ 출력ì—ì„œ 중요한 ì‚¬í•­ì„ ì €ìž¥í•œ 다ìŒ,\n"
+"$ git diff %s\n"
+"다ìŒì„ 실행하면\n"
+"$ git reset --hard\n"
+"복구ë©ë‹ˆë‹¤."
+
+#: builtin/pull.c:879
+msgid "Cannot merge multiple branches into empty head."
+msgstr "여러 브랜치를 빈 헤드로 병합할 수 없습니다."
+
+#: builtin/pull.c:883
+msgid "Cannot rebase onto multiple branches."
+msgstr "여러 브랜치로 리베ì´ìŠ¤í•  수 없습니다."
+
+#: builtin/push.c:16
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<옵션>] [<저장소> [<ë ˆí¼ëŸ°ìŠ¤ëª…세>...]]"
+
+#: builtin/push.c:88
+msgid "tag shorthand without <tag>"
+msgstr "<태그> ì—†ì´ íƒœê·¸ 줄임"
+
+#: builtin/push.c:98
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete ì˜µì…˜ì€ ì¼ë°˜ ëŒ€ìƒ ë ˆí¼ëŸ°ìŠ¤ ì´ë¦„만 받습니다"
+
+#: builtin/push.c:142
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr "\nì–´ëŠ í•œ 쪽 옵션만 ê³„ì† ì„ íƒí•˜ë ¤ë©´, 'git help config'ì—ì„œ push.default를 참고하십시오."
+
+#: builtin/push.c:145
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch. To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+" git push %s %s\n"
+"%s"
+msgstr ""
+"현재 ë¸Œëžœì¹˜ì˜ ì—…ìŠ¤íŠ¸ë¦¼ 브랜치가 현재 ë¸Œëžœì¹˜ì˜ ì´ë¦„ê³¼\n"
+"같지 않습니다. ë¦¬ëª¨íŠ¸ì˜ ì—…ìŠ¤íŠ¸ë¦¼ 브랜치로 푸시하려면\n"
+"다ìŒê³¼ ê°™ì´ í•˜ì‹­ì‹œì˜¤.\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"ë¦¬ëª¨íŠ¸ì˜ ê°™ì€ ì´ë¦„으로 푸시하려면 다ìŒê³¼ ê°™ì´ í•˜ì‹­ì‹œì˜¤.\n"
+"\n"
+" git push %s %s\n"
+"%s"
+
+#: builtin/push.c:160
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+" git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+"현재 ì–´ë–¤ 브랜치 위ì—ë„ ìžˆì§€ 않습니다.\n"
+"지금 현재 (HEAD 분리) ìƒíƒœê¹Œì§€ì˜ 커밋 ë‚´ì—­ì„ í‘¸ì‹œí•˜ë ¤ë©´\n"
+"다ìŒê³¼ ê°™ì´ í•˜ì‹­ì‹œì˜¤.\n"
+"\n"
+" git push %s HEAD:<name-of-remote-branch>\n"
+
+#: builtin/push.c:174
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+" git push --set-upstream %s %s\n"
+msgstr ""
+"현재 브랜치 %sì— ì—…ìŠ¤íŠ¸ë¦¼ 브랜치가 없습니다.\n"
+"현재 브랜치를 푸시하고 해당 리모트를 업스트림으로 지정하려면\n"
+"다ìŒê³¼ ê°™ì´ í•˜ì‹­ì‹œì˜¤.\n"
+"\n"
+" git push --set-upstream %s %s\n"
+
+#: builtin/push.c:182
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr "현재 브랜치 %sì— ì—¬ëŸ¬ 업스트림 브랜치가 있습니다. 푸시를 거절합니다."
+
+#: builtin/push.c:185
+#, c-format
+msgid ""
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+"'%s' 리모트로 푸시하는 중입니다. 하지만 ì´ ë¦¬ëª¨íŠ¸ëŠ” 현재\n"
+"'%s' ë¸Œëžœì¹˜ì˜ ì—…ìŠ¤íŠ¸ë¦¼ì´ ì•„ë‹™ë‹ˆë‹¤. ì–´ë–¤ 리모트 ë¸Œëžœì¹˜ì— ë¬´ì—‡ì„\n"
+"푸시할지 설정하지 않았습니다."
+
+#: builtin/push.c:208
+msgid ""
+"push.default is unset; its implicit value has changed in\n"
+"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
+"and maintain the traditional behavior, use:\n"
+"\n"
+" git config --global push.default matching\n"
+"\n"
+"To squelch this message and adopt the new behavior now, use:\n"
+"\n"
+" git config --global push.default simple\n"
+"\n"
+"When push.default is set to 'matching', git will push local branches\n"
+"to the remote branches that already exist with the same name.\n"
+"\n"
+"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
+"behavior, which only pushes the current branch to the corresponding\n"
+"remote branch that 'git pull' uses to update the current branch.\n"
+"\n"
+"See 'git help config' and search for 'push.default' for further "
+"information.\n"
+"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
+"'current' instead of 'simple' if you sometimes use older versions of Git)"
+msgstr ""
+"push.default를 설정하지 않았습니다. ë¬µì‹œì  ê°’ì€ ê¹ƒ 2.0ì—ì„œ\n"
+"'matching'ì—ì„œ 'simple'ë¡œ 바뀌었습니다. ì´ ë©”ì‹œì§€ë¥¼ 표시하지\n"
+"ì•Šê³  ê³¼ê±°ì˜ ë™ìž‘ì„ ìœ ì§€í•˜ë ¤ë©´ 다ìŒê³¼ ê°™ì´ í•˜ì‹­ì‹œì˜¤:\n"
+"\n"
+" git config --global push.default matching\n"
+"\n"
+"ì´ ë©”ì‹œì§€ë¥¼ 표시하지 ì•Šê³  새 ë™ìž‘ì„ ë°›ì•„ë“¤ì´ë ¤ë©´ 다ìŒê³¼ ê°™ì´\n"
+"하십시오:\n"
+"\n"
+" git config --global push.default simple\n"
+"\n"
+"push.defaultê°€ 'matching'으로 설정ë˜ë©´, 로컬 브랜치를 ì´ë¯¸ ê°™ì€ ì´ë¦„ì´\n"
+"있는 리모트 브랜치로 푸시합니다.\n"
+"\n"
+"깃 2.0부터 ë” ë³´ìˆ˜ì ì¸ 'simple' ë™ìž‘ì´ ê¸°ë³¸ê°’ìž…ë‹ˆë‹¤. 여기서는 현재\n"
+"브랜치를 'git pull'ì—ì„œ 현재 브랜치를 ì—…ë°ì´íŠ¸í•  ë•Œ 사용하는 해당\n"
+"리모트 브랜치로 푸시합니다.\n"
+"\n"
+"ë” ìžì„¸í•œ 정보는 'git help config'ì—ì„œ 'push.default' ì„¤ëª…ì„ ë³´ì‹­ì‹œì˜¤.\n"
+"('simple' 모드는 깃 1.7.11ì— ì¶”ê°€ë˜ì—ˆìŠµë‹ˆë‹¤. 과거 ë²„ì „ì˜ ê¹ƒì„ ì‚¬ìš©í•˜ê²Œ\n"
+"ë˜ë©´ 비슷한 'current' 모드를 사용하십시오.)"
+
+#: builtin/push.c:275
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr "푸시할 ë ˆí¼ëŸ°ìŠ¤ëª…세를 지정하지 않았고, push.default ê°’ì´ 'nothing'입니다."
+
+#: builtin/push.c:282
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"현재 ë¸Œëžœì¹˜ì˜ ëì´ ë¦¬ëª¨íŠ¸ 브랜치보다 ë’¤ì— ìžˆìœ¼ë¯€ë¡œ ì—…ë°ì´íŠ¸ê°€\n"
+"거부ë˜ì—ˆìŠµë‹ˆë‹¤. 푸시하기 ì „ì— ('git pull ...' 등 명령으로) 리모트\n"
+"변경 ì‚¬í•­ì„ í¬í•¨í•˜ì‹­ì‹œì˜¤.\n"
+"ìžì„¸í•œ 정보는 'git push --help'ì˜ \"Note about fast-forwards' 부분ì„\n"
+"참고하십시오."
+
+#: builtin/push.c:288
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"현재 ë¸Œëžœì¹˜ì˜ ëì´ ë¦¬ëª¨íŠ¸ 브랜치보다 ë’¤ì— ìžˆìœ¼ë¯€ë¡œ ì—…ë°ì´íŠ¸ê°€\n"
+"거부ë˜ì—ˆìŠµë‹ˆë‹¤. ì´ ë¸Œëžœì¹˜ë¥¼ ì²´í¬ì•„웃하고 푸시하기 ì „ì—\n"
+"('git pull ...' 등 명령으로) 리모트 변경 ì‚¬í•­ì„ í¬í•¨í•˜ì‹­ì‹œì˜¤.\n"
+"ìžì„¸í•œ 정보는 'git push --help'ì˜ \"Note about fast-forwards' 부분ì„\n"
+"참고하십시오."
+
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"ë¦¬ëª¨íŠ¸ì— ë¡œì»¬ì— ì—†ëŠ” ì‚¬í•­ì´ ë“¤ì–´ 있으므로 ì—…ë°ì´íŠ¸ê°€\n"
+"거부ë˜ì—ˆìŠµë‹ˆë‹¤. ì´ ìƒí™©ì€ 보통 ë˜ ë‹¤ë¥¸ 저장소ì—ì„œ ê°™ì€\n"
+"저장소로 푸시할 ë•Œ ë°œìƒí•©ë‹ˆë‹¤. 푸시하기 ì „ì—\n"
+"('git pull ...' 등 명령으로) 리모트 변경 ì‚¬í•­ì„ ë¨¼ì €\n"
+"í¬í•¨í•´ì•¼ 합니다.\n"
+"ìžì„¸í•œ 정보는 'git push --help'ì˜ \"Note about fast-forwards' 부분ì„\n"
+"참고하십시오."
+
+#: builtin/push.c:301
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr "ë¦¬ëª¨íŠ¸ì— íƒœê·¸ê°€ ì´ë¯¸ 있기 ë•Œë¬¸ì— ì—…ë°ì´íŠ¸ê°€ 거부ë˜ì—ˆìŠµë‹ˆë‹¤."
+
+#: builtin/push.c:304
+msgid ""
+"You cannot update a remote ref that points at a non-commit object,\n"
+"or update a remote ref to make it point at a non-commit object,\n"
+"without using the '--force' option.\n"
+msgstr ""
+"'--force' ì˜µì…˜ì´ ì—†ì´ ì»¤ë°‹ì´ ì•„ë‹Œ 오브ì íŠ¸ë¥¼ 가리키는 리모트\n"
+"ë ˆí¼ëŸ°ìŠ¤ë¥¼ ì—…ë°ì´íŠ¸í•˜ê±°ë‚˜, ì»¤ë°‹ì´ ì•„ë‹Œ 오브ì íŠ¸ë¥¼ 가리키ë„ë¡\n"
+"ì—…ë°ì´íŠ¸í•  수 없습니다.\n"
+
+#: builtin/push.c:363
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "다ìŒì— 푸시: %s\n"
+
+#: builtin/push.c:367
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ë¥¼ '%s'ì— í‘¸ì‹œí•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/push.c:397
+#, c-format
+msgid "bad repository '%s'"
+msgstr "ìž˜ëª»ëœ ì €ìž¥ì†Œ '%s'"
+
+#: builtin/push.c:398
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
+msgstr ""
+"푸시 대ìƒì„ 설정하지 않았습니다.\n"
+"명령해ì—ì„œ URLì„ ì§€ì •í•˜ê±°ë‚˜ 다ìŒì„ 사용해 리모트 저장소를 설정하십시오\n"
+"\n"
+" git remote add <ì´ë¦„> <URL>\n"
+"\n"
+"그리고 ì´ ë¦¬ëª¨íŠ¸ ì´ë¦„ì„ ì‚¬ìš©í•´ 푸시하십시오\n"
+"\n"
+" git push <name>\n"
+
+#: builtin/push.c:413
+msgid "--all and --tags are incompatible"
+msgstr "--all ë° --tags ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
+
+#: builtin/push.c:414
+msgid "--all can't be combined with refspecs"
+msgstr "--all ì˜µì…˜ì€ ë ˆí¼ëŸ°ìŠ¤ëª…세와 ê°™ì´ ì“¸ 수 없습니다"
+
+#: builtin/push.c:419
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror ë° --tags ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
+
+#: builtin/push.c:420
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror ì˜µì…˜ì€ ë ˆí¼ëŸ°ìŠ¤ëª…세와 ê°™ì´ ì“¸ 수 없습니다"
+
+#: builtin/push.c:425
+msgid "--all and --mirror are incompatible"
+msgstr "--all ë° --mirror ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
+
+#: builtin/push.c:537
+msgid "repository"
+msgstr "저장소"
+
+#: builtin/push.c:538 builtin/send-pack.c:161
+msgid "push all refs"
+msgstr "모든 ë ˆí¼ëŸ°ìŠ¤ 푸시하기"
+
+#: builtin/push.c:539 builtin/send-pack.c:163
+msgid "mirror all refs"
+msgstr "모든 ë ˆí¼ëŸ°ìŠ¤ 미러"
+
+#: builtin/push.c:541
+msgid "delete refs"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ ì‚­ì œ"
+
+#: builtin/push.c:542
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "태그 푸시하기 (--all ë˜ëŠ” --mirror 옵션과 ê°™ì´ ì“¸ 수 ì—†ìŒ)"
+
+#: builtin/push.c:545 builtin/send-pack.c:164
+msgid "force updates"
+msgstr "강제로 ì—…ë°ì´íŠ¸"
+
+#: builtin/push.c:547 builtin/send-pack.c:175
+msgid "refname>:<expect"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ì´ë¦„>:<예ìƒ"
+
+#: builtin/push.c:548 builtin/send-pack.c:176
+msgid "require old value of ref to be at this value"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ì˜ 과거 ê°’ì´ ì´ ê°’ì´ì–´ì•¼ 합니다"
+
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr "check|on-demand|no"
+
+#: builtin/push.c:551
+msgid "control recursive pushing of submodules"
+msgstr "ìž¬ê·€ì  í•˜ìœ„ 모듈 푸시 ë°©ì‹ì„ 설정합니다"
+
+#: builtin/push.c:553 builtin/send-pack.c:169
+msgid "use thin pack"
+msgstr "ì–‡ì€ ë¬¶ìŒì„ 사용합니다"
+
+#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
+#: builtin/send-pack.c:159
+msgid "receive pack program"
+msgstr "receive pack 프로그램"
+
+#: builtin/push.c:556
+msgid "set upstream for git pull/status"
+msgstr "git pull/statusì— ëŒ€í•œ ì—…ìŠ¤íŠ¸ë¦¼ì„ ì„¤ì •í•©ë‹ˆë‹¤"
+
+#: builtin/push.c:559
+msgid "prune locally removed refs"
+msgstr "로컬ì—ì„œ 제거한 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 잘ë¼ëƒ…니다"
+
+#: builtin/push.c:561
+msgid "bypass pre-push hook"
+msgstr "푸시 ì „ 후í¬ë¥¼ 건너ëœë‹ˆë‹¤"
+
+#: builtin/push.c:562
+msgid "push missing but relevant tags"
+msgstr "빠졌지만 ê´€ë ¨ëœ íƒœê·¸ë¥¼ 푸시합니다"
+
+#: builtin/push.c:565 builtin/send-pack.c:166
+msgid "GPG sign the push"
+msgstr "í‘¸ì‹œì— GPG 서명"
+
+#: builtin/push.c:567 builtin/send-pack.c:170
+msgid "request atomic transaction on remote side"
+msgstr "리모트 ìª½ì— ì›ìž íŠ¸ëžœìž­ì…˜ì„ ìš”ì²­í•©ë‹ˆë‹¤"
+
+#: builtin/push.c:577
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete ì˜µì…˜ì€ --all, --mirror, --tags 옵션과 호환ë˜ì§€ 않습니다"
+
+#: builtin/push.c:579
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete ì˜µì…˜ì€ ë ˆí¼ëŸ°ìŠ¤ ì—†ì´ ì•žë’¤ê°€ 맞지 않습니다"
+
+#: builtin/read-tree.c:37
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<ì ‘ë‘ì–´>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<파ì¼>] (--empty | <트리-따위> [<트리-따위2> [<트리-따위3>]])"
+
+#: builtin/read-tree.c:110
+msgid "write resulting index to <file>"
+msgstr "ê²°ê³¼ ì¸ë±ìŠ¤ë¥¼ <파ì¼>ì— ì”니다"
+
+#: builtin/read-tree.c:113
+msgid "only empty the index"
+msgstr "ì¸ë±ìŠ¤ë¥¼ 비우기만 합니다"
+
+#: builtin/read-tree.c:115
+msgid "Merging"
+msgstr "병합하기"
+
+#: builtin/read-tree.c:117
+msgid "perform a merge in addition to a read"
+msgstr "ì½ì€ ë‹¤ìŒ ë³‘í•©ì„ ìˆ˜í–‰í•©ë‹ˆë‹¤"
+
+#: builtin/read-tree.c:119
+msgid "3-way merge if no file level merging required"
+msgstr "íŒŒì¼ ë‹¨ìœ„ ë³‘í•©ì´ í•„ìš”í•˜ì§€ 않으면 3-ë°©í–¥ ë³‘í•©ì„ í•©ë‹ˆë‹¤"
+
+#: builtin/read-tree.c:121
+msgid "3-way merge in presence of adds and removes"
+msgstr "추가와 제거가 ìžˆì„ ë•Œ 3-ë°©í–¥ ë³‘í•©ì„ í•©ë‹ˆë‹¤"
+
+#: builtin/read-tree.c:123
+msgid "same as -m, but discard unmerged entries"
+msgstr "-mê³¼ ë™ì¼í•˜ì§€ë§Œ, 병합ë˜ì§€ ì•Šì€ í•­ëª©ì„ ë²„ë¦½ë‹ˆë‹¤"
+
+#: builtin/read-tree.c:124
+msgid "<subdirectory>/"
+msgstr "<하위디렉터리>/"
+
+#: builtin/read-tree.c:125
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "트리를 <하위디렉터리>/ 아래 ì¸ë±ìŠ¤ë¡œ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/read-tree.c:128
+msgid "update working tree with merge result"
+msgstr "ìž‘ì—… í´ë”를 병합 결과로 ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤"
+
+#: builtin/read-tree.c:130
+msgid "gitignore"
+msgstr "gitignore"
+
+#: builtin/read-tree.c:131
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "무시하는 파ì¼ì„ ë®ì–´ì“°ë„ë¡ ëª…ì‹œì ìœ¼ë¡œ 허용합니다"
+
+#: builtin/read-tree.c:134
+msgid "don't check the working tree after merging"
+msgstr "병합 í›„ì— ìž‘ì—… í´ë”를 확ì¸í•˜ì§€ 않습니다"
+
+#: builtin/read-tree.c:135
+msgid "don't update the index or the work tree"
+msgstr "ì¸ë±ìŠ¤ë‚˜ ìž‘ì—… í´ë”를 ì—…ë°ì´íŠ¸í•˜ì§€ 않습니다"
+
+#: builtin/read-tree.c:137
+msgid "skip applying sparse checkout filter"
+msgstr "드문 ì²´í¬ì•„웃 í•„í„° ì ìš©ì„ 건너ëœë‹ˆë‹¤"
+
+#: builtin/read-tree.c:139
+msgid "debug unpack-trees"
+msgstr "unpack-trees 디버깅"
+
+#: builtin/reflog.c:428
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' ê°’ì´ '%s'ì— ëŒ€í•´ 올바른 ì‹œê° ê°’ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: builtin/reflog.c:545 builtin/reflog.c:550
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr "'%s'ì€(는) 올바른 ì‹œê° ê°’ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: builtin/remote.c:12
+msgid "git remote [-v | --verbose]"
+msgstr "git remote [-v | --verbose]"
+
+#: builtin/remote.c:13
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+"git remote add [-t <브랜치>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <ì´ë¦„> <url>"
+
+#: builtin/remote.c:14 builtin/remote.c:34
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <옛ì´ë¦„> <새ì´ë¦„>"
+
+#: builtin/remote.c:15 builtin/remote.c:39
+msgid "git remote remove <name>"
+msgstr "git remote remove <ì´ë¦„>"
+
+#: builtin/remote.c:16 builtin/remote.c:44
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <ì´ë¦„> (-a | --auto | -d | --delete | <브랜치>)"
+
+#: builtin/remote.c:17
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <ì´ë¦„>"
+
+#: builtin/remote.c:18
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <ì´ë¦„>"
+
+#: builtin/remote.c:19
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<그룹> | <리모트>)...]"
+
+#: builtin/remote.c:20
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <ì´ë¦„> <브랜치>..."
+
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <ì´ë¦„>"
+
+#: builtin/remote.c:22 builtin/remote.c:75
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <ì´ë¦„> <새url> [<옛url>]"
+
+#: builtin/remote.c:23 builtin/remote.c:76
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <ì´ë¦„> <새url>"
+
+#: builtin/remote.c:24 builtin/remote.c:77
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <ì´ë¦„> <url>"
+
+#: builtin/remote.c:29
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<옵션>] <ì´ë¦„> <url>"
+
+#: builtin/remote.c:49
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <ì´ë¦„> <브랜치>..."
+
+#: builtin/remote.c:50
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <ì´ë¦„> <브랜치>..."
+
+#: builtin/remote.c:55
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<옵션>] <ì´ë¦„>"
+
+#: builtin/remote.c:60
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<옵션>] <ì´ë¦„>"
+
+#: builtin/remote.c:65
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<옵션>] [<그룹> | <리모트>]..."
+
+#: builtin/remote.c:94
+#, c-format
+msgid "Updating %s"
+msgstr "%s ì—…ë°ì´íŠ¸ 중"
+
+#: builtin/remote.c:126
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+"--mirror는 위험하므로 ì‚¬ìš©ì„ ê¶Œí•˜ì§€ 않습니다. 대신ì—\n"
+"\t --mirror=fetch ë˜ëŠ” --mirror=push를 사용하십시오"
+
+#: builtin/remote.c:143
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr "ì•Œ 수 없는 --mirror 옵션 ì¸ìž: %s"
+
+#: builtin/remote.c:159
+msgid "fetch the remote branches"
+msgstr "리모트 브랜치를 가져옵니다"
+
+#: builtin/remote.c:161
+msgid "import all tags and associated objects when fetching"
+msgstr "가져올 ë•Œ 모든 태그와 관련 오브ì íŠ¸ë¥¼ 가져옵니다"
+
+#: builtin/remote.c:164
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "아니면 아무 íƒœê·¸ë„ ê°€ì ¸ì˜¤ì§€ 않습니다 (--no-tags)"
+
+#: builtin/remote.c:166
+msgid "branch(es) to track"
+msgstr "추ì í•  브랜치"
+
+#: builtin/remote.c:167
+msgid "master branch"
+msgstr "마스터 브랜치"
+
+#: builtin/remote.c:168
+msgid "push|fetch"
+msgstr "push|fetch"
+
+#: builtin/remote.c:169
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr "리모트를 푸시 ë˜ëŠ” 가져올 ë•Œ 사용할 미러로 설정합니다"
+
+#: builtin/remote.c:181
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "--mirror 옵션과 ê°™ì´ ë§ˆìŠ¤í„° 브랜치를 지정하면 앞뒤가 맞지 않습니다"
+
+#: builtin/remote.c:183
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr "마스터 브랜치를 ì§€ì •ì€ fetch 미러ì—서만 앞뒤가 맞습니다"
+
+#: builtin/remote.c:193 builtin/remote.c:643
+#, c-format
+msgid "remote %s already exists."
+msgstr "%s 리모트가 ì´ë¯¸ 있습니다."
+
+#: builtin/remote.c:197 builtin/remote.c:647
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s'ì€(는) 올바른 리모트 ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: builtin/remote.c:241
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "마스터 '%s'ì„(를) 설정할 수 없습니다"
+
+#: builtin/remote.c:341
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr "%s ë ˆí¼ëŸ°ìŠ¤ëª…ì„¸ì— ëŒ€í•œ 가져오기 ë§µì„ ì–»ì„ ìˆ˜ 없습니다"
+
+#: builtin/remote.c:442 builtin/remote.c:450
+msgid "(matching)"
+msgstr "(ì¼ì¹˜)"
+
+#: builtin/remote.c:454
+msgid "(delete)"
+msgstr "(삭제)"
+
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
+#, c-format
+msgid "Could not append '%s' to '%s'"
+msgstr "'%s'ì„(를) '%s'ì— ì¶”ê°€í•  수 없습니다"
+
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
+#, c-format
+msgid "No such remote: %s"
+msgstr "그런 리모트가 없습니다: %s"
+
+#: builtin/remote.c:653
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr "설정 ì„¹ì…˜ì„ '%s'ì—ì„œ '%s'(으)ë¡œ 바꿀 수 없습니다"
+
+#: builtin/remote.c:659 builtin/remote.c:827
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "설정 섹션 '%s'ì„(를) 제거할 수 없습니다"
+
+#: builtin/remote.c:674
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"ê¸°ë³¸ê°’ì´ ì•„ë‹Œ 가져오기 ë ˆí¼ëŸ°ìŠ¤ëª…세를 ì—…ë°ì´íŠ¸í•˜ì§€ 않습니다\n"
+"\t%s\n"
+"\t필요하면 ì„¤ì •ì„ ìˆ˜ë™ìœ¼ë¡œ ì—…ë°ì´íŠ¸í•˜ì‹­ì‹œì˜¤."
+
+#: builtin/remote.c:680
+#, c-format
+msgid "Could not append '%s'"
+msgstr "'%s'ì— ë§ë¶™ì¼ 수 없습니다"
+
+#: builtin/remote.c:691
+#, c-format
+msgid "Could not set '%s'"
+msgstr "'%s'ì„(를) 설정할 수 없습니다"
+
+#: builtin/remote.c:713
+#, c-format
+msgid "deleting '%s' failed"
+msgstr "'%s' 삭제가 실패했습니다"
+
+#: builtin/remote.c:747
+#, c-format
+msgid "creating '%s' failed"
+msgstr "'%s' 만들기가 실패했습니다"
+
+#: builtin/remote.c:813
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] ""
+"알림: ë ˆí¼ëŸ°ìŠ¤/리모트/ 계층 구조 ë°–ì— ìžˆëŠ” ì¼ë¶€ 브랜치가 제거ë˜ì§€ 않았습니다.\n"
+"삭제하려면 다ìŒì„ 사용하십시오:"
+
+#: builtin/remote.c:928
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " 새 항목 (ë‹¤ìŒ ê°€ì ¸ì˜¤ê¸°ëŠ” remotes/%s 아래 저장ë©ë‹ˆë‹¤)"
+
+#: builtin/remote.c:931
+msgid " tracked"
+msgstr " 추ì ë¨"
+
+#: builtin/remote.c:933
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " ì˜¤ëž˜ë¨ (제거하려면 'git remote prune'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: builtin/remote.c:935
+msgid " ???"
+msgstr " ???"
+
+#: builtin/remote.c:976
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr "ìž˜ëª»ëœ branch.%s.merge ê°’. 여러 ê°œ 브랜치로 리베ì´ìŠ¤í•  수 없습니다"
+
+#: builtin/remote.c:983
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "리베ì´ìŠ¤: 리모트 %s"
+
+#: builtin/remote.c:986
+#, c-format
+msgid " merges with remote %s"
+msgstr " 병합: 리모트 %s"
+
+#: builtin/remote.c:987
+msgid " and with remote"
+msgstr " 그리고 리모트"
+
+#: builtin/remote.c:989
+#, c-format
+msgid "merges with remote %s"
+msgstr "병합: 리모트 %s"
+
+#: builtin/remote.c:990
+msgid " and with remote"
+msgstr " 그리고 리모트"
+
+#: builtin/remote.c:1036
+msgid "create"
+msgstr "만들기"
+
+#: builtin/remote.c:1039
+msgid "delete"
+msgstr "삭제"
+
+#: builtin/remote.c:1043
+msgid "up to date"
+msgstr "최신 ìƒíƒœ"
+
+#: builtin/remote.c:1046
+msgid "fast-forwardable"
+msgstr "정방향 진행 가능"
+
+#: builtin/remote.c:1049
+msgid "local out of date"
+msgstr "ë¡œì»¬ì´ ë’¤ë–¨ì–´ì§"
+
+#: builtin/remote.c:1056
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
+msgstr " %-*sì—ì„œ %-*s(으)ë¡œ ê°•ì œ (%s)"
+
+#: builtin/remote.c:1059
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
+msgstr " %-*sì—ì„œ %-*s(으)ë¡œ 푸시 (%s)"
+
+#: builtin/remote.c:1063
+#, c-format
+msgid " %-*s forces to %s"
+msgstr " %-*sì—ì„œ %s(으)ë¡œ ê°•ì œ"
+
+#: builtin/remote.c:1066
+#, c-format
+msgid " %-*s pushes to %s"
+msgstr " %-*sì—ì„œ %s(으)ë¡œ 푸시"
+
+#: builtin/remote.c:1134
+msgid "do not query remotes"
+msgstr "ë¦¬ëª¨íŠ¸ì— ì§ˆì˜í•˜ì§€ 않습니다"
+
+#: builtin/remote.c:1161
+#, c-format
+msgid "* remote %s"
+msgstr "* 리모트 %s"
+
+#: builtin/remote.c:1162
+#, c-format
+msgid " Fetch URL: %s"
+msgstr " 가져오기 URL: %s"
+
+#: builtin/remote.c:1163 builtin/remote.c:1314
+msgid "(no URL)"
+msgstr "(URL ì—†ìŒ)"
+
+#: builtin/remote.c:1172 builtin/remote.c:1174
+#, c-format
+msgid " Push URL: %s"
+msgstr " 푸시 URL: %s"
+
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
+#, c-format
+msgid " HEAD branch: %s"
+msgstr " HEAD 브랜치: %s"
+
+#: builtin/remote.c:1182
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr " HEAD 브랜치 (리모트 HEAD는 애매하고, ë‹¤ìŒ ì¤‘ í•˜ë‚˜ì¼ ìˆ˜ 있습니다):\n"
+
+#: builtin/remote.c:1194
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] " 리모트 브랜치:%s"
+
+#: builtin/remote.c:1197 builtin/remote.c:1224
+msgid " (status not queried)"
+msgstr " (ìƒíƒœë¥¼ 질ì˜í•˜ì§€ ì•ŠìŒ)"
+
+#: builtin/remote.c:1206
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
+msgstr[0] " 'git pull'ì— ì‚¬ìš©í•  로컬 브랜치를 설정:"
+
+#: builtin/remote.c:1214
+msgid " Local refs will be mirrored by 'git push'"
+msgstr " 로컬 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 'git push'ë¡œ 미러ë§í•  예정"
+
+#: builtin/remote.c:1221
+#, c-format
+msgid " Local ref configured for 'git push'%s:"
+msgid_plural " Local refs configured for 'git push'%s:"
+msgstr[0] " 로컬 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 'git push'ë¡œ 미러ë§%s:"
+
+#: builtin/remote.c:1242
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "ë ˆí¼ëŸ°ìŠ¤/리모트/<ì´ë¦„>/HEAD ê°’ì„ ë¦¬ëª¨íŠ¸ì— ë§žê²Œ 설정합니다"
+
+#: builtin/remote.c:1244
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "ë ˆí¼ëŸ°ìŠ¤/리모트/<ì´ë¦„>/HEAD ê°’ì„ ì‚­ì œí•©ë‹ˆë‹¤"
+
+#: builtin/remote.c:1259
+msgid "Cannot determine remote HEAD"
+msgstr "리모트 HEAD를 결정할 수 없습니다"
+
+#: builtin/remote.c:1261
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr "리모트 HEAD 브랜치가 여러개입니다. ë‹¤ìŒ ì¤‘ 하나를 명시ì ìœ¼ë¡œ 지정하십시오:"
+
+#: builtin/remote.c:1271
+#, c-format
+msgid "Could not delete %s"
+msgstr "%sì„(를) 삭제할 수 없습니다"
+
+#: builtin/remote.c:1279
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "올바른 ë ˆí¼ëŸ°ìŠ¤ê°€ 아닙니다: %s"
+
+#: builtin/remote.c:1281
+#, c-format
+msgid "Could not setup %s"
+msgstr "%sì„(를) 설정할 수 없습니다"
+
+#: builtin/remote.c:1299
+#, c-format
+msgid " %s will become dangling!"
+msgstr " %sì˜ ì—°ê²°ì´ ëŠì–´ì§‘니다!"
+
+#: builtin/remote.c:1300
+#, c-format
+msgid " %s has become dangling!"
+msgstr " %sì˜ ì—°ê²°ì´ ëŠì–´ì¡ŒìŠµë‹ˆë‹¤!"
+
+#: builtin/remote.c:1310
+#, c-format
+msgid "Pruning %s"
+msgstr "잘ë¼ëƒ„: %s"
+
+#: builtin/remote.c:1311
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: builtin/remote.c:1327
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * [잘ë¼ë‚¼ 예정] %s"
+
+#: builtin/remote.c:1330
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [잘ë¼ëƒ„] %s"
+
+#: builtin/remote.c:1375
+msgid "prune remotes after fetching"
+msgstr "가져온 í›„ì— ë¦¬ëª¨íŠ¸ë¥¼ 잘ë¼ëƒ…니다"
+
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
+#, c-format
+msgid "No such remote '%s'"
+msgstr "그런 리모트가 없습니다 ('%s')"
+
+#: builtin/remote.c:1461
+msgid "add branch"
+msgstr "브랜치를 추가합니다"
+
+#: builtin/remote.c:1468
+msgid "no remote specified"
+msgstr "리모트를 지정하지 않았습니다"
+
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr "가져오기 URLì´ ì•„ë‹ˆë¼ í‘¸ì‹œ URLì„ ì§ˆì˜í•©ë‹ˆë‹¤"
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr "모든 URLì„ ë¦¬í„´í•©ë‹ˆë‹¤"
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "'%s' ë¦¬ëª¨íŠ¸ì— ëŒ€í•œ URLì„ ì„¤ì •í•˜ì§€ 않았습니다"
+
+#: builtin/remote.c:1541
+msgid "manipulate push URLs"
+msgstr "푸시 URLì„ ì§€ì •í•©ë‹ˆë‹¤"
+
+#: builtin/remote.c:1543
+msgid "add URL"
+msgstr "URLì„ ì¶”ê°€í•©ë‹ˆë‹¤"
+
+#: builtin/remote.c:1545
+msgid "delete URLs"
+msgstr "URLì„ ì‚­ì œí•©ë‹ˆë‹¤"
+
+#: builtin/remote.c:1552
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete ì˜µì…˜ì„ ë‘˜ë‹¤ ì“°ë©´ 안 ë©ë‹ˆë‹¤"
+
+#: builtin/remote.c:1592
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "ìž˜ëª»ëœ ì˜¤ëž˜ì „ URL 패턴: %s"
+
+#: builtin/remote.c:1600
+#, c-format
+msgid "No such URL found: %s"
+msgstr "그런 URLì´ ì—†ìŠµë‹ˆë‹¤: %s"
+
+#: builtin/remote.c:1602
+msgid "Will not delete all non-push URLs"
+msgstr "í‘¸ì‹œìš©ì´ ì•„ë‹Œ 모든 URLì„ ì‚­ì œí•˜ì§€ 않습니다"
+
+#: builtin/remote.c:1616
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ìžì„¸ížˆ 표시합니다 (하위 명령 ì•žì— ì™€ì•¼ 합니다)"
+
+#: builtin/repack.c:17
+msgid "git repack [<options>]"
+msgstr "git repack [<옵션>]"
+
+#: builtin/repack.c:159
+msgid "pack everything in a single pack"
+msgstr "í•˜ë‚˜ì˜ ë¬¶ìŒ ì•ˆì— ëª¨ë‘ ë¬¶ìŠµë‹ˆë‹¤"
+
+#: builtin/repack.c:161
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "-a와 ë™ì¼í•˜ê³ , ì ‘ê·¼ 불가능 오브ì íŠ¸ë¥¼ ëŠìŠ¨í•˜ê²Œ 바꿉니다"
+
+#: builtin/repack.c:164
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "ì—¬ë¶„ì˜ ë¬¶ìŒì„ 제거하고, git-prune-packed를 실행합니다"
+
+#: builtin/repack.c:166
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "git-pack-objectsì— --no-reuse-delta ì˜µì…˜ì„ ë„˜ê¹ë‹ˆë‹¤"
+
+#: builtin/repack.c:168
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "git-pack-objectsì— --no-reuse-object ì˜µì…˜ì„ ë„˜ê¹ë‹ˆë‹¤"
+
+#: builtin/repack.c:170
+msgid "do not run git-update-server-info"
+msgstr "git-update-server-info를 실행하지 않습니다"
+
+#: builtin/repack.c:173
+msgid "pass --local to git-pack-objects"
+msgstr "git-pack-objectsì— --local ì˜µì…˜ì„ ë„˜ê¹ë‹ˆë‹¤"
+
+#: builtin/repack.c:175
+msgid "write bitmap index"
+msgstr "비트맵 ì¸ë±ìŠ¤ë¥¼ ì”니다"
+
+#: builtin/repack.c:176
+msgid "approxidate"
+msgstr "대략ì˜ì‹œê°"
+
+#: builtin/repack.c:177
+msgid "with -A, do not loosen objects older than this"
+msgstr "-Aì— ì¶”ê°€ë¡œ, 지정한 ì‹œê°ë³´ë‹¤ ì˜¤ëž˜ëœ ì˜¤ë¸Œì íŠ¸ë¥¼ ëŠìŠ¨í•˜ê²Œ 만들지 않습니다"
+
+#: builtin/repack.c:179
+msgid "size of the window used for delta compression"
+msgstr "ë¸íƒ€ ì••ì¶•ì— ì‚¬ìš©í•  윈ë„ìš° í¬ê¸°"
+
+#: builtin/repack.c:180 builtin/repack.c:184
+msgid "bytes"
+msgstr "ë°”ì´íŠ¸ìˆ˜"
+
+#: builtin/repack.c:181
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr "위와 ë™ì¼í•˜ì§€ë§Œ, 항목 수 대신 메모리 í¬ê¸°ë¥¼ 제한합니다"
+
+#: builtin/repack.c:183
+msgid "limits the maximum delta depth"
+msgstr "최대 ë¸íƒ€ 깊ì´ë¥¼ 제한합니다"
+
+#: builtin/repack.c:185
+msgid "maximum size of each packfile"
+msgstr "ë¬¶ìŒ íŒŒì¼ì˜ 최대 í¬ê¸°"
+
+#: builtin/repack.c:187
+msgid "repack objects in packs marked with .keep"
+msgstr ".keep으로 í‘œì‹œëœ ë¬¶ìŒì˜ 오브ì íŠ¸ë¥¼ 다시 묶습니다"
+
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "precious-objects ì €ìž¥ì†Œì˜ ë¬¶ìŒì„ 삭제할 수 없습니다"
+
+#: builtin/repack.c:381
+#, c-format
+msgid "removing '%s' failed"
+msgstr "'%s' 제거가 실패했습니다"
+
+#: builtin/replace.c:19
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <오브ì íŠ¸> <대체ì´ë¦„>"
+
+#: builtin/replace.c:20
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <오브ì íŠ¸>"
+
+#: builtin/replace.c:21
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <커밋> [<ìƒìœ„>...]"
+
+#: builtin/replace.c:22
+msgid "git replace -d <object>..."
+msgstr "git replace -d <오브ì íŠ¸>..."
+
+#: builtin/replace.c:23
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<형ì‹>] [-l [<패턴>]]"
+
+#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#, c-format
+msgid "Not a valid object name: '%s'"
+msgstr "올바른 오브ì íŠ¸ ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤: '%s'"
+
+#: builtin/replace.c:355
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "커밋 '%s'ì— ìž˜ëª»ëœ ë³‘í•©íƒœê·¸"
+
+#: builtin/replace.c:357
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "커밋 '%s'ì— ìž˜ëª»ëœ í˜•ì‹ì˜ 병합태그"
+
+#: builtin/replace.c:368
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr "본래 커밋 '%s'ì— ë²„ë ¤ì§„ 병합태그 '%s'ì´(ê°€) 들어 있습니다. --graft 대신 --edit ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤"
+
+#: builtin/replace.c:401
+#, c-format
+msgid "the original commit '%s' has a gpg signature."
+msgstr "본래 커밋 '%s'ì— GPG ì„œëª…ì´ ìžˆìŠµë‹ˆë‹¤."
+
+#: builtin/replace.c:402
+msgid "the signature will be removed in the replacement commit!"
+msgstr "대체 커밋ì—ì„œ ì„œëª…ì„ ì œê±°í•©ë‹ˆë‹¤!"
+
+#: builtin/replace.c:408
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "다ìŒì— 대한 대체 ì»¤ë°‹ì„ ì“¸ 수 없습니다: '%s'"
+
+#: builtin/replace.c:432
+msgid "list replace refs"
+msgstr "대체 ë ˆí¼ëŸ°ìŠ¤ 목ë¡ì„ 표시합니다"
+
+#: builtin/replace.c:433
+msgid "delete replace refs"
+msgstr "대체 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 삭제합니다"
+
+#: builtin/replace.c:434
+msgid "edit existing object"
+msgstr "현재 오브ì íŠ¸ë¥¼ 편집합니다"
+
+#: builtin/replace.c:435
+msgid "change a commit's parents"
+msgstr "ì»¤ë°‹ì˜ ìƒìœ„ í•­ëª©ì„ ë°”ê¿‰ë‹ˆë‹¤"
+
+#: builtin/replace.c:436
+msgid "replace the ref if it exists"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ê°€ 있으면 대체합니다"
+
+#: builtin/replace.c:437
+msgid "do not pretty-print contents for --edit"
+msgstr "--editì— ëŒ€í•œ ë‚´ìš©ì„ ì˜ˆì˜ê²Œ 표시하지 않습니다"
+
+#: builtin/replace.c:438
+msgid "use this format"
+msgstr "ì´ í˜•ì‹ì„ 사용합니다"
+
+#: builtin/rerere.c:12
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget <경로>... | status | remaining | diff | gc]"
+
+#: builtin/rerere.c:58
+msgid "register clean resolutions in index"
+msgstr "ì¸ë±ìŠ¤ì— ê¹”ë”í•œ í•´ê²°ì„ ë“±ë¡í•©ë‹ˆë‹¤"
+
+#: builtin/reset.c:26
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<커밋>]"
+
+#: builtin/reset.c:27
+msgid "git reset [-q] <tree-ish> [--] <paths>..."
+msgstr "git reset [-q] <트리-따위> [--] <경로>..."
+
+#: builtin/reset.c:28
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr "git reset --patch [<트리-따위>] [--] [<경로>...]"
+
+#: builtin/reset.c:34
+msgid "mixed"
+msgstr "혼합"
+
+#: builtin/reset.c:34
+msgid "soft"
+msgstr "소프트"
+
+#: builtin/reset.c:34
+msgid "hard"
+msgstr "하드"
+
+#: builtin/reset.c:34
+msgid "merge"
+msgstr "병합"
+
+#: builtin/reset.c:34
+msgid "keep"
+msgstr "유지"
+
+#: builtin/reset.c:74
+msgid "You do not have a valid HEAD."
+msgstr "올바른 HEAD가 없습니다."
+
+#: builtin/reset.c:76
+msgid "Failed to find tree of HEAD."
+msgstr "HEADì˜ íŠ¸ë¦¬ë¥¼ ì°¾ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/reset.c:82
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "%sì˜ íŠ¸ë¦¬ë¥¼ ì°¾ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/reset.c:100
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEADì˜ í˜„ìž¬ 위치는 %s입니다"
+
+#: builtin/reset.c:183
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr "병합 ì¤‘ì— %s ë¦¬ì…‹ì„ í•  수 없습니다."
+
+#: builtin/reset.c:276
+msgid "be quiet, only report errors"
+msgstr "간략히 표시, 오류만 표시합니다"
+
+#: builtin/reset.c:278
+msgid "reset HEAD and index"
+msgstr "HEAD와 ì¸ë±ìŠ¤ë¥¼ 리셋합니다"
+
+#: builtin/reset.c:279
+msgid "reset only HEAD"
+msgstr "HEAD만 리셋합니다"
+
+#: builtin/reset.c:281 builtin/reset.c:283
+msgid "reset HEAD, index and working tree"
+msgstr "HEAD, ì¸ë±ìŠ¤, ìž‘ì—…í´ë”를 리셋합니다"
+
+#: builtin/reset.c:285
+msgid "reset HEAD but keep local changes"
+msgstr "HEAD를 리셋하지만 로컬 변경 ì‚¬í•­ì„ ë‚¨ê²¨ë‘¡ë‹ˆë‹¤"
+
+#: builtin/reset.c:288
+msgid "record only the fact that removed paths will be added later"
+msgstr "제거한 경로를 ë‚˜ì¤‘ì— ì¶”ê°€í•œë‹¤ëŠ” 사실만 기ë¡í•©ë‹ˆë‹¤"
+
+#: builtin/reset.c:305
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "'%s'ì„(를) 올바른 리비전으로 ì°¾ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/reset.c:313
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "'%s'ì„(를) 올바른 트리로 ì°¾ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/reset.c:322
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr "--patch ì˜µì…˜ì€ --{hard,mixed,soft} 옵션과 호환ë˜ì§€ 않습니다"
+
+#: builtin/reset.c:331
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr "--mixed ì˜µì…˜ì„ ê²½ë¡œì™€ ê°™ì´ ì“°ê¸°ëŠ” ì œê±°ë  ì˜ˆì •ìž…ë‹ˆë‹¤. ëŒ€ì‹ ì— 'git reset -- <경로>'를 사용하십시오."
+
+#: builtin/reset.c:333
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "경로와 ê°™ì´ %s ë¦¬ì…‹ì„ í•  수 없습니다."
+
+#: builtin/reset.c:343
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr "%s ë¦¬ì…‹ì€ ê°„ëžµí•œ 저장소ì—서만 쓸 수 있습니다"
+
+#: builtin/reset.c:347
+msgid "-N can only be used with --mixed"
+msgstr "-N ì˜µì…˜ì€ --mixed 옵션과 ê°™ì´ ì¨ì•¼ë§Œ 합니다"
+
+#: builtin/reset.c:364
+msgid "Unstaged changes after reset:"
+msgstr "리셋 ë’¤ì— ìŠ¤í…Œì´ì§•í•˜ì§€ ì•Šì€ ë³€ê²½ 사항:"
+
+#: builtin/reset.c:370
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "ì¸ë±ìŠ¤ 파ì¼ì„ '%s' 리비전으로 리셋할 수 없습니다."
+
+#: builtin/reset.c:374
+msgid "Could not write new index file."
+msgstr "새 ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다."
+
+#: builtin/rev-list.c:354
+msgid "rev-list does not support display of notes"
+msgstr "rev-list는 노트 표시를 지ì›í•˜ì§€ 않습니다"
+
+#: builtin/rev-parse.c:358
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<옵션>] -- [<ì¸ìž>...]"
+
+#: builtin/rev-parse.c:363
+msgid "keep the `--` passed as an arg"
+msgstr "ì¸ìžë¡œ 넘긴 `--`를 유지합니다"
+
+#: builtin/rev-parse.c:365
+msgid "stop parsing after the first non-option argument"
+msgstr "첫번째 ì˜µì…˜ì´ ì•„ë‹Œ ì¸ìž ë’¤ì— íŒŒì‹±ì„ ì¤‘ì§€í•©ë‹ˆë‹¤"
+
+#: builtin/rev-parse.c:368
+msgid "output in stuck long form"
+msgstr "stuck long 형ì‹ìœ¼ë¡œ 출력합니다"
+
+#: builtin/rev-parse.c:499
+msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+" or: git rev-parse --sq-quote [<arg>...]\n"
+" or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+"git rev-parse --parseopt [<옵션>] -- [<ì¸ìž>...]\n"
+" or: git rev-parse --sq-quote [<ì¸ìž>...]\n"
+" or: git rev-parse [<옵션>] [<ì¸ìž>...]\n"
+"\n"
+"첫번째 ì‚¬ìš©ë°©ë²•ì— ëŒ€í•´ ìžì„¸ížˆ 알고 싶으면, \"git rev-parse --parseopt -h\"를\n"
+"실행해 보십시오."
+
+#: builtin/revert.c:22
+msgid "git revert [<options>] <commit-ish>..."
+msgstr "git revert [<옵션>] <커밋-따위>..."
+
+#: builtin/revert.c:23
+msgid "git revert <subcommand>"
+msgstr "git revert <하위명령>"
+
+#: builtin/revert.c:28
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<옵션>] <커밋-따위>..."
+
+#: builtin/revert.c:29
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <하위명령>"
+
+#: builtin/revert.c:71
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr "%s: %sì€(는) %s와(ê³¼) ê°™ì´ ì“¸ 수 없습니다"
+
+#: builtin/revert.c:80
+msgid "end revert or cherry-pick sequence"
+msgstr "ë˜ëŒë¦¬ê¸° ë˜ëŠ” 커밋 빼오기 ì—°ì†ì„ ë냅니다"
+
+#: builtin/revert.c:81
+msgid "resume revert or cherry-pick sequence"
+msgstr "ë˜ëŒë¦¬ê¸° ë˜ëŠ” 커밋 빼오기 ì—°ì†ì„ 계ì†í•©ë‹ˆë‹¤"
+
+#: builtin/revert.c:82
+msgid "cancel revert or cherry-pick sequence"
+msgstr "ë˜ëŒë¦¬ê¸° ë˜ëŠ” 커밋 빼오기 ì—°ì†ì„ 취소합니다"
+
+#: builtin/revert.c:83
+msgid "don't automatically commit"
+msgstr "ìžë™ìœ¼ë¡œ 커밋하지 않습니다"
+
+#: builtin/revert.c:84
+msgid "edit the commit message"
+msgstr "커밋 메시지를 편집합니다"
+
+#: builtin/revert.c:87
+msgid "parent number"
+msgstr "ì´ì „ 커밋 번호"
+
+#: builtin/revert.c:89
+msgid "merge strategy"
+msgstr "병합 전략"
+
+#: builtin/revert.c:90
+msgid "option"
+msgstr "옵션"
+
+#: builtin/revert.c:91
+msgid "option for merge strategy"
+msgstr "병합 전략 옵션"
+
+#: builtin/revert.c:104
+msgid "append commit name"
+msgstr "커밋 ì´ë¦„ì„ ë’¤ì— ë¶™ìž…ë‹ˆë‹¤"
+
+#: builtin/revert.c:106
+msgid "preserve initially empty commits"
+msgstr "최초 빈 ì»¤ë°‹ì„ ìœ ì§€í•©ë‹ˆë‹¤"
+
+#: builtin/revert.c:107
+msgid "allow commits with empty messages"
+msgstr "빈 메시지로 ì»¤ë°‹ì„ í—ˆìš©í•©ë‹ˆë‹¤"
+
+#: builtin/revert.c:108
+msgid "keep redundant, empty commits"
+msgstr "ì—¬ë¶„ì˜ ë¹ˆ ì»¤ë°‹ì„ ìœ ì§€í•©ë‹ˆë‹¤"
+
+#: builtin/revert.c:112
+msgid "program error"
+msgstr "프로그램 오류"
+
+#: builtin/revert.c:197
+msgid "revert failed"
+msgstr "ë˜ëŒë¦¬ê¸° 실패"
+
+#: builtin/revert.c:212
+msgid "cherry-pick failed"
+msgstr "cherry-pick 실패"
+
+#: builtin/rm.c:17
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<옵션>] [--] <파ì¼>..."
+
+#: builtin/rm.c:65
+msgid ""
+"the following submodule (or one of its nested submodules)\n"
+"uses a .git directory:"
+msgid_plural ""
+"the following submodules (or one of their nested submodules)\n"
+"use a .git directory:"
+msgstr[0] ""
+"ë‹¤ìŒ í•˜ìœ„ ëª¨ë“ˆì´ (ë˜ëŠ” ê·¸ 내부 하위 모듈ì´) .git\n"
+"디렉터리를 사용합니다:"
+
+#: builtin/rm.c:71
+msgid ""
+"\n"
+"(use 'rm -rf' if you really want to remove it including all of its history)"
+msgstr "\n(ì •ë§ë¡œ ê·¸ 커밋 내역까지 í¬í•¨í•´ 제거하려면 'rm -rf'를 사용하십시오)"
+
+#: builtin/rm.c:230
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] ""
+"ë‹¤ìŒ íŒŒì¼ì— 파ì¼ê³¼ HEAD ëª¨ë‘ ë‹¤ë¥¸ 스테ì´ì§•í•œ ë‚´ìš©ì´\n"
+"있습니다:"
+
+#: builtin/rm.c:235
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"(강제로 제거하려면 -f ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: builtin/rm.c:239
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] "ë‹¤ìŒ íŒŒì¼ì´ ì¸ë±ìŠ¤ì— 스테ì´ì§•í•œ 변경 ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤:"
+
+#: builtin/rm.c:243 builtin/rm.c:254
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr "\n(파ì¼ì„ 유지하려면 --cached 옵션, 강제로 제거하려면 -f ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
+
+#: builtin/rm.c:251
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "ë‹¤ìŒ íŒŒì¼ì— 로컬 수정 ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤:"
+
+#: builtin/rm.c:269
+msgid "do not list removed files"
+msgstr "제거한 íŒŒì¼ ëª©ë¡ì„ 표시하지 않습니다"
+
+#: builtin/rm.c:270
+msgid "only remove from the index"
+msgstr "ì¸ë±ìŠ¤ì—서만 제거합니다"
+
+#: builtin/rm.c:271
+msgid "override the up-to-date check"
+msgstr "최신 버전 확ì¸ì„ 하지 않습니다"
+
+#: builtin/rm.c:272
+msgid "allow recursive removal"
+msgstr "ìž¬ê·€ì  ì œê±°ë¥¼ 허용합니다"
+
+#: builtin/rm.c:274
+msgid "exit with a zero status even if nothing matched"
+msgstr "아무 ê²ƒë„ ì¼ì¹˜í•˜ì§€ 않으면 ìƒíƒœ 0번으로 ë납니다"
+
+#: builtin/rm.c:317
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr "계ì†í•˜ë ¤ë©´ .gitmodulesì˜ ë³€ê²½ ì‚¬í•­ì„ ìŠ¤í…Œì´ì§•í•˜ê±°ë‚˜ stash하십시오"
+
+#: builtin/rm.c:335
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "-r ì˜µì…˜ì´ ì—†ìœ¼ë©´ 재귀ì ìœ¼ë¡œ '%s'ì„(를) 제거하지 않습니다"
+
+#: builtin/rm.c:374
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr "git rm: %sì„(를) 제거할 수 없습니다"
+
+#: builtin/send-pack.c:18
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+" --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<호스트>:]<디렉터리> [<ë ˆí¼ëŸ°ìŠ¤>...]\n"
+" --all 옵션과 명시ì ì¸ <ë ˆí¼ëŸ°ìŠ¤> 명세 중 하나만 사용할 수 있습니다."
+
+#: builtin/send-pack.c:160
+msgid "remote name"
+msgstr "리모트 ì´ë¦„"
+
+#: builtin/send-pack.c:171
+msgid "use stateless RPC protocol"
+msgstr "ìƒíƒœ 없는 RPC í”„ë¡œí† ì½œì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
+
+#: builtin/send-pack.c:172
+msgid "read refs from stdin"
+msgstr "표준 ìž…ë ¥ì—ì„œ ë ˆí¼ëŸ°ìŠ¤ë¥¼ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/send-pack.c:173
+msgid "print status from remote helper"
+msgstr "리모트 ë„움 í”„ë¡œê·¸ëž¨ì˜ ìƒíƒœë¥¼ 표시합니다"
+
+#: builtin/shortlog.c:13
+msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+msgstr "git shortlog [<옵션>] [<리비전-범위>] [[--] [<경로>...]]"
+
+#: builtin/shortlog.c:131
+#, c-format
+msgid "Missing author: %s"
+msgstr "ìž‘ì„±ìž ì •ë³´ê°€ 없습니다: %s"
+
+#: builtin/shortlog.c:230
+msgid "sort output according to the number of commits per author"
+msgstr "작성ìžë³„ 커밋 ìˆ˜ì— ë”°ë¼ ì •ë ¬í•©ë‹ˆë‹¤"
+
+#: builtin/shortlog.c:232
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr "커밋 ì„¤ëª…ì„ ìƒëžµí•˜ê³ , 커밋 수만 표시합니다"
+
+#: builtin/shortlog.c:234
+msgid "Show the email address of each author"
+msgstr "작성ìžì˜ ì „ìžë©”ì¼ ì£¼ì†Œë¥¼ 표시합니다"
+
+#: builtin/shortlog.c:235
+msgid "w[,i1[,i2]]"
+msgstr "w[,i1[,i2]]"
+
+#: builtin/shortlog.c:236
+msgid "Linewrap output"
+msgstr "줄바꿈 출력"
+
+#: builtin/show-branch.c:10
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+msgstr ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<ì‹œê°>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<리비전> | <glob>)...]"
+
+#: builtin/show-branch.c:14
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<ë² ì´ìŠ¤>]] [--list] [<ë ˆí¼ëŸ°ìŠ¤>]"
+
+#: builtin/show-branch.c:640
+msgid "show remote-tracking and local branches"
+msgstr "리모트 ì¶”ì  ë° ë¡œì»¬ 브랜치를 표시합니다"
+
+#: builtin/show-branch.c:642
+msgid "show remote-tracking branches"
+msgstr "리모트 ì¶”ì  ë¸Œëžœì¹˜ë¥¼ 표시합니다"
+
+#: builtin/show-branch.c:644
+msgid "color '*!+-' corresponding to the branch"
+msgstr "ë¸Œëžœì¹˜ì— ë”°ë¥¸ '*!+-' í‘œì‹œì— ìƒ‰ì„ ìž…íž™ë‹ˆë‹¤"
+
+#: builtin/show-branch.c:646
+msgid "show <n> more commits after the common ancestor"
+msgstr "공통 ì´ì „ 커밋 ë’¤ì˜ <n>ê°œì˜ ì»¤ë°‹ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/show-branch.c:648
+msgid "synonym to more=-1"
+msgstr "--more=-1 옵션과 ë™ì¼"
+
+#: builtin/show-branch.c:649
+msgid "suppress naming strings"
+msgstr "ì´ë¦„ 문ìžì—´ì„ 표시하지 않습니다"
+
+#: builtin/show-branch.c:651
+msgid "include the current branch"
+msgstr "현재 브랜치를 í¬í•¨"
+
+#: builtin/show-branch.c:653
+msgid "name commits with their object names"
+msgstr "ì»¤ë°‹ì˜ ì´ë¦„ì„ ê·¸ 오브ì íŠ¸ ì´ë¦„으로 붙입니다"
+
+#: builtin/show-branch.c:655
+msgid "show possible merge bases"
+msgstr "가능한 병합 기준ì ì„ 표시합니다"
+
+#: builtin/show-branch.c:657
+msgid "show refs unreachable from any other ref"
+msgstr "다른 ì–´ë–¤ ë ˆí¼ëŸ°ìŠ¤ì—ì„œë„ ì ‘ê·¼ 불가능한 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 표시합니다"
+
+#: builtin/show-branch.c:659
+msgid "show commits in topological order"
+msgstr "ìœ„ìƒ ìˆœì„œì— ë”°ë¼ ì»¤ë°‹ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/show-branch.c:662
+msgid "show only commits not on the first branch"
+msgstr "첫 ë¸Œëžœì¹˜ì— ì—†ëŠ” 커밋만 표시합니다"
+
+#: builtin/show-branch.c:664
+msgid "show merges reachable from only one tip"
+msgstr "í•˜ë‚˜ì˜ ëì—서만 ì ‘ê·¼ 가능한 ë³‘í•©ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/show-branch.c:666
+msgid "topologically sort, maintaining date order where possible"
+msgstr "가능하면 시간 순서를 유지하면서 ìœ„ìƒ ìˆœì„œë¡œ ì •ë ¬"
+
+#: builtin/show-branch.c:669
+msgid "<n>[,<base>]"
+msgstr "<n>[,<ë² ì´ìŠ¤>]"
+
+#: builtin/show-branch.c:670
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr "기준부터 시작해 최대 <n>ê°œì˜ ìµœê·¼ ref-log í•­ëª©ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/show-ref.c:10
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<패턴>...]"
+
+#: builtin/show-ref.c:11
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<패턴>]"
+
+#: builtin/show-ref.c:165
+msgid "only show tags (can be combined with heads)"
+msgstr "태그만 표시 (헤드와 결합 가능)"
+
+#: builtin/show-ref.c:166
+msgid "only show heads (can be combined with tags)"
+msgstr "헤드만 표시 (태그와 결합 가능)"
+
+#: builtin/show-ref.c:167
+msgid "stricter reference checking, requires exact ref path"
+msgstr "ë” ì—„ê²©í•œ ë ˆí¼ëŸ°ìŠ¤ 검사, 정확히 í•˜ë‚˜ì˜ ë ˆí¼ëŸ°ìŠ¤ 경로 í•„ìš”"
+
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "HEAD ë ˆí¼ëŸ°ìŠ¤ë¥¼ 표시합니다 (í•„í„°ë§ë˜ì„œ 제외ë˜ë”ë¼ë„)"
+
+#: builtin/show-ref.c:174
+msgid "dereference tags into object IDs"
+msgstr "태그를 오브ì íŠ¸ IDë¡œ ë”°ë¼ê°‘니다"
+
+#: builtin/show-ref.c:176
+msgid "only show SHA1 hash using <n> digits"
+msgstr "SHA-1 í‘œì‹œì— <n>ê°œì˜ ìˆ«ìžë§Œ 사용합니다"
+
+#: builtin/show-ref.c:180
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "표준 ì¶œë ¥ì— ê²°ê³¼ë¥¼ 표시하지 않습니다 (--verify 옵션과 사용하면 좋ìŒ)"
+
+#: builtin/show-ref.c:182
+msgid "show refs from stdin that aren't in local repository"
+msgstr "로컬 ì €ìž¥ì†Œì— ì—†ëŠ” ë ˆí¼ëŸ°ìŠ¤ë¥¼ 표준 ìž…ë ¥ì—ì„œ ì½ì–´ 표시합니다"
+
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr "ì£¼ì„ ë¬¸ìžë¡œ 시작하는 모든 ì¤„ì„ ê±´ë„ˆë›°ê³  제거합니다"
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr "ê° ì¤„ì˜ ì•žì— ì£¼ì„ ë¬¸ìžë¥¼ 붙ì´ê³  빈 줄로 만듭니다"
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr "ìƒëŒ€ ê²½ë¡œì— ì‚¬ìš©í•  ë˜ë‹¤ë¥¸ 기준"
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<경로>] [<경로>...]"
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <경로>"
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "경로 '%s'ì— ëŒ€í•´ .gitmodulesì— ìžˆëŠ” 하위모듈 ë§¤í•‘ì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr "새 하위 ëª¨ë“ˆì„ ë³µì œí•  ëŒ€ìƒ ìœ„ì¹˜"
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr "새 하위 모듈 ì´ë¦„"
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr "하위 ëª¨ë“ˆì„ ë³µì œí•´ 올 URL"
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr "ì–•ì€ ë³µì œì— ì‚¬ìš©í•  깊ì´"
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+msgstr ""
+"git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소"
+">] [--name <ì´ë¦„>] [--url <URL>][--depth <깊ì´>] [--] [<경로>...]"
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "'%s' 디렉터리를 만들 수 없습니다"
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "'%s'ì—ì„œ 하위 모듈 경로 '%s'ì— ë³µì œí•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr "'%s' 파ì¼ì„ ì—´ 수 없습니다"
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr "%s 파ì¼ì„ ë‹«ì„ ìˆ˜ 없습니다"
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "'%s'ì— ëŒ€í•œ 하위 모듈 디렉터리를 가져올 수 없습니다"
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr ""
+"ì¹˜ëª…ì  ì´ìƒ: submodule--helper 하위 ëª…ë ¹ì€ í•˜ìœ„ 명령으로 호출해야 합니다"
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr "ì¹˜ëª…ì  ì´ìƒ: '%s'ì€(는) 올바른 submodule--helper 하위 ëª…ë ¹ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: builtin/symbolic-ref.c:7
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr "git symbolic-ref [<옵션>] <ì´ë¦„> [<ë ˆí¼ëŸ°ìŠ¤>]"
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr "git symbolic-ref -d [-q] <ì´ë¦„>"
+
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr "ì‹¬ë³¼ì´ ì•„ë‹Œ (분리ëœ) ë ˆí¼ëŸ°ìŠ¤ì— 대해 ì—러 메시지를 표시하지 않습니다"
+
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
+msgstr "심볼릭 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 삭제합니다"
+
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ ì¶œë ¥ì„ ì¤„ìž…ë‹ˆë‹¤"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+msgid "reason"
+msgstr "ì´ìœ "
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+msgid "reason of the update"
+msgstr "ì—…ë°ì´íŠ¸ì˜ ì´ìœ "
+
+#: builtin/tag.c:23
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
+msgstr ""
+"git tag [-a | -s | -u <키-ID>] [-f] [-m <메시지> | -F <파ì¼>] <태그ì´ë¦„>\n"
+"\t\t[<헤드>]"
+
+#: builtin/tag.c:24
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <태그ì´ë¦„>..."
+
+#: builtin/tag.c:25
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+msgstr ""
+"git tag -l [-n[<개수>]] [--contains <커밋>] [--points-at <오브ì íŠ¸>]\n"
+"\t\t[--format=<형ì‹>] [--[no-]merged [<커밋>]] [<패턴>...]"
+
+#: builtin/tag.c:27
+msgid "git tag -v <tagname>..."
+msgstr "git tag -v <태그ì´ë¦„>..."
+
+#: builtin/tag.c:80
+#, c-format
+msgid "tag name too long: %.*s..."
+msgstr "태그 ì´ë¦„ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤: %.*s..."
+
+#: builtin/tag.c:85
+#, c-format
+msgid "tag '%s' not found."
+msgstr "'%s' 태그가 없습니다."
+
+#: builtin/tag.c:100
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "'%s' 태그 삭제함 (과거 %s)\n"
+
+#: builtin/tag.c:112
+#, c-format
+msgid "could not verify the tag '%s'"
+msgstr "'%s' 태그를 ê²€ì¦í•  수 없습니다"
+
+#: builtin/tag.c:122
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+"\n"
+"ë‹¤ìŒ íƒœê·¸ì— ëŒ€í•œ 메시지를 쓰십시오:\n"
+" %s\n"
+"'%c' 문ìžë¡œ 시작하는 ì¤„ì€ ë¬´ì‹œë©ë‹ˆë‹¤.\n"
+
+#: builtin/tag.c:126
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+"\n"
+"ë‹¤ìŒ íƒœê·¸ì— ëŒ€í•œ 메시지를 쓰십시오:\n"
+" %s\n"
+"'%c' 문ìžë¡œ 시작하는 ì¤„ì€ ìœ ì§€ë©ë‹ˆë‹¤. 제거하려면 ì§ì ‘ 지워야 합니다.\n"
+
+#: builtin/tag.c:199
+msgid "unable to sign the tag"
+msgstr "íƒœê·¸ì— ì„œëª…í•  수 없습니다"
+
+#: builtin/tag.c:201
+msgid "unable to write tag file"
+msgstr "태그 파ì¼ì„ 쓸 수 없습니다"
+
+#: builtin/tag.c:226
+msgid "bad object type."
+msgstr "ìž˜ëª»ëœ ì˜¤ë¸Œì íŠ¸ 종류."
+
+#: builtin/tag.c:239
+msgid "tag header too big."
+msgstr "태그 í—¤ë”ê°€ 너무 í½ë‹ˆë‹¤."
+
+#: builtin/tag.c:275
+msgid "no tag message?"
+msgstr "태그 메시지 없�"
+
+#: builtin/tag.c:281
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr "태그 메시지가 %s 파ì¼ì— 남아 있습니다\n"
+
+#: builtin/tag.c:339
+msgid "list tag names"
+msgstr "태그 ì´ë¦„ 목ë¡ì„ 표시합니다"
+
+#: builtin/tag.c:341
+msgid "print <n> lines of each tag message"
+msgstr "ê° íƒœê·¸ ë©”ì‹œì§€ì˜ <n>ì¤„ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/tag.c:343
+msgid "delete tags"
+msgstr "태그를 삭제합니다"
+
+#: builtin/tag.c:344
+msgid "verify tags"
+msgstr "태그를 ê²€ì¦í•©ë‹ˆë‹¤"
+
+#: builtin/tag.c:346
+msgid "Tag creation options"
+msgstr "태그 만들기 옵션"
+
+#: builtin/tag.c:348
+msgid "annotated tag, needs a message"
+msgstr "ì£¼ì„ ë‹¬ë¦° 태그, 메시지가 필요합니다"
+
+#: builtin/tag.c:350
+msgid "tag message"
+msgstr "태그 메시지"
+
+#: builtin/tag.c:352
+msgid "annotated and GPG-signed tag"
+msgstr "ì£¼ì„ ë‹¬ë¦¬ê³  GPG 서명한 태그"
+
+#: builtin/tag.c:356
+msgid "use another key to sign the tag"
+msgstr "태그를 ì„œëª…í•˜ëŠ”ë° ì§€ì •í•œ 키를 사용합니다"
+
+#: builtin/tag.c:357
+msgid "replace the tag if exists"
+msgstr "태그가 있으면 바꿉니다"
+
+#: builtin/tag.c:358 builtin/update-ref.c:368
+msgid "create a reflog"
+msgstr "reflog를 만듭니다"
+
+#: builtin/tag.c:360
+msgid "Tag listing options"
+msgstr "태그 ëª©ë¡ ë³´ê¸° 옵션"
+
+#: builtin/tag.c:361
+msgid "show tag list in columns"
+msgstr "태그 목ë¡ì„ 여러 ì—´ë¡œ 표시합니다"
+
+#: builtin/tag.c:362 builtin/tag.c:363
+msgid "print only tags that contain the commit"
+msgstr "해당 ì»¤ë°‹ì´ ë“¤ì–´ 있는 태그만 표시합니다"
+
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
+msgstr "ë³‘í•©ëœ íƒœê·¸ë§Œ 표시합니다"
+
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
+msgstr "병합ë˜ì§€ ì•Šì€ íƒœê·¸ë§Œ 표시합니다"
+
+#: builtin/tag.c:370
+msgid "print only tags of the object"
+msgstr "해당 오브ì íŠ¸ì˜ 태그만 표시합니다"
+
+#: builtin/tag.c:399
+msgid "--column and -n are incompatible"
+msgstr "--column ë° -n ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
+
+#: builtin/tag.c:419
+msgid "-n option is only allowed with -l."
+msgstr "-n ì˜µì…˜ì€ -l 옵션과 ê°™ì´ ì¨ì•¼ 합니다."
+
+#: builtin/tag.c:421
+msgid "--contains option is only allowed with -l."
+msgstr "--contains ì˜µì…˜ì€ -l 옵션과 ê°™ì´ ì¨ì•¼ 합니다."
+
+#: builtin/tag.c:423
+msgid "--points-at option is only allowed with -l."
+msgstr "--points-at ì˜µì…˜ì€ -l 옵션과 ê°™ì´ ì¨ì•¼ 합니다."
+
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr "--merged ë° --no-merged ì˜µì…˜ì€ -l 옵션과 ê°™ì´ ì¨ì•¼ 합니다."
+
+#: builtin/tag.c:433
+msgid "only one -F or -m option is allowed."
+msgstr "í•˜ë‚˜ì˜ -F ë˜ëŠ” -m 옵션만 쓸 수 있습니다."
+
+#: builtin/tag.c:453
+msgid "too many params"
+msgstr "파ë¼ë¯¸í„°ê°€ 너무 많습니다"
+
+#: builtin/tag.c:459
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "'%s'ì€9는) 올바른 태그 ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤."
+
+#: builtin/tag.c:464
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "태그 '%s'ì´(ê°€) ì´ë¯¸ 있습니다"
+
+#: builtin/tag.c:489
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "태그 '%s' ì—…ë°ì´íŠ¸ (과거 %s)\n"
+
+#: builtin/unpack-objects.c:490
+msgid "Unpacking objects"
+msgstr "오브ì íŠ¸ ë¬¶ìŒ í‘¸ëŠ” 중"
+
+#: builtin/update-index.c:70
+#, c-format
+msgid "failed to create directory %s"
+msgstr "%s 디렉터리 만들기 실패했습니다"
+
+#: builtin/update-index.c:76
+#, c-format
+msgid "failed to stat %s"
+msgstr "%sì— stat()í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/update-index.c:86
+#, c-format
+msgid "failed to create file %s"
+msgstr "%s 파ì¼ì„ ë§Œë“œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/update-index.c:94
+#, c-format
+msgid "failed to delete file %s"
+msgstr "%s 파ì¼ì„ ì‚­ì œí•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/update-index.c:101 builtin/update-index.c:203
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "%s 디렉터리를 ì‚­ì œí•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/update-index.c:124
+#, c-format
+msgid "Testing "
+msgstr "테스트중 "
+
+#: builtin/update-index.c:136
+msgid "directory stat info does not change after adding a new file"
+msgstr "새 파ì¼ì„ 추가한 í›„ì— ë””ë ‰í„°ë¦¬ ì •ë³´ê°€ 바뀌지 않았습니다"
+
+#: builtin/update-index.c:149
+msgid "directory stat info does not change after adding a new directory"
+msgstr "새 디렉터리를 추가한 í›„ì— ë””ë ‰í„°ë¦¬ ì •ë³´ê°€ 바뀌지 않았습니다"
+
+#: builtin/update-index.c:162
+msgid "directory stat info changes after updating a file"
+msgstr "파ì¼ì„ ì—…ë°ì´íŠ¸í•œ í›„ì— ë””ë ‰í„°ë¦¬ ì •ë³´ê°€ 바뀌지 않았습니다"
+
+#: builtin/update-index.c:173
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr "하위 ë””ë ‰í„°ë¦¬ì— íŒŒì¼ì„ 추가한 í›„ì— ë””ë ‰í„°ë¦¬ ì •ë³´ê°€ 바뀌지 않았습니다"
+
+#: builtin/update-index.c:184
+msgid "directory stat info does not change after deleting a file"
+msgstr "파ì¼ì„ 삭제한 í›„ì— ë””ë ‰í„°ë¦¬ ì •ë³´ê°€ 바뀌지 않았습니다"
+
+#: builtin/update-index.c:197
+msgid "directory stat info does not change after deleting a directory"
+msgstr "디렉터리를 삭제한 í›„ì— ë””ë ‰í„°ë¦¬ ì •ë³´ê°€ 바뀌지 않았습니다"
+
+#: builtin/update-index.c:204
+msgid " OK"
+msgstr " 오케ì´"
+
+#: builtin/update-index.c:564
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<옵션>] [--] [<파ì¼>...]"
+
+#: builtin/update-index.c:918
+msgid "continue refresh even when index needs update"
+msgstr "ì¸ë±ìŠ¤ì— ì—…ë°ì´íŠ¸ê°€ 필요하ë”ë¼ë„ 새로 ê³ ì¹¨ì„ ê³„ì†í•©ë‹ˆë‹¤"
+
+#: builtin/update-index.c:921
+msgid "refresh: ignore submodules"
+msgstr "새로 고침: 하위 모듈 무시"
+
+#: builtin/update-index.c:924
+msgid "do not ignore new files"
+msgstr "새 파ì¼ì„ 무시할 수 않습니다"
+
+#: builtin/update-index.c:926
+msgid "let files replace directories and vice-versa"
+msgstr "디렉터리를 파ì¼ë¡œ, ë˜ëŠ” ê·¸ 반대로 바꿀 수 있게 허용합니다"
+
+#: builtin/update-index.c:928
+msgid "notice files missing from worktree"
+msgstr "ìž‘ì—…í´ë”ì—ì„œ 알림 파ì¼ì´ 없습니다"
+
+#: builtin/update-index.c:930
+msgid "refresh even if index contains unmerged entries"
+msgstr "ì¸ë±ìŠ¤ì— 병합하지 ì•Šì€ í•­ëª©ì´ ìžˆì–´ë„ ìƒˆë¡œ 고칩니다"
+
+#: builtin/update-index.c:933
+msgid "refresh stat information"
+msgstr "íŒŒì¼ ì •ë³´ë¥¼ 새로 고칩니다"
+
+#: builtin/update-index.c:937
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "--refresh와 ë™ì¼í•˜ì§€ë§Œ, assume-unchanged ì„¤ì •ì„ ë¬´ì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/update-index.c:941
+msgid "<mode>,<object>,<path>"
+msgstr "<모드>,<오브ì íŠ¸>,<경로>"
+
+#: builtin/update-index.c:942
+msgid "add the specified entry to the index"
+msgstr "지정한 í•­ëª©ì„ ì¸ë±ìŠ¤ì— 추가합니다"
+
+#: builtin/update-index.c:946
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/update-index.c:947
+msgid "override the executable bit of the listed files"
+msgstr "목ë¡ì˜ 파ì¼ì—ì„œ 실행 가능 비트를 바꿉니다"
+
+#: builtin/update-index.c:951
+msgid "mark files as \"not changing\""
+msgstr "파ì¼ì„ \"바꾸지 ì•ŠìŒ\"으로 표시합니다"
+
+#: builtin/update-index.c:954
+msgid "clear assumed-unchanged bit"
+msgstr "바꾸지 ì•ŠìŒìœ¼ë¡œ 가정 (assumed-unchanged) 비트를 지ì›ë‹ˆë‹¤"
+
+#: builtin/update-index.c:957
+msgid "mark files as \"index-only\""
+msgstr "파ì¼ì„ ì¸ë±ìŠ¤ 전용으로 (\"index-only\") 표시합니다"
+
+#: builtin/update-index.c:960
+msgid "clear skip-worktree bit"
+msgstr "ìž‘ì—…í´ë” 건너뛰기 (skip-worktree) 비트를 지ì›ë‹ˆë‹¤"
+
+#: builtin/update-index.c:963
+msgid "add to index only; do not add content to object database"
+msgstr "ì¸ë±ìŠ¤ì—만 추가합니다. ë‚´ìš©ì„ ì˜¤ë¸Œì íŠ¸ ë°ì´í„°ë² ì´ìŠ¤ì— 추가하지 않습니다"
+
+#: builtin/update-index.c:965
+msgid "remove named paths even if present in worktree"
+msgstr "ìž‘ì—… í´ë”ì— ìžˆì–´ë„ í•´ë‹¹ 경로를 제거합니다"
+
+#: builtin/update-index.c:967
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "--stdinê³¼ ê°™ì´ ì‚¬ìš©: ìž…ë ¥ ì¤„ì€ NUL ë°”ì´íŠ¸ë¡œ ë납니다"
+
+#: builtin/update-index.c:969
+msgid "read list of paths to be updated from standard input"
+msgstr "표준 ìž…ë ¥ì—ì„œ ì—…ë°ì´íŠ¸í•  ê²½ë¡œì˜ ëª©ë¡ì„ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/update-index.c:973
+msgid "add entries from standard input to the index"
+msgstr "표준 ìž…ë ¥ì—ì„œ ì½ì€ í•­ëª©ì„ ì¸ë±ìŠ¤ì— 추가합니다"
+
+#: builtin/update-index.c:977
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "경로 목ë¡ì— 대해 #2 ë° #3 스테ì´ì§•ì„ 다시 합니다"
+
+#: builtin/update-index.c:981
+msgid "only update entries that differ from HEAD"
+msgstr "HEAD와 다른 항목만 ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤"
+
+#: builtin/update-index.c:985
+msgid "ignore files missing from worktree"
+msgstr "ìž‘ì—… í´ë”ì— ì—†ëŠ” 파ì¼ì„ 무시합니다"
+
+#: builtin/update-index.c:988
+msgid "report actions to standard output"
+msgstr "표준 ì¶œë ¥ì— ë™ìž‘ì„ ì•Œë¦½ë‹ˆë‹¤"
+
+#: builtin/update-index.c:990
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "저장한 í•´ê²°ë˜ì§€ ì•Šì€ ì¶©ëŒì„ 무시합니다 (사용ìžìš© 명령 ìš©ë„)"
+
+#: builtin/update-index.c:994
+msgid "write index in this format"
+msgstr "ì¸ë±ìŠ¤ë¥¼ ì´ í˜•ì‹ìœ¼ë¡œ ì”니다"
+
+#: builtin/update-index.c:996
+msgid "enable or disable split index"
+msgstr "스플릿 ì¸ë±ìŠ¤ë¥¼ 켜거나 ë•ë‹ˆë‹¤"
+
+#: builtin/update-index.c:998
+msgid "enable/disable untracked cache"
+msgstr "추ì í•˜ì§€ 않는 ìºì‹œ ì‚¬ìš©ì„ ì¼œê±°ë‚˜ ë•ë‹ˆë‹¤"
+
+#: builtin/update-index.c:1000
+msgid "enable untracked cache without testing the filesystem"
+msgstr "íŒŒì¼ ì‹œìŠ¤í…œ 테스트 ì—†ì´ ì¶”ì í•˜ì§€ 않는 ìºì‹œë¥¼ 사용합니다"
+
+#: builtin/update-ref.c:9
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr "git update-ref [<옵션>] -d <ë ˆí¼ëŸ°ìŠ¤ì´ë¦„> [<과거-ê°’>]"
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+msgstr "git update-ref [<옵션>] <ë ˆí¼ëŸ°ìŠ¤ì´ë¦„> <새-ê°’> [<과거-ê°’>]"
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr "git update-ref [<옵션>] --stdin [-z]"
+
+#: builtin/update-ref.c:363
+msgid "delete the reference"
+msgstr "ë ˆí¼ëŸ°ìŠ¤ë¥¼ 삭제합니다"
+
+#: builtin/update-ref.c:365
+msgid "update <refname> not the one it points to"
+msgstr "<ë ˆí¼ëŸ°ìŠ¤ì´ë¦„>ì„ ê°€ë¦¬í‚¤ì§€ 않는 항목으로 ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤"
+
+#: builtin/update-ref.c:366
+msgid "stdin has NUL-terminated arguments"
+msgstr "표준 ìž…ë ¥ì— NULë¡œ ë나는 ì¸ìžê°€ 있습니다"
+
+#: builtin/update-ref.c:367
+msgid "read updates from stdin"
+msgstr "표준 ìž…ë ¥ì—ì„œ ì—…ë°ì´íŠ¸ë¥¼ ì½ìŠµë‹ˆë‹¤"
+
+#: builtin/update-server-info.c:6
+msgid "git update-server-info [--force]"
+msgstr "git update-server-info [--force]"
+
+#: builtin/update-server-info.c:14
+msgid "update the info files from scratch"
+msgstr "바닥부터 ì •ë³´ 파ì¼ì„ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤"
+
+#: builtin/verify-commit.c:17
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <커밋>..."
+
+#: builtin/verify-commit.c:72
+msgid "print commit contents"
+msgstr "커밋 ë‚´ìš©ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+msgid "print raw gpg status output"
+msgstr "ì›ë³¸ GPG ìƒíƒœë¥¼ 출력합니다"
+
+#: builtin/verify-pack.c:54
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <묶ìŒ>..."
+
+#: builtin/verify-pack.c:64
+msgid "verbose"
+msgstr "ìžì„¸ížˆ 표시"
+
+#: builtin/verify-pack.c:66
+msgid "show statistics only"
+msgstr "통계만 표시"
+
+#: builtin/verify-tag.c:17
+msgid "git verify-tag [-v | --verbose] <tag>..."
+msgstr "git verify-tag [-v | --verbose] <태그>..."
+
+#: builtin/verify-tag.c:83
+msgid "print tag contents"
+msgstr "태그 내용 표시"
+
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<옵션>] <경로> [<브랜치>]"
+
+#: builtin/worktree.c:16
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<옵션>]"
+
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<옵션>]"
+
+#: builtin/worktree.c:39
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr "worktrees/%s 제거: 올바른 디렉터리가 아닙나다"
+
+#: builtin/worktree.c:45
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr "worktrees/%s 제거: gitdir 파ì¼ì´ 없습니다"
+
+#: builtin/worktree.c:50
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgstr "worktrees/%s 제거: gitdir 파ì¼ì„ ì½ì„ 수 없습니다 (%s)"
+
+#: builtin/worktree.c:61
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr "worktrees/%s 제거: gitdir 파ì¼ì´ 올바르지 않습니다"
+
+#: builtin/worktree.c:77
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgstr "worktrees/%s 제거: gitdir 파ì¼ì´ 없는 위치를 가리킵니다"
+
+#: builtin/worktree.c:112
+#, c-format
+msgid "failed to remove: %s"
+msgstr "ì œê±°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: %s"
+
+#: builtin/worktree.c:201
+#, c-format
+msgid "'%s' already exists"
+msgstr "'%s'ì´(ê°€) ì´ë¯¸ 있습니다"
+
+#: builtin/worktree.c:235
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "'%s'ì˜ ë””ë ‰í„°ë¦¬ë¥¼ 만들 수 없습니다"
+
+#: builtin/worktree.c:271
+#, c-format
+msgid "Preparing %s (identifier %s)"
+msgstr "%s 준비 중 (ID %s)"
+
+#: builtin/worktree.c:319
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr "다른 ìž‘ì—… í´ë”ì—ì„œ ì²´í¬ì•„웃했ë”ë¼ë„ <브랜치>를 ì²´í¬ì•„웃합니다"
+
+#: builtin/worktree.c:321
+msgid "create a new branch"
+msgstr "새 브랜치를 만듭니다"
+
+#: builtin/worktree.c:323
+msgid "create or reset a branch"
+msgstr "브랜치를 만들거나 리셋합니다"
+
+#: builtin/worktree.c:324
+msgid "detach HEAD at named commit"
+msgstr "HEAD를 해당 커밋ì—ì„œ 분리합니다"
+
+#: builtin/worktree.c:331
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-b, -B, --detach 옵션 중 하나만 쓸 수 있습니다"
+
+#: builtin/write-tree.c:13
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<ì ‘ë‘ì–´>/]"
+
+#: builtin/write-tree.c:26
+msgid "<prefix>/"
+msgstr "<ì ‘ë‘ì–´>/"
+
+#: builtin/write-tree.c:27
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "하위 디렉터리 <ì ‘ë‘ì–´>ì— ëŒ€í•´ 트리 오브ì íŠ¸ë¥¼ ì”니다"
+
+#: builtin/write-tree.c:30
+msgid "only useful for debugging"
+msgstr "디버깅 ìš©ë„로만 사용"
+
+#: credential-cache--daemon.c:255
+msgid "print debugging messages to stderr"
+msgstr "디버깅 메시지를 표준오류로 출력합니다"
+
+#: git.c:14
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
+msgstr ""
+"'git help -a' ë° 'git help -g' ëª…ë ¹ì„ ì‹¤í–‰í•˜ë©´ 하위 명령어와 ê°œë… ì„¤ëª…ì„œì˜\n"
+"목ë¡ì„ ë³¼ 수 있습니다. 특정 하위 명령어나 ê°œë…ì— ëŒ€í•´ ì½ì–´ 보려면 'git help\n"
+"<명령>' ë˜ëŠ” 'git help <ê°œë…>' ëª…ë ¹ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤."
+
+#: common-cmds.h:9
+msgid "start a working area (see also: git help tutorial)"
+msgstr "작업 공간 시작 (참고: git help tutorial)"
+
+#: common-cmds.h:10
+msgid "work on the current change (see also: git help everyday)"
+msgstr "변경 ì‚¬í•­ì— ëŒ€í•œ ìž‘ì—… (참고: git help everyday)"
+
+#: common-cmds.h:11
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "커밋 ë‚´ì—­ê³¼ ìƒíƒœ 보기 (참고: git help revisions)"
+
+#: common-cmds.h:12
+msgid "grow, mark and tweak your common history"
+msgstr "커밋 ë‚´ì—­ì„ í‚¤ìš°ê³ , 표시하고, 조작하기"
+
+#: common-cmds.h:13
+msgid "collaborate (see also: git help workflows)"
+msgstr "í˜‘ë™ ìž‘ì—… (참고: git help workflows)"
+
+#: common-cmds.h:17
+msgid "Add file contents to the index"
+msgstr "íŒŒì¼ ë‚´ìš©ì„ ì¸ë±ìŠ¤ì— 추가합니다"
+
+#: common-cmds.h:18
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "ì´ì§„ íƒìƒ‰ìœ¼ë¡œ 버그를 만들어낸 ì»¤ë°‹ì„ ì°¾ìŠµë‹ˆë‹¤"
+
+#: common-cmds.h:19
+msgid "List, create, or delete branches"
+msgstr "브랜치를 만들거나, 삭제하거나, 목ë¡ì„ 출력합니다"
+
+#: common-cmds.h:20
+msgid "Switch branches or restore working tree files"
+msgstr "브랜치를 전환하거나 ìž‘ì—… 파ì¼ì„ 복구합니다"
+
+#: common-cmds.h:21
+msgid "Clone a repository into a new directory"
+msgstr "저장소를 복제해 새 디렉터리로 가져 옵니다"
+
+#: common-cmds.h:22
+msgid "Record changes to the repository"
+msgstr "ë°”ë€ ì‚¬í•­ì„ ì €ìž¥ì†Œì— ê¸°ë¡í•©ë‹ˆë‹¤."
+
+#: common-cmds.h:23
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "커밋과 커밋 사ì´, 커밋과 ìž‘ì—… ë‚´ìš© ì‚¬ì´ ë“±ì˜ ë°”ë€ ì ì„ 봅니다"
+
+#: common-cmds.h:24
+msgid "Download objects and refs from another repository"
+msgstr "다른 저장소ì—ì„œ 오브ì íŠ¸ì™€ ë ˆí¼ëŸ°ìŠ¤ë¥¼ 다운로드합니다"
+
+#: common-cmds.h:25
+msgid "Print lines matching a pattern"
+msgstr "패턴과 ì¼ì¹˜í•˜ëŠ” ì¤„ì„ í‘œì‹œí•©ë‹ˆë‹¤"
+
+#: common-cmds.h:26
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "빈 깃 저장소를 만들거나 기존 저장소를 다시 초기화합니다"
+
+#: common-cmds.h:27
+msgid "Show commit logs"
+msgstr "커밋 기ë¡ì„ 표시합니다"
+
+#: common-cmds.h:28
+msgid "Join two or more development histories together"
+msgstr "여러 ê°œì˜ ê°œë°œ ë‚´ì—­ì„ í•˜ë‚˜ë¡œ 합칩니다"
+
+#: common-cmds.h:29
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "파ì¼, 디렉터리, 심볼릭 ë§í¬ë¥¼ 옮기거나 ì´ë¦„ì„ ë°”ê¿‰ë‹ˆë‹¤"
+
+#: common-cmds.h:30
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "다른 저장소 ë˜ëŠ” 다른 로컬 브랜치ì—ì„œ 가져오거나 통합합니다"
+
+#: common-cmds.h:31
+msgid "Update remote refs along with associated objects"
+msgstr "ì›ê²© ë ˆí¼ëŸ°ìŠ¤ ë° ê·¸ì™€ ê´€ë ¨ëœ ì˜¤ë¸Œì íŠ¸ë¥¼ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤"
+
+#: common-cmds.h:32
+msgid "Forward-port local commits to the updated upstream head"
+msgstr "로컬 ì»¤ë°‹ì„ ì—…ë°ì´íŠ¸ëœ 업스트림 head 다ìŒì— 맞춰 넣습니다"
+
+#: common-cmds.h:33
+msgid "Reset current HEAD to the specified state"
+msgstr "현재 HEAD를 지정한 ìƒíƒœë¡œ 재설정화합니다"
+
+#: common-cmds.h:34
+msgid "Remove files from the working tree and from the index"
+msgstr "파ì¼ì„ ìž‘ì—… í´ë”ì—ì„œ 제거하고 ì¸ë±ìŠ¤ì—ì„œë„ ì œê±°í•©ë‹ˆë‹¤"
+
+#: common-cmds.h:35
+msgid "Show various types of objects"
+msgstr "여러가지 ì¢…ë¥˜ì˜ ì˜¤ë¸Œì íŠ¸ë¥¼ 표시합니다"
+
+#: common-cmds.h:36
+msgid "Show the working tree status"
+msgstr "ìž‘ì—… í´ë” ìƒíƒœë¥¼ 표시합니다"
+
+#: common-cmds.h:37
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr "태그를 만들거나, 표시하거나, 삭제하거나, GPG ì„œëª…ì„ ê²€ì¦í•©ë‹ˆë‹¤"
+
+#: parse-options.h:145
+msgid "expiry-date"
+msgstr "만료-ì‹œê°"
+
+#: parse-options.h:160
+msgid "no-op (backward compatibility)"
+msgstr "아무 ë™ìž‘ë„ í•˜ì§€ ì•ŠìŒ (호환용)"
+
+#: parse-options.h:237
+msgid "be more verbose"
+msgstr "ë” ìžì„¸ížˆ 표시합니다"
+
+#: parse-options.h:239
+msgid "be more quiet"
+msgstr "ë” ê°„ëžµížˆ 표시합니다"
+
+#: parse-options.h:245
+msgid "use <n> digits to display SHA-1s"
+msgstr "SHA-1 í‘œì‹œì— <n>ê°œì˜ ìˆ«ìžë¥¼ 사용합니다"
+
+#: rerere.h:38
+msgid "update the index with reused conflict resolution if possible"
+msgstr "가능하면 ì¸ë±ìŠ¤ë¥¼ 재사용한 ì¶©ëŒ í•´ê²°ë¡œ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤"
+
+#: git-bisect.sh:55
+msgid "You need to start by \"git bisect start\""
+msgstr "\"git bisect start\" 명령으로 시작해야 합니다"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:61
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "지금 하시겠습니까 [Y/n]? "
+
+#: git-bisect.sh:122
+#, sh-format
+msgid "unrecognised option: '$arg'"
+msgstr "알 수 없는 옵션: '$arg'"
+
+#: git-bisect.sh:126
+#, sh-format
+msgid "'$arg' does not appear to be a valid revision"
+msgstr "'$arg'ì€(는) 올바른 리비전처럼 ë³´ì´ì§€ 않습니다"
+
+#: git-bisect.sh:155
+msgid "Bad HEAD - I need a HEAD"
+msgstr "ìž˜ëª»ëœ HEAD - HEADê°€ 필요합니다"
+
+#: git-bisect.sh:168
+#, sh-format
+msgid ""
+"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+msgstr ""
+"'$start_head' 받아오기가 실패했습니다. 'git bisect reset <valid-branch>'를 "
+"해 보십시오."
+
+#: git-bisect.sh:178
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "cg-seekí•œ 트리ì—ì„œ bisect를 í•  수 없습니다"
+
+#: git-bisect.sh:182
+msgid "Bad HEAD - strange symbolic ref"
+msgstr "ìž˜ëª»ëœ HEAD - 심볼릭 ë ˆí¼ëŸ°ìŠ¤ê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: git-bisect.sh:234
+#, sh-format
+msgid "Bad bisect_write argument: $state"
+msgstr "ìž˜ëª»ëœ bisect_write ì¸ìž: $state"
+
+#: git-bisect.sh:263
+#, sh-format
+msgid "Bad rev input: $arg"
+msgstr "ìž˜ëª»ëœ ë¦¬ë¹„ì „ ìž…ë ¥: $arg"
+
+#: git-bisect.sh:278
+msgid "Please call 'bisect_state' with at least one argument."
+msgstr "'bisect_state' í˜¸ì¶œì€ ìµœì†Œí•œ í•˜ë‚˜ì˜ ì¸ìžë¥¼ ì¨ì•¼ 합니다."
+
+#: git-bisect.sh:290
+#, sh-format
+msgid "Bad rev input: $rev"
+msgstr "ìž˜ëª»ëœ ë¦¬ë¹„ì „ ìž…ë ¥: $rev"
+
+#: git-bisect.sh:299
+#, sh-format
+msgid "'git bisect $TERM_BAD' can take only one argument."
+msgstr "'git bisect $TERM_BAD' ëª…ë ¹ì€ í•˜ë‚˜ì˜ ì¸ìžë§Œ 쓸 수 있습니다."
+
+#: git-bisect.sh:322
+#, sh-format
+msgid "Warning: bisecting only with a $TERM_BAD commit."
+msgstr "경고: í•˜ë‚˜ì˜ $TERM_BAD ì»¤ë°‹ì— ëŒ€í•´ì„œë§Œ ì´ë“±ë¶„."
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:328
+msgid "Are you sure [Y/n]? "
+msgstr "확실합니까 [Y/n]? "
+
+#: git-bisect.sh:340
+#, sh-format
+msgid ""
+"You need to give me at least one $bad_syn and one $good_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+msgstr ""
+"최소한 í•˜ë‚˜ì˜ $bad_syn ë° í•˜ë‚˜ì˜ $good_syn ë¦¬ë¹„ì „ì„ ë„˜ê²¨ì•¼ 합니다.\n"
+"(\"git bisect $bad_syn\" ë° \"git bisect $good_syn\" ëª…ë ¹ì„ ì‹¤í–‰í•˜ë©´ ë©ë‹ˆë‹¤.)"
+
+#: git-bisect.sh:343
+#, sh-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+msgstr ""
+"\"git bisect start\"를 실행해야 합니다.\n"
+"ê·¸ ë‹¤ìŒ ìµœì†Œí•œ í•˜ë‚˜ì˜ $good_syn ë° í•˜ë‚˜ì˜ $bad_syn ë¦¬ë¹„ì „ì„ ë„˜ê²¨ì•¼ 합니다\n"
+"(\"git bisect $bad_syn\" ë° \"git bisect $good_syn\" ëª…ë ¹ì„ ì‹¤í–‰í•˜ë©´ ë©ë‹ˆë‹¤.)"
+
+#: git-bisect.sh:414 git-bisect.sh:546
+msgid "We are not bisecting."
+msgstr "ì´ë“±ë¶„하는 중입니다."
+
+#: git-bisect.sh:421
+#, sh-format
+msgid "'$invalid' is not a valid commit"
+msgstr "'$invalid'ì€(는) 올바른 ì»¤ë°‹ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: git-bisect.sh:430
+#, sh-format
+msgid ""
+"Could not check out original HEAD '$branch'.\n"
+"Try 'git bisect reset <commit>'."
+msgstr ""
+"ë³¸ëž˜ì˜ HEAD '$branch'ì„(를) ì²´í¬ì•„웃할 수 없습니다.\n"
+"'git bisect reset <커밋>'ì„ í•´ 보십시오"
+
+#: git-bisect.sh:458
+msgid "No logfile given"
+msgstr "로그 파ì¼ì´ 주어지지 않았습니다"
+
+#: git-bisect.sh:459
+#, sh-format
+msgid "cannot read $file for replaying"
+msgstr "다시 재ìƒí•  $file 파ì¼ì„ ì½ì„ 수 없습니다"
+
+#: git-bisect.sh:480
+msgid "?? what are you talking about?"
+msgstr "?? 무슨 소리ì¸ì§€ 모르겠습니다?"
+
+#: git-bisect.sh:492
+#, sh-format
+msgid "running $command"
+msgstr "실행: $command"
+
+#: git-bisect.sh:499
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
+msgstr ""
+"ì´ë“±ë¶„ ì‹¤í–‰ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤:\n"
+"'$command' 명령ì—ì„œ ìƒíƒœ 코드 '$res'ì´(ê°€) 0보다 작거나 128보다 í½ë‹ˆë‹¤"
+
+#: git-bisect.sh:525
+msgid "bisect run cannot continue any more"
+msgstr "ì´ë“±ë¶„ ì‹¤í–‰ì„ ê³„ì† í•  수 없습니다"
+
+#: git-bisect.sh:531
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
+msgstr ""
+"ì´ë“±ë¶„ ì‹¤í–‰ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤:\n"
+"'bisect_state $state' 명령ì—ì„œ ìƒíƒœ 코드가 '$res'입니다"
+
+#: git-bisect.sh:538
+msgid "bisect run success"
+msgstr "ì´ë“±ë¶„ 실행 성공"
+
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "ë‘ ë‹¤ë¥¸ 용어를 사용하십시오"
+
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "'$term'ì´(ê°€) 올바른 ìš©ì–´ê°€ 아닙니다"
+
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr "내부 명령어 '$term'ì„(를) ìš©ì–´ë¡œ 사용할 수 없습니다"
+
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "ìš©ì–´ '$term'ì˜ ì˜ë¯¸ë¥¼ 바꿀 수 없습니다"
+
+#: git-bisect.sh:606
+#, sh-format
+msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
+msgstr "ìž˜ëª»ëœ ëª…ë ¹ì–´: 현재 $TERM_BAD/$TERM_GOOD ì´ë“±ë¶„ 중입니다."
+
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "용어를 ì •ì˜í•˜ì§€ 않았습니다"
+
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"'git bisect terms'ì— ëŒ€í•´ ìž˜ëª»ëœ ì¸ìž '$arg'.\n"
+"지ì›í•˜ëŠ” 옵션ì€: --term-good|--term-old ë° --term-bad|--term-new."
+
+#: git-rebase.sh:57
+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"
+"To check out the original branch and stop rebasing, run \"git rebase --abort"
+"\"."
+msgstr ""
+"ì´ ë¬¸ì œë¥¼ 해결하면, \"\"git rebase --continue\"를 실행하십시오.\n"
+"ì´ íŒ¨ì¹˜ë¥¼ 건너뛰려면, ëŒ€ì‹ ì— \"git rebase --skip\"ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤.\n"
+"ì›ëž˜ 브랜치를 ì²´í¬ì•„웃하고 리베ì´ìŠ¤ë¥¼ 중지하려면, \"git rebase --abort\"를 실행하십시오."
+
+#: git-rebase.sh:165
+msgid "Applied autostash."
+msgstr "ìžë™ìŠ¤íƒœì‹œ ì ìš©."
+
+#: git-rebase.sh:168
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "\"$stash_sha1\"ì„(를) 저장할 수 없습니다"
+
+#: git-rebase.sh:169
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"ìžë™ìŠ¤íƒœì‹œ ì ìš©ì— 충ëŒì´ ë°œìƒí–ˆìŠµë‹ˆë‹¤.\n"
+"변경 ì‚¬í•­ì€ ìŠ¤íƒœì‹œ ì•ˆì— ì•ˆì „í•˜ê²Œ 들어 있습니다.\n"
+"언제든지 \"git stash pop\" ë˜ëŠ” \"git stash drop\"ì„ ì‹¤í–‰í•  수 있습니다.\n"
+
+#: git-rebase.sh:208
+msgid "The pre-rebase hook refused to rebase."
+msgstr "리베ì´ìŠ¤ ì „ 후í¬ì—ì„œ 리베ì´ìŠ¤ë¥¼ 거부했습니다."
+
+#: git-rebase.sh:213
+msgid "It looks like git-am is in progress. Cannot rebase."
+msgstr "git-amì´ ì§„í–‰ ì¤‘ì¸ ê²ƒì²˜ëŸ¼ 보입니다. 리베ì´ìŠ¤í•  수 없습니다."
+
+#: git-rebase.sh:354
+msgid "The --exec option must be used with the --interactive option"
+msgstr "--exec ì˜µì…˜ì€ --interactive 옵션과 ê°™ì´ ì‚¬ìš©í•´ì•¼ 합니다"
+
+#: git-rebase.sh:359
+msgid "No rebase in progress?"
+msgstr "리베ì´ìŠ¤ê°€ 진행 중ì´ì§€ 않습니다"
+
+#: git-rebase.sh:370
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr "--edit-todo ë™ìž‘ì€ ëŒ€í™”í˜• 리베ì´ìŠ¤ì—서만 사용할 수 있습니다."
+
+#: git-rebase.sh:377
+msgid "Cannot read HEAD"
+msgstr "HEAD를 ì½ì„ 수 없습니다"
+
+#: git-rebase.sh:380
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"모든 병합 충ëŒì„ 편집하고 git add\n"
+"명령으로 í•´ê²°ë˜ì—ˆë‹¤ê³  표시해야 합니다"
+
+#: git-rebase.sh:398
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "'$head_name' 위치로 ëŒì•„ê°ˆ 수 없습니다"
+
+#: git-rebase.sh:417
+#, sh-format
+msgid ""
+"It seems that there is already a $state_dir_base directory, and\n"
+"I wonder if you are in the middle of another rebase. If that is the\n"
+"case, please try\n"
+"\t$cmd_live_rebase\n"
+"If that is not the case, please\n"
+"\t$cmd_clear_stale_rebase\n"
+"and run me again. I am stopping in case you still have something\n"
+"valuable there."
+msgstr ""
+"ì´ë¯¸ '$state_dir_base' 디렉터리가 있는 것으로 ë³´ì•„, ì´ë¯¸\n"
+"ë˜ ë‹¤ë¥¸ 리베ì´ìŠ¤ ì¤‘ì— ìžˆëŠ” 것 같습니다. 그러한 경우ì—는\n"
+"다ìŒì„ ì‹œë„í•´ 보십시오:\n"
+"\t$cmd_live_rebase\n"
+"리베ì´ìŠ¤ ì¤‘ì´ ì•„ë‹ˆë¼ë©´ 다ìŒì„ ì‹œë„하고,\n"
+"\t$cmd_clear_stale_rebase\n"
+"ì´ ëª…ë ¹ì„ ë‹¤ì‹œ 실행하십시오. 중요한 ì‚¬í•­ì´ ë‚¨ì•„ ìžˆì„ ê²½ìš°ë¥¼\n"
+"대비해 여기서 멈춥니다."
+
+#: git-rebase.sh:468
+#, sh-format
+msgid "invalid upstream $upstream_name"
+msgstr "ìž˜ëª»ëœ ì—…ìŠ¤íŠ¸ë¦¼ $upstream_name"
+
+#: git-rebase.sh:492
+#, sh-format
+msgid "$onto_name: there are more than one merge bases"
+msgstr "$onto_name: 여러 ê°œì˜ ë³‘í•© ë² ì´ìŠ¤ê°€ 있습니다"
+
+#: git-rebase.sh:495 git-rebase.sh:499
+#, sh-format
+msgid "$onto_name: there is no merge base"
+msgstr "$onto_name: 병합 ë² ì´ìŠ¤ê°€ 없습니다"
+
+#: git-rebase.sh:504
+#, sh-format
+msgid "Does not point to a valid commit: $onto_name"
+msgstr "올바른 ì»¤ë°‹ì„ ê°€ë¦¬í‚¤ì§€ 않습니다: $onto_name"
+
+#: git-rebase.sh:527
+#, sh-format
+msgid "fatal: no such branch: $branch_name"
+msgstr "ì¹˜ëª…ì  ì´ìƒ: 그런 브랜치가 없습니다: $branch_name"
+
+#: git-rebase.sh:560
+msgid "Cannot autostash"
+msgstr "ìžë™ 스태시를 í•  수 없습니다"
+
+#: git-rebase.sh:565
+#, sh-format
+msgid "Created autostash: $stash_abbrev"
+msgstr "ìžë™ 스태시를 만들었습니다: $stash_abbrev"
+
+#: git-rebase.sh:569
+msgid "Please commit or stash them."
+msgstr "커밋하거나 ìŠ¤íƒœì‹œì— ë„£ìœ¼ì‹­ì‹œì˜¤."
+
+#: git-rebase.sh:589
+#, sh-format
+msgid "Current branch $branch_name is up to date."
+msgstr "현재 브랜치가 ($branch_name) 최신 ìƒíƒœìž…니다."
+
+#: git-rebase.sh:593
+#, sh-format
+msgid "Current branch $branch_name is up to date, rebase forced."
+msgstr "현재 브랜치가 ($branch_name) 최신 ìƒíƒœìž…니다. ê°•ì œ 리베ì´ìŠ¤í•©ë‹ˆë‹¤."
+
+#: git-rebase.sh:604
+#, sh-format
+msgid "Changes from $mb to $onto:"
+msgstr "변경 사항 '$mb'ì—ì„œ '$onto'(으)ë¡œ:"
+
+#: git-rebase.sh:613
+msgid "First, rewinding head to replay your work on top of it..."
+msgstr "ìž‘ì—… ì‚¬í•­ì„ ë‹¤ì‹œ 넣기 위해 먼저 헤드를 뒤로 ëŒë¦½ë‹ˆë‹¤..."
+
+#: git-rebase.sh:623
+#, sh-format
+msgid "Fast-forwarded $branch_name to $onto_name."
+msgstr "$branch_name 브랜치를 $onto_name 위치로 정방향 진행합니다."
+
+#: git-stash.sh:51
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear ëª…ë ¹ì„ íŒŒë¼ë¯¸í„°ì™€ ê°™ì´ ì“°ê¸°ëŠ” 구현ë˜ì§€ 않았습니다"
+
+#: git-stash.sh:74
+msgid "You do not have the initial commit yet"
+msgstr "ì•„ì§ ìµœì´ˆ ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: git-stash.sh:89
+msgid "Cannot save the current index state"
+msgstr "현재 ì¸ë±ìŠ¤ ìƒíƒœë¥¼ 저장할 수 없습니다"
+
+#: git-stash.sh:124 git-stash.sh:137
+msgid "Cannot save the current worktree state"
+msgstr "현재 ìž‘ì—… í´ë” ìƒíƒœë¥¼ 저장할 수 없습니다"
+
+#: git-stash.sh:141
+msgid "No changes selected"
+msgstr "변경 ì‚¬í•­ì„ ì„ íƒí•˜ì§€ 않았습니다"
+
+#: git-stash.sh:144
+msgid "Cannot remove temporary index (can't happen)"
+msgstr "ìž„ì‹œ ì¸ë±ìŠ¤ë¥¼ 제거할 수 없습니다 (ì¼ì–´ë‚  수 없는 ìƒí™©)"
+
+#: git-stash.sh:157
+msgid "Cannot record working tree state"
+msgstr "ìž‘ì—… í´ë” ìƒíƒœë¥¼ 기ë¡í•  수 없습니다"
+
+#: git-stash.sh:189
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
+msgstr "$ref_stashì„(를) $w_commit(으)ë¡œ ì—…ë°ì´íŠ¸í•  수 없습니다"
+
+#. TRANSLATORS: $option is an invalid option, like
+#. `--blah-blah'. The 7 spaces at the beginning of the
+#. second line correspond to "error: ". So you should line
+#. up the second line with however many characters the
+#. translation of "error: " takes in your language. E.g. in
+#. English this is:
+#.
+#. $ git stash save --blah-blah 2>&1 | head -n 2
+#. error: unknown option for 'stash save': --blah-blah
+#. To provide a message, use git stash save -- '--blah-blah'
+#: git-stash.sh:239
+#, sh-format
+msgid ""
+"error: unknown option for 'stash save': $option\n"
+" To provide a message, use git stash save -- '$option'"
+msgstr ""
+"오류: 'stash save'ì— ëŒ€í•´ ì•Œ 수 없는 옵션: $option\n"
+" 메시지를 넘기려면, 다ìŒê³¼ ê°™ì´ ì“°ì‹­ì‹œì˜¤: git stash save -- '$option'"
+
+#: git-stash.sh:260
+msgid "No local changes to save"
+msgstr "저장할 로컬 변경 ì‚¬í•­ì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: git-stash.sh:264
+msgid "Cannot initialize stash"
+msgstr "스태시를 초기화할 수 없습니다"
+
+#: git-stash.sh:268
+msgid "Cannot save the current status"
+msgstr "현재 ìƒíƒœë¥¼ 저장할 수 없습니다"
+
+#: git-stash.sh:286
+msgid "Cannot remove worktree changes"
+msgstr "ìž‘ì—…í´ë” 변경 ì‚¬í•­ì„ ì œê±°í•  수 없습니다"
+
+#: git-stash.sh:405
+#, sh-format
+msgid "unknown option: $opt"
+msgstr "알 수 없는 옵션: $opt"
+
+#: git-stash.sh:415
+msgid "No stash found."
+msgstr "스태시가 없습니다."
+
+#: git-stash.sh:422
+#, sh-format
+msgid "Too many revisions specified: $REV"
+msgstr "너무 ë§Žì€ ë¦¬ë¹„ì „ì„ ì§€ì •í–ˆìŠµë‹ˆë‹¤: $REV"
+
+#: git-stash.sh:428
+#, sh-format
+msgid "$reference is not a valid reference"
+msgstr "$referenceì€(는) 올바른 ë ˆí¼ëŸ°ìŠ¤ê°€ 아닙니다"
+
+#: git-stash.sh:456
+#, sh-format
+msgid "'$args' is not a stash-like commit"
+msgstr "'$args'ì€(는) 스태시 ì»¤ë°‹ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: git-stash.sh:467
+#, sh-format
+msgid "'$args' is not a stash reference"
+msgstr "'$args'ì€(는) 스태시 ë ˆí¼ëŸ°ìŠ¤ê°€ 아닙니다"
+
+#: git-stash.sh:475
+msgid "unable to refresh index"
+msgstr "ì¸ë±ìŠ¤ë¥¼ 새로 ê³ ì¹  수 없습니다"
+
+#: git-stash.sh:479
+msgid "Cannot apply a stash in the middle of a merge"
+msgstr "병합 ë„ì¤‘ì— ìŠ¤íƒœì‹œë¥¼ ì ìš©í•  수 없습니다"
+
+#: git-stash.sh:487
+msgid "Conflicts in index. Try without --index."
+msgstr "ì¸ë±ìŠ¤ì— 충ëŒ. --index ì—†ì´ ì‹œë„í•´ 보십시오."
+
+#: git-stash.sh:489
+msgid "Could not save index tree"
+msgstr "ì¸ë±ìŠ¤ 트리를 저장할 수 없습니다"
+
+#: git-stash.sh:523
+msgid "Cannot unstage modified files"
+msgstr "수정한 파ì¼ì„ 스테ì´ì§€ì—ì„œ 뺄 수 없습니다"
+
+#: git-stash.sh:538
+msgid "Index was not unstashed."
+msgstr "ì¸ë±ìŠ¤ê°€ 스태시ì—ì„œ 빠졌습니다."
+
+#: git-stash.sh:561
+#, sh-format
+msgid "Dropped ${REV} ($s)"
+msgstr "${REV} 지움 ($s)"
+
+#: git-stash.sh:562
+#, sh-format
+msgid "${REV}: Could not drop stash entry"
+msgstr "${REV}: 스태시 í•­ëª©ì„ ì§€ìš¸ 수 없습니다"
+
+#: git-stash.sh:570
+msgid "No branch name specified"
+msgstr "브랜치 ì´ë¦„ì„ ì§€ì •í•˜ì§€ 않았습니다"
+
+#: git-stash.sh:642
+msgid "(To restore them type \"git stash apply\")"
+msgstr "(복구하려면 \"git stash apply\"를 실행하십시오)"
+
+#: git-submodule.sh:104
+#, sh-format
+msgid "cannot strip one component off url '$remoteurl'"
+msgstr "'$remoteurl' URLì—ì„œ í•˜ë‚˜ì˜ í•­ëª©ì„ ìž˜ë¼ë‚¼ 수 없습니다"
+
+#: git-submodule.sh:281
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "ìƒëŒ€ 경로는 ìž‘ì—… í´ë”ì˜ ìµœìƒìœ„ì—서만 쓸 수 있습니다"
+
+#: git-submodule.sh:291
+#, sh-format
+msgid "repo URL: '$repo' must be absolute or begin with ./|../"
+msgstr "저장소 URL: '$repo' ê°’ì€ ì ˆëŒ€ 경로거나 ./ ë˜ëŠ” ../ë¡œ 시작해야 합니다."
+
+#: git-submodule.sh:308
+#, sh-format
+msgid "'$sm_path' already exists in the index"
+msgstr "'$sm_path'ì€(는) ì´ë¯¸ ì¸ë±ìŠ¤ì— 있습니다"
+
+#: git-submodule.sh:312
+#, sh-format
+msgid ""
+"The following path is ignored by one of your .gitignore files:\n"
+"$sm_path\n"
+"Use -f if you really want to add it."
+msgstr ""
+"ë‹¤ìŒ ê²½ë¡œëŠ” .gitignore 파ì¼ì—ì„œ 무시합니다:\n"
+"$sm_path\n"
+"ì •ë§ë¡œ 추가하려면 -f ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤."
+
+#: git-submodule.sh:330
+#, sh-format
+msgid "Adding existing repo at '$sm_path' to the index"
+msgstr "'$sm_path'ì˜ ê¸°ì¡´ 저장소를 ì¸ë±ìŠ¤ì— 추가합니다"
+
+#: git-submodule.sh:332
+#, sh-format
+msgid "'$sm_path' already exists and is not a valid git repo"
+msgstr "'$sm_path'ì´(ê°€) ì´ë¯¸ 있고 올바른 git 저장소가 아닙니다"
+
+#: git-submodule.sh:340
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
+msgstr "'$sm_name'ì— ëŒ€í•œ 깃 디렉터리가 로컬ì—ì„œ 리모트가 있는 채로 있습니다:"
+
+#: git-submodule.sh:342
+#, sh-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from"
+msgstr "다시 복제하지 ì•Šê³  ì´ ë¡œì»¬ 깃 디렉터리를 재활용하려면"
+
+#: git-submodule.sh:344
+#, sh-format
+msgid ""
+"use the '--force' option. If the local git directory is not the correct repo"
+msgstr ""
+"'--force' ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤. 로컬 깃 디렉터리가 올바른 저장소가 아니거나"
+
+#: git-submodule.sh:345
+#, sh-format
+msgid ""
+"or you are unsure what this means choose another name with the '--name' "
+"option."
+msgstr "무슨 ì˜ë¯¸ì¸ì§€ 잘 모르겠다면 '--name' 옵션으로 다른 ì´ë¦„ì„ ì“°ì‹­ì‹œì˜¤."
+
+#: git-submodule.sh:347
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
+msgstr "로컬 깃 디렉터리를 '$sm_name' 하위모듈로 다시 활성화합니다."
+
+#: git-submodule.sh:359
+#, sh-format
+msgid "Unable to checkout submodule '$sm_path'"
+msgstr "'$sm_path' 하위 ëª¨ë“ˆì„ ì²´í¬ì•„웃할 수 없습니다"
+
+#: git-submodule.sh:364
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr "'$sm_path' 하위 ëª¨ë“ˆì„ ì¶”ê°€í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: git-submodule.sh:373
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr "'$sm_path' 하위 ëª¨ë“ˆì„ ë“±ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: git-submodule.sh:417
+#, sh-format
+msgid "Entering '$prefix$displaypath'"
+msgstr "'$prefix$displaypath' ìž…ë ¥"
+
+#: git-submodule.sh:437
+#, sh-format
+msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgstr "'$prefix$displaypath' 위치ì—ì„œ 멈춤. 스í¬ë¦½íŠ¸ì—ì„œ 0ì´ ì•„ë‹Œ ìƒíƒœë¥¼ 리턴했습니다."
+
+#: git-submodule.sh:483
+#, sh-format
+msgid "No url found for submodule path '$displaypath' in .gitmodules"
+msgstr ".gitmodulesì—ì„œ 하위 모듈 경로 '$displaypath'ì— ëŒ€í•œ URLì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: git-submodule.sh:492
+#, sh-format
+msgid "Failed to register url for submodule path '$displaypath'"
+msgstr "하위 모듈 경로 '$displaypath'ì— ëŒ€í•œ URLì„ ë“±ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: git-submodule.sh:494
+#, sh-format
+msgid "Submodule '$name' ($url) registered for path '$displaypath'"
+msgstr "'$displaypath' ê²½ë¡œì— ($url) 대해 등ë¡ëœ '$name' 하위 모듈"
+
+#: git-submodule.sh:511
+#, sh-format
+msgid "Failed to register update mode for submodule path '$displaypath'"
+msgstr "하위 모듈 경로 '$displaypath'ì— ëŒ€í•´ ì—…ë°ì´íŠ¸ 모드를 등ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: git-submodule.sh:549
+#, sh-format
+msgid "Use '.' if you really want to deinitialize all submodules"
+msgstr "ì •ë§ë¡œ 모든 하위 모듈 초기화를 해제하려면 '.'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤"
+
+#: git-submodule.sh:566
+#, sh-format
+msgid "Submodule work tree '$displaypath' contains a .git directory"
+msgstr "하위 모듈 ìž‘ì—… í´ë”ì— ('$displaypath') .git 디렉터리가 들어 있습니다"
+
+#: git-submodule.sh:567
+#, sh-format
+msgid ""
+"(use 'rm -rf' if you really want to remove it including all of its history)"
+msgstr "(ì •ë§ë¡œ ê·¸ 커밋 내역까지 í¬í•¨í•´ 제거하려면 'rm -rf'를 사용하십시오)"
+
+#: git-submodule.sh:573
+#, sh-format
+msgid ""
+"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
+"discard them"
+msgstr "하위 모듈 ìž‘ì—… í´ë”ì— ('$displaypath') 로컬 수정 ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤. 버리려면 '-f'를 사용하십시오"
+
+#: git-submodule.sh:576
+#, sh-format
+msgid "Cleared directory '$displaypath'"
+msgstr "'$displaypath' 디렉터리를 지ì›ë‹ˆë‹¤"
+
+#: git-submodule.sh:577
+#, sh-format
+msgid "Could not remove submodule work tree '$displaypath'"
+msgstr "하위 모듈 디렉터리를 ('$displaypath') 제거할 수 없습니다"
+
+#: git-submodule.sh:580
+#, sh-format
+msgid "Could not create empty submodule directory '$displaypath'"
+msgstr "빈 하위 모듈 디렉터리를 ('$displaypath') 만들 수 없습니다"
+
+#: git-submodule.sh:589
+#, sh-format
+msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+msgstr "'$name' 하위 ëª¨ë“ˆì´ ($url) '$displaypath' ê²½ë¡œì— ëŒ€í•´ 등ë¡ë˜ì§€ 않았습니다"
+
+#: git-submodule.sh:705
+#, sh-format
+msgid ""
+"Submodule path '$displaypath' not initialized\n"
+"Maybe you want to use 'update --init'?"
+msgstr ""
+"하위 모듈 경로가 ('$displaypath') 초기화ë˜ì§€ 않았습니다\n"
+"ì•„ë§ˆë„ 'update --init'ì´ í•„ìš”í•©ë‹ˆë‹¤?"
+
+#: git-submodule.sh:718
+#, sh-format
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr "하위 모듈 경로ì—ì„œ ('$displaypath') 현재 ë¦¬ë¹„ì „ì„ ì°¾ì„ ìˆ˜ 없습니다"
+
+#: git-submodule.sh:727
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
+msgstr "하위 모듈 경로 '$sm_path'ì—ì„œ 가져올 수 없습니다"
+
+#: git-submodule.sh:751
+#, sh-format
+msgid "Unable to fetch in submodule path '$displaypath'"
+msgstr "하위 모듈 경로 '$displaypath'ì—ì„œ 가져올 수 없습니다"
+
+#: git-submodule.sh:765
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr "하위 모듈 경로 '$displaypath'ì—ì„œ '$sha1'ì„(를) ì²´í¬ì•„웃할 수 없습니다"
+
+#: git-submodule.sh:766
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "하위 모듈 경로 '$displaypath': '$sha1' ì²´í¬ì•„웃"
+
+#: git-submodule.sh:770
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr "하위 모듈 경로 '$displaypath'ì—ì„œ '$sha1'ì„(를) 리베ì´ìŠ¤í•  수 없습니다"
+
+#: git-submodule.sh:771
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "하위 모듈 경로 '$displaypath': '$sha1'(으)ë¡œ 리베ì´ìŠ¤"
+
+#: git-submodule.sh:776
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr "하위 모듈 경로 '$displaypath'ì—ì„œ '$sha1' 병합할 수 없습니다"
+
+#: git-submodule.sh:777
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "하위 모듈 경로 '$displaypath': '$sha1'ì—ì„œ 병합"
+
+#: git-submodule.sh:782
+#, sh-format
+msgid ""
+"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgstr "하위 모듈 경로 '$prefix$sm_path'ì—ì„œ '$command $sha1' ì‹¤í–‰ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: git-submodule.sh:783
+#, sh-format
+msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
+msgstr "하위 모듈 경로 '$prefix$sm_path': '$command $sha1'"
+
+#: git-submodule.sh:813
+#, sh-format
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr "재귀ì ìœ¼ë¡œ 하위 모듈 경로 '$displaypath'ì— ë“¤ì–´ê°€ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: git-submodule.sh:921
+msgid "The --cached option cannot be used with the --files option"
+msgstr "--cached ì˜µì…˜ì€ --files 옵션과 ê°™ì´ ì“¸ 수 없습니다"
+
+#: git-submodule.sh:973
+#, sh-format
+msgid "unexpected mode $mod_dst"
+msgstr "예ìƒì¹˜ 못한 모드 $mod_dst"
+
+#: git-submodule.sh:993
+#, sh-format
+msgid " Warn: $display_name doesn't contain commit $sha1_src"
+msgstr " 경고: '$display_name'ì— '$sha1_src' ì»¤ë°‹ì´ ë“¤ì–´ìžˆì§€ 않습니다"
+
+#: git-submodule.sh:996
+#, sh-format
+msgid " Warn: $display_name doesn't contain commit $sha1_dst"
+msgstr " 경고: '$display_name'ì— '$sha1_dst' ì»¤ë°‹ì´ ë“¤ì–´ìžˆì§€ 않습니다"
+
+#: git-submodule.sh:999
+#, sh-format
+msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+msgstr " 경고: '$display_name'ì— '$sha1_src' ë° '$sha1_dst' ì»¤ë°‹ì´ ë“¤ì–´ìžˆì§€ 않습니다"
+
+#: git-submodule.sh:1024
+msgid "blob"
+msgstr "블롭"
+
+#: git-submodule.sh:1142
+#, sh-format
+msgid "Failed to recurse into submodule path '$sm_path'"
+msgstr "재귀ì ìœ¼ë¡œ 하위 모듈 경로 '$sm_path'ì— ë“¤ì–´ê°€ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: git-submodule.sh:1206
+#, sh-format
+msgid "Synchronizing submodule url for '$displaypath'"
+msgstr "하위 모듈 URLì„ '$displaypath'ì— ëŒ€í•´ ë™ê¸°í™”"
diff --git a/po/ru.po b/po/ru.po
index c9e1fb8..0de4ff9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,10 +8,10 @@
# insolor <insolor@gmail.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: Перевод Git на руÑÑкий Ñзык\n"
+"Project-Id-Version: Git Russian Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-09-15 06:45+0800\n"
-"PO-Revision-Date: 2015-09-30 14:53+0000\n"
+"POT-Creation-Date: 2015-12-22 22:50+0800\n"
+"PO-Revision-Date: 2015-12-25 11:57+0000\n"
"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -31,13 +31,13 @@ msgid ""
"as appropriate to mark resolution and make a commit."
msgstr "ИÑправьте их в рабочем каталоге, затем запуÑтите «git add/rm <файл>»,\nчтобы пометить иÑправление и Ñделайте коммит."
-#: advice.c:101 builtin/merge.c:1227
+#: advice.c:101 builtin/merge.c:1225
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Ð’Ñ‹ не завершили ÑлиÑние (приÑутÑтвует файл MERGE_HEAD)."
#: advice.c:103
-msgid "Please, commit your changes before you can merge."
-msgstr "Выполните коммит ваших изменений, перед ÑлиÑнием."
+msgid "Please, commit your changes before merging."
+msgstr "Перед ÑлиÑнием, выполните коммит ваших изменений."
#: advice.c:104
msgid "Exiting because of unfinished merge."
@@ -61,76 +61,76 @@ msgstr "git archive --remote <репозиторий> [--exec <команда>]
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <репозиторий> [--exec <команда>] --list"
-#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿ÑƒÑ‚Ð¸ «%s» не ÑоответÑтвует ни одному файлу"
-#: archive.c:428
+#: archive.c:429
msgid "fmt"
msgstr "формат"
-#: archive.c:428
+#: archive.c:429
msgid "archive format"
msgstr "формат архива"
-#: archive.c:429 builtin/log.c:1229
+#: archive.c:430 builtin/log.c:1229
msgid "prefix"
msgstr "префикÑ"
-#: archive.c:430
+#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
msgstr "добавлÑÑ‚ÑŒ Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ Ð¿ÐµÑ€ÐµÐ´ каждым путем файла в архиве"
-#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516
-#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535
+#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99
#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "файл"
-#: archive.c:432 builtin/archive.c:89
+#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "запиÑÑŒ архива в Ñтот файл"
-#: archive.c:434
+#: archive.c:435
msgid "read .gitattributes in working directory"
msgstr "читать .gitattributes в рабочем каталоге"
-#: archive.c:435
+#: archive.c:436
msgid "report archived files on stderr"
msgstr "отчет об архивированных файлах в stderr"
-#: archive.c:436
+#: archive.c:437
msgid "store only"
msgstr "только хранение"
-#: archive.c:437
+#: archive.c:438
msgid "compress faster"
msgstr "Ñжимать быÑтрее"
-#: archive.c:445
+#: archive.c:446
msgid "compress better"
msgstr "Ñжимать лучше"
-#: archive.c:448
+#: archive.c:449
msgid "list supported archive formats"
msgstr "перечиÑлить поддерживаемые форматы архивов"
-#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr "репозиторий"
-#: archive.c:451 builtin/archive.c:91
+#: archive.c:452 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "получить архив из внешнего <репозиториÑ>"
-#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr "комманда"
-#: archive.c:453 builtin/archive.c:93
+#: archive.c:454 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "путь к команде git-upload-archive на машине Ñ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¼ репозиторием"
@@ -140,82 +140,82 @@ msgid ""
"Use '\\!' for literal leading exclamation."
msgstr "Отрицающие шаблоны в атрибутах git игнорируютÑÑ.\nИÑпользуйте «\\!» Ð´Ð»Ñ Ð±ÑƒÐºÐ²Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñимвола в значении «воÑклицательный знак»."
-#: branch.c:60
+#: branch.c:61
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "Ðе уÑтанавливаю ветку %s, так так она принадлежит вышеÑтоÑщему репозиторию."
-#: branch.c:83
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr "Ветка %s отÑлеживает внешнюю ветку %s из %s перемещением."
-#: branch.c:84
+#: branch.c:85
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "Ветка %s отÑлеживает внешнюю ветку %s из %s."
-#: branch.c:88
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr "Ветка %s отÑлеживает локальную ветку %s перемещением."
-#: branch.c:89
+#: branch.c:90
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "Ветка %s отÑлеживает локальную ветку %s."
-#: branch.c:94
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr "Ветка %s отÑлеживает внешнюю ÑÑылку %s перемещением."
-#: branch.c:95
+#: branch.c:96
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "Ветка %s отÑлеживает внешнюю ÑÑылку %s."
-#: branch.c:99
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr "Ветка %s отÑлеживает локальную ÑÑылку %s перемещением."
-#: branch.c:100
+#: branch.c:101
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "Ветка %s отÑлеживает локальную ÑÑылку %s."
-#: branch.c:133
+#: branch.c:134
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Ðе отÑлеживаетÑÑ: Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð´Ð»Ñ ÑÑылки %s"
-#: branch.c:162
+#: branch.c:163
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "«%s» не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным именем ветки."
-#: branch.c:167
+#: branch.c:168
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Ветка Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ «%s» уже ÑущеÑтвует."
-#: branch.c:175
+#: branch.c:176
msgid "Cannot force update the current branch."
msgstr "Ðе удалоÑÑŒ принудительно обновить текущую ветку."
-#: branch.c:195
+#: branch.c:196
#, c-format
msgid ""
"Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Ðе удалоÑÑŒ наÑтроить информацию отÑлеживаниÑ; ÑÑ‚Ð°Ñ€Ñ‚Ð¾Ð²Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° «%s» не ÑвлÑетÑÑ Ð²ÐµÑ‚ÐºÐ¾Ð¹."
-#: branch.c:197
+#: branch.c:198
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ð°Ñ Ð²ÐµÑ‚ÐºÐ° вышеÑтоÑщего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s» не ÑущеÑтвует"
-#: branch.c:199
+#: branch.c:200
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -227,22 +227,22 @@ msgid ""
"\"git push -u\" to set the upstream config as you push."
msgstr "\nЕÑли вы планируете оÑновывать Ñвою работу на вышеÑтоÑщей ветке, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑƒÐ¶Ðµ ÑущеÑтвует во внешнем репозитории, вам может потребоватьÑÑ Ð·Ð°Ð¿ÑƒÑтить «git fetch» Ð´Ð»Ñ ÐµÐµ получениÑ.\n\nЕÑли вы планируете отправить новую локальную ветку, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ отÑлеживатьÑÑ, во внешний репозиторий, вам может потребоватьÑÑ Ð·Ð°Ð¿ÑƒÑтить «git push -u» — чтобы Ñохранить наÑтройку вышеÑтоÑщего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸."
-#: branch.c:243
+#: branch.c:244
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°: «%s»."
-#: branch.c:263
+#: branch.c:264
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Ðеоднозначное Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°: «%s»."
-#: branch.c:268
+#: branch.c:269
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° ветки: «%s»."
-#: branch.c:399
+#: branch.c:322
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "«%s» уже находитÑÑ Ð½Ð° «%s»"
@@ -257,7 +257,7 @@ msgstr "«%s» не похож на файл пакета верÑии 2"
msgid "unrecognized header: %s%s (%d)"
msgstr "неопознанный заголовок: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:765
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr "не удалоÑÑŒ открыть «%s»"
@@ -266,9 +266,9 @@ msgstr "не удалоÑÑŒ открыть «%s»"
msgid "Repository lacks these prerequisite commits:"
msgstr "Ð’ репозитории отÑутÑтвуют необходимые коммиты:"
-#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708
-#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
-#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "Ñбой инициализации прохода по редакциÑм"
@@ -312,7 +312,7 @@ msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° rev-list"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "ÑÑылка «%s» иÑключена в ÑоответÑтвии Ñ Ð¾Ð¿Ñ†Ð¸Ñми rev-list"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "неопознанный аргумент: %s"
@@ -330,13 +330,13 @@ msgstr "не удалоÑÑŒ Ñоздать «%s»"
msgid "index-pack died"
msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° index-pack"
-#: color.c:260
+#: color.c:275
#, c-format
msgid "invalid color value: %.*s"
msgstr "недопуÑтимое значение цвета: %.*s"
-#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
-#: builtin/am.c:2128
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
#, c-format
msgid "could not parse %s"
msgstr "не удалоÑÑŒ разобрать %s"
@@ -512,54 +512,54 @@ msgstr "Ñбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ orderfile «%s»"
msgid "Performing inexact rename detection"
msgstr "ВыполнÑетÑÑ Ð½ÐµÑ‚Ð¾Ñ‡Ð½Ð¾Ðµ определение переименованиÑ"
-#: diff.c:116
+#: diff.c:115
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Сбой разбора величины Ñреза (cut-off) у dirstat «%s»\n"
-#: diff.c:121
+#: diff.c:120
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr "ÐеизвеÑтный параметр dirstat: «%s»\n"
-#: diff.c:216
+#: diff.c:215
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "ÐеизвеÑтное Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ «diff.submodule»: «%s»"
-#: diff.c:268
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr "Ðайдены ошибки в переменной «diff.dirstat»:\n%s"
-#: diff.c:2998
+#: diff.c:3000
#, c-format
msgid "external diff died, stopping at %s"
msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при внешнем Ñравнении, оÑтанов на %s"
-#: diff.c:3394
+#: diff.c:3396
msgid "--follow requires exactly one pathspec"
msgstr "--follow требует ровно одной Ñпецификации пути"
-#: diff.c:3557
+#: diff.c:3559
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
-#: diff.c:3571
+#: diff.c:3573
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Сбой разбора параметра опции --submodule: «%s»"
-#: dir.c:1853
+#: dir.c:1915
msgid "failed to get kernel name and information"
msgstr "не удалоÑÑŒ получить Ð¸Ð¼Ñ Ñдра и информацию"
-#: dir.c:1936
+#: dir.c:1998
msgid "Untracked cache is disabled on this system."
msgstr "КÑш неотÑлеживаемых файлов отключен на Ñтой ÑиÑтеме."
@@ -662,8 +662,8 @@ msgstr "%s: %s — %s"
msgid "failed to read the cache"
msgstr "Ñбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ ÐºÑша"
-#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:715
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
msgid "unable to write new index file"
msgstr "не удалоÑÑŒ запиÑать новый файл индекÑа"
@@ -681,218 +681,218 @@ msgstr "Ñбой addinfo_cache Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «%s»"
msgid "error building trees"
msgstr "ошибка при поÑтроении деревьев"
-#: merge-recursive.c:687
+#: merge-recursive.c:686
#, c-format
msgid "failed to create path '%s'%s"
msgstr "не удалоÑÑŒ Ñоздать путь «%s»%s"
-#: merge-recursive.c:698
+#: merge-recursive.c:697
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Удаление %s, чтобы оÑвободить меÑто Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð²\n"
-#: merge-recursive.c:712 merge-recursive.c:733
+#: merge-recursive.c:711 merge-recursive.c:732
msgid ": perhaps a D/F conflict?"
msgstr ": возможно, конфликт каталогов/файлов?"
-#: merge-recursive.c:723
+#: merge-recursive.c:722
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "отказ потери неотÑлеживаемого файла в «%s»"
-#: merge-recursive.c:763
+#: merge-recursive.c:762
#, c-format
msgid "cannot read object %s '%s'"
msgstr "невозможно прочитать объект %s «%s»"
-#: merge-recursive.c:765
+#: merge-recursive.c:764
#, c-format
msgid "blob expected for %s '%s'"
msgstr "ожидаетÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ð¹ объект Ð´Ð»Ñ %s «%s»"
-#: merge-recursive.c:788 builtin/clone.c:364
+#: merge-recursive.c:787 builtin/clone.c:369
#, c-format
msgid "failed to open '%s'"
msgstr "не удалоÑÑŒ открыть «%s»"
-#: merge-recursive.c:796
+#: merge-recursive.c:795
#, c-format
msgid "failed to symlink '%s'"
msgstr "не удалоÑÑŒ Ñоздать Ñимвольную ÑÑылку «%s»"
-#: merge-recursive.c:799
+#: merge-recursive.c:798
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "не понÑтно, что делать Ñ %06o %s «%s»"
-#: merge-recursive.c:937
+#: merge-recursive.c:936
msgid "Failed to execute internal merge"
msgstr "Ðе удалоÑÑŒ запуÑтить внутреннее ÑлиÑние"
-#: merge-recursive.c:941
+#: merge-recursive.c:940
#, c-format
msgid "Unable to add %s to database"
msgstr "Ðе удалоÑÑŒ добавить %s в базу данных"
-#: merge-recursive.c:957
+#: merge-recursive.c:956
msgid "unsupported object type in the tree"
msgstr "объект неподдерживаемого типа в дереве"
-#: merge-recursive.c:1032 merge-recursive.c:1046
+#: merge-recursive.c:1031 merge-recursive.c:1045
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr "КОÐФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. ВерÑÐ¸Ñ %s из %s оÑтавлена в дереве."
-#: merge-recursive.c:1038 merge-recursive.c:1051
+#: merge-recursive.c:1037 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr "КОÐФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. ВерÑÐ¸Ñ %s из %s оÑтавлена в дереве на %s."
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "rename"
msgstr "переименование"
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "renamed"
msgstr "переименовано"
-#: merge-recursive.c:1148
+#: merge-recursive.c:1147
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s — Ñто каталог в %s, добавлÑем как %s вмеÑто Ñтого"
-#: merge-recursive.c:1170
+#: merge-recursive.c:1169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
"\"%s\"->\"%s\" in \"%s\"%s"
msgstr "КОÐФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1174
msgid " (left unresolved)"
msgstr " (оÑтавлено неразрешенным)"
-#: merge-recursive.c:1229
+#: merge-recursive.c:1228
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr "КОÐФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»"
-#: merge-recursive.c:1259
+#: merge-recursive.c:1258
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Переименовываю %s в %s и %s в %s вмеÑто Ñтого"
-#: merge-recursive.c:1458
+#: merge-recursive.c:1457
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "КОÐФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»"
-#: merge-recursive.c:1468
+#: merge-recursive.c:1467
#, c-format
msgid "Adding merged %s"
msgstr "Добавление Ñлитого %s"
-#: merge-recursive.c:1473 merge-recursive.c:1671
+#: merge-recursive.c:1472 merge-recursive.c:1674
#, c-format
msgid "Adding as %s instead"
msgstr "Добавление вмеÑто Ñтого как %s"
-#: merge-recursive.c:1524
+#: merge-recursive.c:1523
#, c-format
msgid "cannot read object %s"
msgstr "невозможно прочитать объект «%s»"
-#: merge-recursive.c:1527
+#: merge-recursive.c:1526
#, c-format
msgid "object %s is not a blob"
msgstr "объект %s не ÑвлÑетÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ð¼ объектом"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modify"
msgstr "изменение"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modified"
msgstr "изменено"
-#: merge-recursive.c:1585
+#: merge-recursive.c:1588
msgid "content"
msgstr "Ñодержимое"
-#: merge-recursive.c:1592
+#: merge-recursive.c:1595
msgid "add/add"
msgstr "добавление/добавление"
-#: merge-recursive.c:1626
+#: merge-recursive.c:1629
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "ПропуÑк %s (Ñлиты одинаковые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ°Ðº ÑущеÑтвующие)"
-#: merge-recursive.c:1640
+#: merge-recursive.c:1643
#, c-format
msgid "Auto-merging %s"
msgstr "ÐвтоÑлиÑние %s"
-#: merge-recursive.c:1644 git-submodule.sh:1150
+#: merge-recursive.c:1647 git-submodule.sh:1025
msgid "submodule"
msgstr "подмодуль"
-#: merge-recursive.c:1645
+#: merge-recursive.c:1648
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОÐФЛИКТ (%s): Конфликт ÑлиÑÐ½Ð¸Ñ Ð² %s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1734
#, c-format
msgid "Removing %s"
msgstr "Удаление %s"
-#: merge-recursive.c:1756
+#: merge-recursive.c:1759
msgid "file/directory"
msgstr "файл/каталог"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1765
msgid "directory/file"
msgstr "каталог/файл"
-#: merge-recursive.c:1767
+#: merge-recursive.c:1770
#, c-format
msgid ""
"CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "КОÐФЛИКТ (%s): Уже ÑущеÑтвует каталог Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ «%s» в «%s». Добавление «%s» как «%s»"
-#: merge-recursive.c:1777
+#: merge-recursive.c:1780
#, c-format
msgid "Adding %s"
msgstr "Добавление %s"
-#: merge-recursive.c:1794
+#: merge-recursive.c:1797
msgid "Fatal merge failure, shouldn't happen."
msgstr "КритичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° ÑлиÑниÑ, такого не должно ÑлучатьÑÑ."
-#: merge-recursive.c:1813
+#: merge-recursive.c:1816
msgid "Already up-to-date!"
msgstr "Уже обновлено!"
-#: merge-recursive.c:1822
+#: merge-recursive.c:1825
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "Ñбой ÑлиÑÐ½Ð¸Ñ Ð´ÐµÑ€ÐµÐ²ÑŒÐµÐ² «%s» и «%s»"
-#: merge-recursive.c:1852
+#: merge-recursive.c:1855
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Ðеобработанный путь??? %s"
-#: merge-recursive.c:1900
+#: merge-recursive.c:1903
msgid "Merging:"
msgstr "СлиÑние:"
-#: merge-recursive.c:1913
+#: merge-recursive.c:1916
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
@@ -901,16 +901,16 @@ msgstr[1] "найдено %u общих предка:"
msgstr[2] "найдено %u общих предков:"
msgstr[3] "найдено %u общих предков:"
-#: merge-recursive.c:1950
+#: merge-recursive.c:1953
msgid "merge returned no commit"
msgstr "ÑлиÑние не вернуло коммит"
-#: merge-recursive.c:2007
+#: merge-recursive.c:2010
#, c-format
msgid "Could not parse object '%s'"
msgstr "Ðе удалоÑÑŒ разобрать объект «%s»"
-#: merge-recursive.c:2018 builtin/merge.c:645
+#: merge-recursive.c:2021 builtin/merge.c:645
msgid "Unable to write index."
msgstr "Ðе удаетÑÑ Ð·Ð°Ð¿Ð¸Ñать индекÑ."
@@ -940,31 +940,41 @@ msgstr "Ðеправильное значение переменной %s: «%sÂ
msgid "unable to parse object: %s"
msgstr "не удалоÑÑŒ разобрать объект: %s"
-#: parse-options.c:563
+#: parse-options.c:570
msgid "..."
msgstr "…"
-#: parse-options.c:581
+#: parse-options.c:588
#, c-format
msgid "usage: %s"
msgstr "иÑпользование: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:585
+#: parse-options.c:592
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:588
+#: parse-options.c:595
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:622
+#: parse-options.c:629
msgid "-NUM"
msgstr "-КОЛИЧЕСТВО"
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "Поврежденное Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° «%s»"
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Ðе удалоÑÑŒ предоÑтавить доÑтуп к %s на запиÑÑŒ"
+
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "глобальные опции Ñпецификации пути «glob» и «noglob» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
@@ -1029,125 +1039,170 @@ msgstr "Ðе указан шаблон Ð´Ð»Ñ Ð¸ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰
msgid "unable to parse --pretty format"
msgstr "не удалоÑÑŒ разобрать формат Ð´Ð»Ñ --pretty"
-#: progress.c:236
+#: progress.c:235
msgid "done"
msgstr "готово"
-#: read-cache.c:1296
+#: read-cache.c:1281
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr "index.version указан, но значение недейÑтвительное.\nИÑпользую верÑию %i"
-#: read-cache.c:1306
+#: read-cache.c:1291
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr "GIT_INDEX_VERSION указан, но значение недейÑтвительное.\nИÑпользую верÑию %i"
-#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
#: builtin/merge.c:983
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Ðе удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи"
-#: refs.c:3001
+#: refs/files-backend.c:2359
#, c-format
msgid "could not delete reference %s: %s"
msgstr "не удалоÑÑŒ удалить ÑÑылку %s: %s"
-#: refs.c:3004
+#: refs/files-backend.c:2362
#, c-format
msgid "could not delete references: %s"
msgstr "не удалоÑÑŒ удалить ÑÑылки: %s"
-#: refs.c:3013
+#: refs/files-backend.c:2371
#, c-format
msgid "could not remove reference %s"
msgstr "не удалоÑÑŒ удалить ÑÑылки %s"
-#: ref-filter.c:660
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "формат: чаÑтица %%(end) иÑпользована без ÑоответÑтвующей чаÑтицы"
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "положительное значение ожидает Ñодержимое:lines=%s"
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "ожидаемый формат: %%(color:<color>)"
+
+#: ref-filter.c:835
msgid "unable to parse format"
msgstr "не удалоÑÑŒ разобрать формат"
-#: remote.c:792
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "ожидаемый формат: %%(align:<width>,<position>)"
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr "указан неверный формат align:%s"
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "ожидаетÑÑ Ð¿Ð¾Ð»Ð¾Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð° Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ чаÑтицы %%(align)"
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "Поврежденный объект «%s»"
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: пропущена чаÑтица %%(end)"
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr "плохое Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° %s"
+
+#: remote.c:756
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÑŒ одновременно %s и %s в %s"
-#: remote.c:796
+#: remote.c:760
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s обычно отÑлеживает %s, а не %s"
-#: remote.c:800
+#: remote.c:764
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s отÑлеживает и %s и %s"
-#: remote.c:808
+#: remote.c:772
msgid "Internal error"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
-#: remote.c:1723 remote.c:1766
+#: remote.c:1687 remote.c:1730
msgid "HEAD does not point to a branch"
msgstr "HEAD не указывает на ветку"
-#: remote.c:1732
+#: remote.c:1696
#, c-format
msgid "no such branch: '%s'"
msgstr "нет такой ветки: «%s»"
-#: remote.c:1735
+#: remote.c:1699
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "вышеÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° не наÑтроена Ð´Ð»Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»"
-#: remote.c:1741
+#: remote.c:1705
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "вышеÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s» не Ñохранена как отÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ°"
-#: remote.c:1756
+#: remote.c:1720
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "назначение Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ «%s» на внешнем Ñервере «%s» не имеет локальной отÑлеживаемой ветки"
-#: remote.c:1771
+#: remote.c:1735
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "ветка «%s» не имеет внешнего Ñервера Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸"
-#: remote.c:1782
+#: remote.c:1746
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "Ñпецификации пути Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ «%s» не включают в ÑÐµÐ±Ñ Â«%s»"
-#: remote.c:1795
+#: remote.c:1759
msgid "push has no destination (push.default is 'nothing')"
msgstr "отправка не имеет точки Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ (push.default выÑтавлен в «nothing»)"
-#: remote.c:1817
+#: remote.c:1781
msgid "cannot resolve 'simple' push to a single destination"
msgstr "не удалоÑÑŒ выполнить «simple» отправку в единÑтвенную точку назначениÑ"
-#: remote.c:2124
+#: remote.c:2083
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Ваша ветка базируетÑÑ Ð½Ð° «%s», но вышеÑтоÑщий репозиторий иÑчез.\n"
-#: remote.c:2128
+#: remote.c:2087
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr "(Ð´Ð»Ñ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿ÑƒÑтите «git branch --unset-upstream»)\n"
-#: remote.c:2131
+#: remote.c:2090
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Ваша ветка обновлена в ÑоответÑтвии Ñ Â«%s».\n"
-#: remote.c:2135
+#: remote.c:2094
#, 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"
@@ -1156,11 +1211,11 @@ msgstr[1] "Ваша ветка опережает «%s» на %d коммита.
msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n"
msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n"
-#: remote.c:2141
+#: remote.c:2100
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (иÑпользуйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
-#: remote.c:2144
+#: remote.c:2103
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1170,11 +1225,11 @@ msgstr[1] "Ваша ветка отÑтает от «%s» на %d коммита
msgstr[2] "Ваша ветка отÑтает от «%s» на %d коммитов и может быть перемотана вперед.\n"
msgstr[3] "Ваша ветка отÑтает от «%s» на %d коммитов и может быть перемотана вперед.\n"
-#: remote.c:2152
+#: remote.c:2111
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (иÑпользуйте «git pull», чтобы обновить вашу локальную ветку)\n"
-#: remote.c:2155
+#: remote.c:2114
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1187,28 +1242,28 @@ msgstr[1] "Ваша ветка и «%s» разошлиÑÑŒ\nи теперь иÐ
msgstr[2] "Ваша ветка и «%s» разошлиÑÑŒ\nи теперь имеют %d и %d разных коммитов в каждой ÑоответÑтвенно.\n"
msgstr[3] "Ваша ветка и «%s» разошлиÑÑŒ\nи теперь имеют %d и %d разных коммитов в каждой ÑоответÑтвенно.\n"
-#: remote.c:2165
+#: remote.c:2124
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (иÑпользуйте «git pull», чтобы Ñлить внешнюю ветку в вашу)\n"
-#: revision.c:2198
+#: revision.c:2193
msgid "your current branch appears to be broken"
msgstr "похоже, ваша Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° повреждена"
-#: revision.c:2201
+#: revision.c:2196
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "ваша Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s» еще не Ñодержит ни одного коммита"
-#: revision.c:2395
+#: revision.c:2390
msgid "--first-parent is incompatible with --bisect"
msgstr "опцию --first-parent Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --bisect"
-#: run-command.c:83
+#: run-command.c:90
msgid "open /dev/null failed"
msgstr "Ñбой Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ /dev/null"
-#: run-command.c:85
+#: run-command.c:92
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) Ñбой"
@@ -1419,7 +1474,7 @@ msgstr "не удалоÑÑŒ определить HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ Ð²ÐµÑ‚ÐºÐ¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÐµÑ‰Ðµ не Ñоздана"
-#: sequencer.c:887 builtin/apply.c:4291
+#: sequencer.c:887 builtin/apply.c:4287
#, c-format
msgid "cannot open %s: %s"
msgstr "не удалоÑÑŒ открыть %s: %s"
@@ -1461,12 +1516,12 @@ msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚ÑŒ изначальный коммит"
msgid "Can't cherry-pick into empty head"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ лучшее в пуÑтой HEAD"
-#: setup.c:243
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "не удалоÑÑŒ прочитать %s"
-#: sha1_name.c:453
+#: sha1_name.c:463
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1502,7 +1557,7 @@ msgstr "Ðе удалоÑÑŒ удалить запиÑÑŒ в .gitmodules Ð´Ð»Ñ %s
msgid "staging updated .gitmodules failed"
msgstr "Ñбой индекÑÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ .gitmodules"
-#: submodule.c:1045
+#: submodule.c:1040
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "Ðе удалоÑÑŒ уÑтановить core.worktree в %s"
@@ -1513,7 +1568,7 @@ msgstr "Ðе удалоÑÑŒ уÑтановить core.worktree в %s"
msgid "unknown value '%s' for key '%s'"
msgstr "неизвеÑтное значение «%s» Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° «%s»"
-#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
#, c-format
msgid "more than one %s"
msgstr "больше одного %s"
@@ -1580,8 +1635,8 @@ msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸ запÐ
msgid "could not open '%s' for writing"
msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи"
-#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
-#: builtin/merge.c:1076 builtin/pull.c:380
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
#, c-format
msgid "could not open '%s' for reading"
msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
@@ -1596,30 +1651,21 @@ msgstr "«%s» недоÑтупно: %s"
msgid "unable to access '%s'"
msgstr "«%s» недоÑтупно"
-#: wrapper.c:611
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr "не удалоÑÑŒ запроÑить текущего Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² файле passwd: %s"
-
-#: wrapper.c:612
-msgid "no such user"
-msgstr "нет такого пользователÑ"
-
-#: wrapper.c:620
+#: wrapper.c:608
msgid "unable to get current working directory"
msgstr "не удалоÑÑŒ получить текущий рабочий каталог"
-#: wrapper.c:631
+#: wrapper.c:635
#, c-format
msgid "could not open %s for writing"
msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи"
-#: wrapper.c:642 builtin/am.c:424
+#: wrapper.c:646 builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "не удалоÑÑŒ запиÑать в %s"
-#: wrapper.c:648
+#: wrapper.c:652
#, c-format
msgid "could not close %s"
msgstr "не удалоÑÑŒ закрыть %s"
@@ -1950,27 +1996,27 @@ msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð² процеÑÑе двоичного поиÑка."
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (иÑпользуйте «git bisect reset», чтобы вернутьÑÑ Ð½Ð° иÑходную ветку)"
-#: wt-status.c:1437
+#: wt-status.c:1438
msgid "On branch "
msgstr "Ðа ветке "
-#: wt-status.c:1445
+#: wt-status.c:1444
msgid "interactive rebase in progress; onto "
msgstr "интерактивное перемещение в процеÑÑе; над "
-#: wt-status.c:1447
+#: wt-status.c:1446
msgid "rebase in progress; onto "
msgstr "перемещение в процеÑÑе; над "
-#: wt-status.c:1452
+#: wt-status.c:1451
msgid "HEAD detached at "
msgstr "HEAD отделен на "
-#: wt-status.c:1454
+#: wt-status.c:1453
msgid "HEAD detached from "
msgstr "HEAD отделен Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ "
-#: wt-status.c:1457
+#: wt-status.c:1456
msgid "Not currently on any branch."
msgstr "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð½Ð¸ на одной из веток"
@@ -2022,7 +2068,7 @@ msgstr "нет изменений добавленных Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°\n
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
-msgstr "ничего не добавлено в коммит, но еÑÑ‚ÑŒ неотÑлеживаемые файлы (иÑпользуйте \"git add\", чтобы отÑлеживать их)\n"
+msgstr "ничего не добавлено в коммит, но еÑÑ‚ÑŒ неотÑлеживаемые файлы (иÑпользуйте «git add», чтобы отÑлеживать их)\n"
#: wt-status.c:1522
#, c-format
@@ -2049,23 +2095,23 @@ msgstr "нечего коммитить (иÑпользуйте опцию «-uÂ
msgid "nothing to commit, working directory clean\n"
msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
-#: wt-status.c:1644
-msgid "HEAD (no branch)"
-msgstr "HEAD (нет ветки)"
-
-#: wt-status.c:1650
+#: wt-status.c:1642
msgid "Initial commit on "
msgstr "Ðачальный коммит на "
-#: wt-status.c:1677
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
+msgstr "HEAD (нет ветки)"
+
+#: wt-status.c:1675
msgid "gone"
msgstr "иÑчез"
-#: wt-status.c:1679 wt-status.c:1687
+#: wt-status.c:1677 wt-status.c:1685
msgid "behind "
msgstr "позади"
-#: compat/precompose_utf8.c:55 builtin/clone.c:403
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
#, c-format
msgid "failed to unlink '%s'"
msgstr "Ñбой отÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Â«%s»"
@@ -2079,7 +2125,7 @@ msgstr "git add [<опции>] [--] <ÑпецификациÑ-пути>…"
msgid "unexpected diff status %c"
msgstr "неожиданный ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ð¹ %c"
-#: builtin/add.c:70 builtin/commit.c:277
+#: builtin/add.c:70 builtin/commit.c:278
msgid "updating files failed"
msgstr "Ñбой при обновлении файлов"
@@ -2092,7 +2138,7 @@ msgstr "удалить «%s»\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "ÐепроиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа:"
-#: builtin/add.c:194 builtin/rev-parse.c:799
+#: builtin/add.c:194 builtin/rev-parse.c:796
msgid "Could not read the index"
msgstr "Ðе удалоÑÑŒ прочитать индекÑ"
@@ -2127,15 +2173,15 @@ msgstr "Ðе удалоÑÑŒ применить «%s»"
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Следующие пути игнорируютÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ваших файлов .gitignore:\n"
-#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
-#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "пробный запуÑк"
-#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
-#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
-#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "быть многоÑловнее"
@@ -2143,7 +2189,7 @@ msgstr "быть многоÑловнее"
msgid "interactive picking"
msgstr "интерактивный выбор"
-#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "интерактивный выбор блоков"
@@ -2200,410 +2246,412 @@ msgstr "-A и -u Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "ÐžÐ¿Ñ†Ð¸Ñ --ignore-missing может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ вмеÑте Ñ --dry-run"
-#: builtin/add.c:358
+#: builtin/add.c:352
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Ðичего не указано, ничего не добавлено.\n"
-#: builtin/add.c:359
+#: builtin/add.c:353
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Возможно, вы имели в виду «git add .»?\n"
-#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
-#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
msgid "index file corrupt"
msgstr "файл индекÑа поврежден"
-#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Ðе удалоÑÑŒ запиÑать новый файл индекÑа"
-#: builtin/am.c:41
+#: builtin/am.c:42
#, c-format
msgid "could not stat %s"
msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ %s"
-#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737
-#: builtin/merge.c:1079
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
#, c-format
msgid "could not read '%s'"
msgstr "не удалоÑÑŒ прочитать «%s»"
-#: builtin/am.c:444
+#: builtin/am.c:445
msgid "could not parse author script"
msgstr "не удалоÑÑŒ разобрать Ñценарий авторÑтва"
-#: builtin/am.c:521
+#: builtin/am.c:522
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "«%s» был удален перехватчиком applypatch-msg"
-#: builtin/am.c:562 builtin/notes.c:300
+#: builtin/am.c:563 builtin/notes.c:300
#, c-format
msgid "Malformed input line: '%s'."
msgstr "ÐŸÐ»Ð¾Ñ…Ð°Ñ Ñтрока ввода: «%s»."
-#: builtin/am.c:599 builtin/notes.c:315
+#: builtin/am.c:600 builtin/notes.c:315
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Ðе удалоÑÑŒ Ñкопировать заметку из «%s» в «%s»"
-#: builtin/am.c:625
+#: builtin/am.c:626
msgid "fseek failed"
msgstr "Ñбой при выполнении fseek"
-#: builtin/am.c:786 builtin/am.c:874
+#: builtin/am.c:787 builtin/am.c:875
#, c-format
msgid "could not open '%s' for reading: %s"
msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ: %s"
-#: builtin/am.c:793
+#: builtin/am.c:794
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %s"
-#: builtin/am.c:802
+#: builtin/am.c:803
#, c-format
msgid "could not parse patch '%s'"
msgstr "не удалоÑÑŒ разобрать патч «%s»"
-#: builtin/am.c:867
+#: builtin/am.c:868
msgid "Only one StGIT patch series can be applied at once"
msgstr "Только ÑÐµÑ€Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡ÐµÐ¹ StGIT может быть применена за раз"
-#: builtin/am.c:915
+#: builtin/am.c:916
msgid "invalid timestamp"
msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° даты/времени"
-#: builtin/am.c:918 builtin/am.c:926
+#: builtin/am.c:919 builtin/am.c:927
msgid "invalid Date line"
msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñтрока даты"
-#: builtin/am.c:923
+#: builtin/am.c:924
msgid "invalid timezone offset"
msgstr "недопуÑтимое Ñмещение чаÑового поÑÑа"
-#: builtin/am.c:1010
+#: builtin/am.c:1011
msgid "Patch format detection failed."
msgstr "Сбой Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð° патча."
-#: builtin/am.c:1015 builtin/clone.c:368
+#: builtin/am.c:1016 builtin/clone.c:373
#, c-format
msgid "failed to create directory '%s'"
msgstr "не удалоÑÑŒ Ñоздать каталог «%s»"
-#: builtin/am.c:1019
+#: builtin/am.c:1020
msgid "Failed to split patches."
msgstr "Ðе удалоÑÑŒ разделить патчи на чаÑти."
-#: builtin/am.c:1151 builtin/commit.c:362
+#: builtin/am.c:1152 builtin/commit.c:363
msgid "unable to write index file"
msgstr "не удалоÑÑŒ запиÑать индекÑ"
-#: builtin/am.c:1202
+#: builtin/am.c:1203
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Когда вы уÑтраните Ñту проблему, запуÑтите «%s --continue»."
-#: builtin/am.c:1203
+#: builtin/am.c:1204
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "ЕÑли вы хотите пропуÑтить Ñтот патч, то запуÑтите «%s --skip»."
-#: builtin/am.c:1204
+#: builtin/am.c:1205
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "Чтобы вернутьÑÑ Ð½Ð° предыдущую ветку и оÑтановить применение изменений, запуÑтите «%s --abort»."
-#: builtin/am.c:1339
+#: builtin/am.c:1343
msgid "Patch is empty. Was it split wrong?"
msgstr "Патч пуÑÑ‚. Возможно, он был неправильно разделён?"
-#: builtin/am.c:1413 builtin/log.c:1345
+#: builtin/am.c:1417 builtin/log.c:1347
#, c-format
msgid "invalid ident line: %s"
msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока идентификации: %s"
-#: builtin/am.c:1440
+#: builtin/am.c:1444
#, c-format
msgid "unable to parse commit %s"
msgstr "не удалоÑÑŒ разобрать коммит %s"
-#: builtin/am.c:1614
+#: builtin/am.c:1646
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Ð’ репозитории отÑутÑтвуют двоичные объекты, необходимые Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ°Ñ‚Ð° к трехходовому ÑлиÑнию."
-#: builtin/am.c:1616
+#: builtin/am.c:1648
msgid "Using index info to reconstruct a base tree..."
msgstr "ИÑпользую Ð¸Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ Ñ€ÐµÐºÐ¾Ð½Ñтрукции базового дерева…"
-#: builtin/am.c:1635
+#: builtin/am.c:1667
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr "Ð’Ñ‹ вручную изменÑли патч?\nОн не накладываетÑÑ Ð±ÐµÐ· ошибок на двоичные объекты, запиÑанные в его заголовке."
-#: builtin/am.c:1641
+#: builtin/am.c:1673
msgid "Falling back to patching base and 3-way merge..."
msgstr "Откат к применению изменений к базовому коммиту Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ трехходового ÑлиÑниÑ…"
-#: builtin/am.c:1666
+#: builtin/am.c:1688
msgid "Failed to merge in the changes."
msgstr "Ðе удалоÑÑŒ Ñлить изменениÑ."
-#: builtin/am.c:1691 builtin/merge.c:632
+#: builtin/am.c:1712 builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr "git write-tree не удалоÑÑŒ запиÑать дерево"
-#: builtin/am.c:1698
+#: builtin/am.c:1719
msgid "applying to an empty history"
msgstr "применение к пуÑтой иÑтории"
-#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
#: builtin/merge.c:854
msgid "failed to write commit object"
msgstr "Ñбой запиÑи объекта коммита"
-#: builtin/am.c:1743 builtin/am.c:1747
+#: builtin/am.c:1764 builtin/am.c:1768
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð½Ð¸Ñ‚ÑŒ: %s не ÑущеÑтвует "
-#: builtin/am.c:1763
+#: builtin/am.c:1784
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "не удалоÑÑŒ иÑпользовать интерактивное поведение, без stdin подключенного к терминалу."
-#: builtin/am.c:1768
+#: builtin/am.c:1789
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.
-#: builtin/am.c:1778
+#: builtin/am.c:1799
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - проÑмотреть патч/[a] - применить вÑÑ‘: "
-#: builtin/am.c:1828
+#: builtin/am.c:1849
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð½Ðµ пуÑтой: Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑÑ‚ÑŒ патчи (в индекÑе: %s)"
-#: builtin/am.c:1863 builtin/am.c:1934
+#: builtin/am.c:1884 builtin/am.c:1955
#, c-format
msgid "Applying: %.*s"
msgstr "Применение: %.*s"
-#: builtin/am.c:1879
+#: builtin/am.c:1900
msgid "No changes -- Patch already applied."
msgstr "Ðет изменений — Патч уже применен."
-#: builtin/am.c:1887
+#: builtin/am.c:1908
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Ошибка Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ на %s %.*s"
-#: builtin/am.c:1893
+#: builtin/am.c:1914
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Копию изменений, которые не удалоÑÑŒ применить, вы можете найти в: %s"
-#: builtin/am.c:1937
+#: builtin/am.c:1958
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 "Ðет изменений — возможно, вы забыли вызвать «git add»?\nЕÑли ничего не оÑталоÑÑŒ Ð´Ð»Ñ Ð¸Ð½Ð´ÐµÐºÑации, то, Ñкорее вÑего, что-то другое уже Ñделало те же изменениÑ; возможно, вам Ñледует пропуÑтить Ñтот патч."
-#: builtin/am.c:1944
+#: builtin/am.c:1965
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
msgstr "У Ð²Ð°Ñ Ð²Ñе еще имеютÑÑ Ð½Ðµ Ñлитые пути в индекÑе.\nВозможно, вы забыли вызвать «git add»?"
-#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Ðе удалоÑÑŒ разобрать объект «%s»."
-#: builtin/am.c:2104
+#: builtin/am.c:2125
msgid "failed to clean index"
msgstr "не удалоÑÑŒ очиÑтить индекÑ"
-#: builtin/am.c:2138
+#: builtin/am.c:2159
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "Похоже, что вы перемеÑтили HEAD Ñ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð° поÑледней ошибки Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Â«am».\nПеремотка на ORIG_HEAD не выполнÑетÑÑ"
-#: builtin/am.c:2199
+#: builtin/am.c:2220
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ðеправильное значение Ð´Ð»Ñ --patch-format: %s"
-#: builtin/am.c:2221
-msgid "git am [options] [(<mbox>|<Maildir>)...]"
-msgstr "git am [опции] [(<mbox>|<Maildir>)…]"
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+msgstr "git am [<опции>] [(<mbox>|<Maildir>)…]"
-#: builtin/am.c:2222
-msgid "git am [options] (--continue | --skip | --abort)"
-msgstr "git am [опции] (--continue | --skip | --abort)"
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<опции>] (--continue | --skip | --abort)"
-#: builtin/am.c:2228
+#: builtin/am.c:2260
msgid "run interactively"
msgstr "запуÑтить в интерактивном режиме"
-#: builtin/am.c:2230
+#: builtin/am.c:2262
msgid "historical option -- no-op"
msgstr "иÑторичеÑÐºÐ°Ñ Ð¾Ð¿Ñ†Ð¸Ñ â€” ничего не делает"
-#: builtin/am.c:2232
+#: builtin/am.c:2264
msgid "allow fall back on 3way merging if needed"
msgstr "разрешить откатитьÑÑ Ðº трехходовому ÑлиÑнию, еÑли нужно"
-#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "тихий режим"
-#: builtin/am.c:2235
+#: builtin/am.c:2267
msgid "add a Signed-off-by line to the commit message"
msgstr "добавить Ñтроку Signed-off-by к Ñообщению коммита"
-#: builtin/am.c:2238
+#: builtin/am.c:2270
msgid "recode into utf8 (default)"
msgstr "перекодировать в utf8 (по умолчанию)"
-#: builtin/am.c:2240
+#: builtin/am.c:2272
msgid "pass -k flag to git-mailinfo"
msgstr "передать флаг -k в git-mailinfo"
-#: builtin/am.c:2242
+#: builtin/am.c:2274
msgid "pass -b flag to git-mailinfo"
msgstr "передать флаг -b в git-mailinfo"
-#: builtin/am.c:2244
+#: builtin/am.c:2276
msgid "pass -m flag to git-mailinfo"
msgstr "передать флаг -m в git-mailinfo"
-#: builtin/am.c:2246
+#: builtin/am.c:2278
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "передать флаг --keep-cr в git-mailsplit Ð´Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð° mbox"
-#: builtin/am.c:2249
+#: builtin/am.c:2281
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "не передавать --keep-cr флаг в git-mailsplit вне завиÑимоÑти от am.keepcr"
-#: builtin/am.c:2252
+#: builtin/am.c:2284
msgid "strip everything before a scissors line"
msgstr "обрезать вÑе до Ñтроки обрезки"
-#: builtin/am.c:2253 builtin/apply.c:4563
+#: builtin/am.c:2285 builtin/apply.c:4554
msgid "action"
msgstr "дейÑтвие"
-#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2281
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
msgid "pass it through git-apply"
msgstr "передать его в git-apply"
-#: builtin/am.c:2262 builtin/apply.c:4587
+#: builtin/am.c:2294 builtin/apply.c:4578
msgid "root"
msgstr "корень"
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525
-#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
-#: builtin/pull.c:167
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
msgid "path"
msgstr "путь"
-#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
-#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
-#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
-#: parse-options.h:134 parse-options.h:243
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2274 builtin/apply.c:4531
+#: builtin/am.c:2306 builtin/apply.c:4522
msgid "num"
msgstr "количеÑтво"
-#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
msgid "format"
msgstr "формат"
-#: builtin/am.c:2278
+#: builtin/am.c:2310
msgid "format the patch(es) are in"
msgstr "формат, в котором находÑÑ‚ÑÑ Ð¿Ð°Ñ‚Ñ‡Ð¸"
-#: builtin/am.c:2284
+#: builtin/am.c:2316
msgid "override error message when patch failure occurs"
msgstr "переопределить Ñообщение об ошибке, еÑли не удалоÑÑŒ наложить изменениÑ"
-#: builtin/am.c:2286
+#: builtin/am.c:2318
msgid "continue applying patches after resolving a conflict"
msgstr "продолжить применение изменений поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð»Ð¸ÐºÑ‚Ð°"
-#: builtin/am.c:2289
+#: builtin/am.c:2321
msgid "synonyms for --continue"
msgstr "Ñинонимы Ð´Ð»Ñ --continue"
-#: builtin/am.c:2292
+#: builtin/am.c:2324
msgid "skip the current patch"
msgstr "пропуÑтить текущий патч"
-#: builtin/am.c:2295
+#: builtin/am.c:2327
msgid "restore the original branch and abort the patching operation."
msgstr "воÑÑтановить оригинальную ветку и отменить операцию Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹."
-#: builtin/am.c:2299
+#: builtin/am.c:2331
msgid "lie about committer date"
msgstr "Ñоврать о дате коммитера"
-#: builtin/am.c:2301
+#: builtin/am.c:2333
msgid "use current timestamp for author date"
msgstr "иÑпользовать текущее Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº Ð²Ñ€ÐµÐ¼Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ñтва"
-#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225
-#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2304
+#: builtin/am.c:2336
msgid "GPG-sign commits"
msgstr "подпиÑать коммиты Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG"
-#: builtin/am.c:2307
+#: builtin/am.c:2339
msgid "(internal use for git-rebase)"
msgstr "(внутреннее иÑпользование Ð´Ð»Ñ git-rebase)"
-#: builtin/am.c:2322
+#: builtin/am.c:2354
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr "ÐžÐ¿Ñ†Ð¸Ñ -b/--binary уже долгое Ð²Ñ€ÐµÐ¼Ñ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ не делает и будет удалена Ñ Ñледующих верÑиÑÑ… Git. ПожалуйÑта, не иÑпользуйте ее."
-#: builtin/am.c:2329
+#: builtin/am.c:2361
msgid "failed to read the index"
msgstr "Ñбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа"
-#: builtin/am.c:2344
+#: builtin/am.c:2376
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "предыдущий каталог Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ %s еще ÑущеÑтвует, но передан mbox."
-#: builtin/am.c:2368
+#: builtin/am.c:2400
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr "Ðайден забытый каталог %s.\nИÑпользуйте «git am --abort», чтобы удалить его."
-#: builtin/am.c:2374
+#: builtin/am.c:2406
msgid "Resolve operation not in progress, we are not resuming."
msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð² не в процеÑÑе выполнениÑ, не продолжаем."
@@ -2611,62 +2659,62 @@ msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð² не в прÐ
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<опции>] [<патч>…]"
-#: builtin/apply.c:112
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð² «%s»"
-#: builtin/apply.c:127
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð»Ñ Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð² «%s»"
-#: builtin/apply.c:822
+#: builtin/apply.c:818
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Ðе удалоÑÑŒ подготовить регулÑрное выражение Ð´Ð»Ñ Ð¼ÐµÑ‚ÐºÐ¸ времени %s"
-#: builtin/apply.c:831
+#: builtin/apply.c:827
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec возвратил %d Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð°: %s"
-#: builtin/apply.c:912
+#: builtin/apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "не удалоÑÑŒ найти Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° в Ñтроке патча %d"
-#: builtin/apply.c:944
+#: builtin/apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: плохой git-diff — ожидалоÑÑŒ /dev/null, получено %s на Ñтроке %d"
-#: builtin/apply.c:948
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: плохой git-diff — не ÑоглаÑующееÑÑ Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° на Ñтроке %d"
-#: builtin/apply.c:949
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: плохой git-diff — не ÑоглаÑующееÑÑ Ñтарое Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° на Ñтроке %d"
-#: builtin/apply.c:956
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: плохой git-diff — ожидалоÑÑŒ /dev/null на Ñтроке %d"
-#: builtin/apply.c:1419
+#: builtin/apply.c:1415
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: не Ð¾Ð¶Ð¸Ð´Ð°ÐµÐ¼Ð°Ñ Ñтрока: %.*s"
-#: builtin/apply.c:1476
+#: builtin/apply.c:1472
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "фрагмент изменений без заголовка на Ñтроке %d: %.*s"
-#: builtin/apply.c:1493
+#: builtin/apply.c:1489
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname"
@@ -2679,65 +2727,65 @@ msgstr[1] "заголовок git diff не нашел информацию об
msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (Ñтрока %d)"
msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (Ñтрока %d)"
-#: builtin/apply.c:1659
+#: builtin/apply.c:1655
msgid "new file depends on old contents"
msgstr "новый файл завиÑит от Ñтарого Ñодержимого"
-#: builtin/apply.c:1661
+#: builtin/apply.c:1657
msgid "deleted file still has contents"
msgstr "удаленный файл вÑе еще имеет Ñодержимое"
-#: builtin/apply.c:1687
+#: builtin/apply.c:1683
#, c-format
msgid "corrupt patch at line %d"
msgstr "патч поврежден на Ñтроке %d"
-#: builtin/apply.c:1723
+#: builtin/apply.c:1719
#, c-format
msgid "new file %s depends on old contents"
msgstr "новый файл %s завиÑит от Ñтарого Ñодержимого"
-#: builtin/apply.c:1725
+#: builtin/apply.c:1721
#, c-format
msgid "deleted file %s still has contents"
msgstr "удаленный файл %s вÑе еще имеет Ñодержимое"
-#: builtin/apply.c:1728
+#: builtin/apply.c:1724
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** предупреждение: файл %s ÑтановитÑÑ Ð¿ÑƒÑтым, но не удалÑетÑÑ"
-#: builtin/apply.c:1874
+#: builtin/apply.c:1870
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "поврежденный двоичный патч на Ñтроке %d: %.*s"
-#: builtin/apply.c:1903
+#: builtin/apply.c:1899
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неопознанный двоичный патч на Ñтроке %d"
-#: builtin/apply.c:2054
+#: builtin/apply.c:2050
#, c-format
msgid "patch with only garbage at line %d"
msgstr "патч Ñ Ð¼ÑƒÑором на Ñтроке %d"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2140
#, c-format
msgid "unable to read symlink %s"
msgstr "не удалоÑÑŒ прочитать Ñимвольную ÑÑылку %s"
-#: builtin/apply.c:2148
+#: builtin/apply.c:2144
#, c-format
msgid "unable to open or read %s"
msgstr "не удалоÑÑŒ открыть или прочеÑÑ‚ÑŒ %s"
-#: builtin/apply.c:2781
+#: builtin/apply.c:2777
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправильное начало Ñтроки: «%c»"
-#: builtin/apply.c:2900
+#: builtin/apply.c:2896
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -2746,177 +2794,177 @@ msgstr[1] "ЧаÑÑ‚ÑŒ #%d уÑпешно применена на %d (Ñо Ñдв
msgstr[2] "ЧаÑÑ‚ÑŒ #%d уÑпешно применена на %d (Ñо Ñдвигом в %d Ñтрок)."
msgstr[3] "ЧаÑÑ‚ÑŒ #%d уÑпешно применена на %d (Ñо Ñдвигом в %d Ñтрок)."
-#: builtin/apply.c:2912
+#: builtin/apply.c:2908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "КонтекÑÑ‚ Ñужен до (%ld/%ld), чтобы применить фрагмент на %d Ñтроке"
-#: builtin/apply.c:2918
+#: builtin/apply.c:2914
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr "при поиÑке:\n%.*s"
-#: builtin/apply.c:2938
+#: builtin/apply.c:2934
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "пропущены данные двоичного патча Ð´Ð»Ñ Â«%s»"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3035
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "не удалоÑÑŒ применить двоичный патч к «%s»"
-#: builtin/apply.c:3045
+#: builtin/apply.c:3041
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "поÑле Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ патча Ð´Ð»Ñ Â«%s» был получен неправильный результат (ожидалоÑÑŒ %s, получено %s)"
-#: builtin/apply.c:3066
+#: builtin/apply.c:3062
#, c-format
msgid "patch failed: %s:%ld"
msgstr "ошибка Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹: %s:%ld"
-#: builtin/apply.c:3190
+#: builtin/apply.c:3186
#, c-format
msgid "cannot checkout %s"
msgstr "не удалоÑÑŒ перейти на %s"
-#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
#, c-format
msgid "read of %s failed"
msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ %s"
-#: builtin/apply.c:3243
+#: builtin/apply.c:3239
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "чтение из «%s» за ÑимволичеÑкой ÑÑылкой"
-#: builtin/apply.c:3271 builtin/apply.c:3493
+#: builtin/apply.c:3267 builtin/apply.c:3489
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "путь %s был переименован/удален"
-#: builtin/apply.c:3352 builtin/apply.c:3507
+#: builtin/apply.c:3348 builtin/apply.c:3503
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: нет в индекÑе"
-#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3361 builtin/apply.c:3515
+#: builtin/apply.c:3357 builtin/apply.c:3511
#, c-format
msgid "%s: does not match index"
msgstr "%s: не Ñовпадает Ñ Ð¸Ð½Ð´ÐµÐºÑом"
-#: builtin/apply.c:3463
+#: builtin/apply.c:3459
msgid "removal patch leaves file contents"
msgstr "патч ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ удалил Ñодержимое файла"
-#: builtin/apply.c:3532
+#: builtin/apply.c:3528
#, c-format
msgid "%s: wrong type"
msgstr "%s: неправильный тип"
-#: builtin/apply.c:3534
+#: builtin/apply.c:3530
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s имеет тип %o, а ожидалÑÑ %o"
-#: builtin/apply.c:3693 builtin/apply.c:3695
+#: builtin/apply.c:3689 builtin/apply.c:3691
#, c-format
msgid "invalid path '%s'"
msgstr "неправильный путь «%s»"
-#: builtin/apply.c:3750
+#: builtin/apply.c:3746
#, c-format
msgid "%s: already exists in index"
msgstr "%s: уже ÑодержитÑÑ Ð² индекÑе"
-#: builtin/apply.c:3753
+#: builtin/apply.c:3749
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: уже ÑодержитÑÑ Ð² рабочем каталоге"
-#: builtin/apply.c:3773
+#: builtin/apply.c:3769
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новый режим доÑтупа (%o) Ð´Ð»Ñ %s не ÑоответÑтвует Ñтарому режиму доÑтупа (%o)"
-#: builtin/apply.c:3778
+#: builtin/apply.c:3774
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "новый режим доÑтупа (%o) Ð´Ð»Ñ %s не ÑоответÑтвует Ñтарому режиму доÑтупа (%o) Ð´Ð»Ñ %s"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3794
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "затронутый файл «%s» находитÑÑ Ð·Ð° ÑимволичеÑкой ÑÑылкой"
-#: builtin/apply.c:3802
+#: builtin/apply.c:3798
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: не удалоÑÑŒ применить патч"
-#: builtin/apply.c:3816
+#: builtin/apply.c:3812
#, c-format
msgid "Checking patch %s..."
msgstr "Проверка патча %s…"
-#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "Ñбой make_cache_entry Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «%s»"
-#: builtin/apply.c:4052
+#: builtin/apply.c:4048
#, c-format
msgid "unable to remove %s from index"
msgstr "не удалоÑÑŒ удалить %s из индекÑа"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4077
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "поврежденный патч Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s"
-#: builtin/apply.c:4085
+#: builtin/apply.c:4081
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ Ñозданного файла «%s»"
-#: builtin/apply.c:4090
+#: builtin/apply.c:4086
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "не удалоÑÑŒ Ñоздать вÑпомогательный файл Ð´Ð»Ñ Ñозданного файла %s"
-#: builtin/apply.c:4093 builtin/apply.c:4201
+#: builtin/apply.c:4089 builtin/apply.c:4197
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не удалоÑÑŒ Ñоздать запиÑÑŒ в кÑше Ð´Ð»Ñ %s"
-#: builtin/apply.c:4126
+#: builtin/apply.c:4122
#, c-format
msgid "closing file '%s'"
msgstr "закрытие файла «%s»"
-#: builtin/apply.c:4175
+#: builtin/apply.c:4171
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "не удалоÑÑŒ запиÑать файл «%s» Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð¼ доÑтупа %o"
-#: builtin/apply.c:4262
+#: builtin/apply.c:4258
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Патч %s применен без ошибок."
-#: builtin/apply.c:4270
+#: builtin/apply.c:4266
msgid "internal error"
msgstr "внутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
-#: builtin/apply.c:4273
+#: builtin/apply.c:4269
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
@@ -2925,147 +2973,147 @@ msgstr[1] "Применение патча %%s Ñ %d отказами…"
msgstr[2] "Применение патча %%s Ñ %d отказами…"
msgstr[3] "Применение патча %%s Ñ %d отказами…"
-#: builtin/apply.c:4283
+#: builtin/apply.c:4279
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "уÑечение имени .rej файла до %.*s.rej"
-#: builtin/apply.c:4304
+#: builtin/apply.c:4300
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Блок №%d применен без ошибок."
-#: builtin/apply.c:4307
+#: builtin/apply.c:4303
#, c-format
msgid "Rejected hunk #%d."
msgstr "Блок №%d отклонен."
-#: builtin/apply.c:4397
+#: builtin/apply.c:4393
msgid "unrecognized input"
msgstr "не раÑпознанный ввод"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4404
msgid "unable to read index file"
msgstr "не удалоÑÑŒ прочитать файл индекÑа"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4517
msgid "don't apply changes matching the given path"
msgstr "не применÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾ указанному пути"
-#: builtin/apply.c:4529
+#: builtin/apply.c:4520
msgid "apply changes matching the given path"
msgstr "применÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾ указанному пути"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4523
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "удалить <количеÑтво> ведущих коÑÑ‹Ñ… черт из традиционных путей ÑпиÑка изменений"
-#: builtin/apply.c:4535
+#: builtin/apply.c:4526
msgid "ignore additions made by the patch"
msgstr "игнорировать добавлениÑ, Ñделанные Ñтим патчем"
-#: builtin/apply.c:4537
+#: builtin/apply.c:4528
msgid "instead of applying the patch, output diffstat for the input"
msgstr "вмеÑто Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð° вывеÑти ÑтатиÑтику добавлений и удалений Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð°"
-#: builtin/apply.c:4541
+#: builtin/apply.c:4532
msgid "show number of added and deleted lines in decimal notation"
msgstr "показать количеÑтво добавленных и удаленных Ñтрок в деÑÑтичном предÑтавлении"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4534
msgid "instead of applying the patch, output a summary for the input"
msgstr "вмеÑто Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð° вывеÑти ÑтатиÑтику изменений Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð°"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4536
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "вмеÑто Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð° проверить подходит ли он"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4538
msgid "make sure the patch is applicable to the current index"
msgstr "проверить, что патч применÑетÑÑ Ðº текущему индекÑу"
-#: builtin/apply.c:4549
+#: builtin/apply.c:4540
msgid "apply a patch without touching the working tree"
msgstr "применить патч, не изменÑÑ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ð¹ каталог"
-#: builtin/apply.c:4551
+#: builtin/apply.c:4542
msgid "accept a patch that touches outside the working area"
msgstr "принÑÑ‚ÑŒ патч, который затрагивает файлы за рабочим каталогом"
-#: builtin/apply.c:4553
+#: builtin/apply.c:4544
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "а также применить патч (иÑпользуйте Ñ --stat/--summary/--check)"
-#: builtin/apply.c:4555
+#: builtin/apply.c:4546
msgid "attempt three-way merge if a patch does not apply"
msgstr "попытатьÑÑ Ñделать трехходовое ÑлиÑние, еÑли патч не применÑетÑÑ"
-#: builtin/apply.c:4557
+#: builtin/apply.c:4548
msgid "build a temporary index based on embedded index information"
msgstr "поÑтроить временный индекÑ, оÑнованный на вÑтроенной информации об индекÑе"
-#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr "пути, отделенные ÐУЛЕВЫМ Ñимволом"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4553
msgid "ensure at least <n> lines of context match"
msgstr "удоÑтоверитьÑÑ, что по крайней мере <n> Ñтрок контекÑта Ñовпадают"
-#: builtin/apply.c:4564
+#: builtin/apply.c:4555
msgid "detect new or modified lines that have whitespace errors"
msgstr "определÑÑ‚ÑŒ новые или модифицированные Ñтроки, у которых еÑÑ‚ÑŒ ошибки в пробельных Ñимволах"
-#: builtin/apply.c:4567 builtin/apply.c:4570
+#: builtin/apply.c:4558 builtin/apply.c:4561
msgid "ignore changes in whitespace when finding context"
msgstr "игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² пробельных Ñимволах при поиÑке контекÑта"
-#: builtin/apply.c:4573
+#: builtin/apply.c:4564
msgid "apply the patch in reverse"
msgstr "применить патч Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸ÐµÐ¼ изменений"
-#: builtin/apply.c:4575
+#: builtin/apply.c:4566
msgid "don't expect at least one line of context"
msgstr "не ожидать как минимум одной Ñтроки контекÑта"
-#: builtin/apply.c:4577
+#: builtin/apply.c:4568
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оÑтавить отклоненные блоки изменений в ÑоответÑтвующих *.rej файлах"
-#: builtin/apply.c:4579
+#: builtin/apply.c:4570
msgid "allow overlapping hunks"
msgstr "разрешить перекрывающиеÑÑ Ð±Ð»Ð¾ÐºÐ¸ изменений"
-#: builtin/apply.c:4582
+#: builtin/apply.c:4573
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "разрешить некорректно определенные пропущенные пуÑтые Ñтроки в конце файла"
-#: builtin/apply.c:4585
+#: builtin/apply.c:4576
msgid "do not trust the line counts in the hunk headers"
msgstr "не доверÑÑ‚ÑŒ количеÑтву Ñтрок из заголовка блока изменений"
-#: builtin/apply.c:4588
+#: builtin/apply.c:4579
msgid "prepend <root> to all filenames"
msgstr "добавить <корень> Ñпереди ко вÑем именам файлов"
-#: builtin/apply.c:4610
+#: builtin/apply.c:4601
msgid "--3way outside a repository"
msgstr "--3way вне репозиториÑ"
-#: builtin/apply.c:4618
+#: builtin/apply.c:4609
msgid "--index outside a repository"
msgstr "--index вне репозиториÑ"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4612
msgid "--cached outside a repository"
msgstr "--cached вне репозиториÑ"
-#: builtin/apply.c:4640
+#: builtin/apply.c:4631
#, c-format
msgid "can't open patch '%s'"
msgstr "не удалоÑÑŒ открыть патч «%s»"
-#: builtin/apply.c:4654
+#: builtin/apply.c:4645
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
@@ -3074,7 +3122,7 @@ msgstr[1] "пропущено %d ошибки в пробельных Ñимво
msgstr[2] "пропущено %d ошибок в пробельных Ñимволах"
msgstr[3] "пропущено %d ошибок в пробельных Ñимволах"
-#: builtin/apply.c:4660 builtin/apply.c:4670
+#: builtin/apply.c:4651 builtin/apply.c:4661
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3138,95 +3186,95 @@ msgstr "git blame [<опции>] [<опции-редакции>] [<редакцÐ
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<опции-rev-list> документированы в git-rev-list(1)"
-#: builtin/blame.c:2500
+#: builtin/blame.c:2519
msgid "Show blame entries as we find them, incrementally"
msgstr "Показать запиÑи авторÑтва поÑтепенно, в процеÑÑе нахождениÑ"
-#: builtin/blame.c:2501
+#: builtin/blame.c:2520
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Ðе показывать SHA-1 Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð², не входÑщих в границы запроÑа (По умолчанию: отключено)"
-#: builtin/blame.c:2502
+#: builtin/blame.c:2521
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Ðе воÑпринимать корневые коммиты как граничные (По умолчанию: отключено)"
-#: builtin/blame.c:2503
+#: builtin/blame.c:2522
msgid "Show work cost statistics"
msgstr "Показать ÑтатиÑтику раÑходов на выполнение запроÑа"
-#: builtin/blame.c:2504
+#: builtin/blame.c:2523
msgid "Show output score for blame entries"
msgstr "Показать оценку Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñей авторÑтва"
-#: builtin/blame.c:2505
+#: builtin/blame.c:2524
msgid "Show original filename (Default: auto)"
msgstr "Показать оригинальное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° (По умолчанию: автоматичеÑки)"
-#: builtin/blame.c:2506
+#: builtin/blame.c:2525
msgid "Show original linenumber (Default: off)"
msgstr "Показать оригинальные номера Ñтрок (По умолчанию: отключено)"
-#: builtin/blame.c:2507
+#: builtin/blame.c:2526
msgid "Show in a format designed for machine consumption"
msgstr "Показать в формате Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ разбора"
-#: builtin/blame.c:2508
+#: builtin/blame.c:2527
msgid "Show porcelain format with per-line commit information"
msgstr "Показать в машиночитаемом формате, Ñ Ð¿Ð¾Ñтрочной информацией о коммите"
-#: builtin/blame.c:2509
+#: builtin/blame.c:2528
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "ИÑпользовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)"
-#: builtin/blame.c:2510
+#: builtin/blame.c:2529
msgid "Show raw timestamp (Default: off)"
msgstr "Показать необработанные временные метки (По умолчанию: отключено)"
-#: builtin/blame.c:2511
+#: builtin/blame.c:2530
msgid "Show long commit SHA1 (Default: off)"
msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)"
-#: builtin/blame.c:2512
+#: builtin/blame.c:2531
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Ðе показывать Ð¸Ð¼Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð° и временные метки (По умолчанию: отключено)"
-#: builtin/blame.c:2513
+#: builtin/blame.c:2532
msgid "Show author email instead of name (Default: off)"
msgstr "Показать почту автора вмеÑто имени (По умолчанию: отключено)"
-#: builtin/blame.c:2514
+#: builtin/blame.c:2533
msgid "Ignore whitespace differences"
msgstr "Игнорировать Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ Ð² пробелах"
-#: builtin/blame.c:2515
+#: builtin/blame.c:2534
msgid "Spend extra cycles to find better match"
msgstr "Потратить больше времени, Ð´Ð»Ñ Ð½Ð°Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ð»ÑƒÑ‡ÑˆÐ¸Ñ… Ñовпадений"
-#: builtin/blame.c:2516
+#: builtin/blame.c:2535
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "ИÑпользовать редакции из <файла> вмеÑто вызова git-rev-list"
-#: builtin/blame.c:2517
+#: builtin/blame.c:2536
msgid "Use <file>'s contents as the final image"
msgstr "ИÑпользовать Ñодержимое <файла> как финальный Ñнимок"
-#: builtin/blame.c:2518 builtin/blame.c:2519
+#: builtin/blame.c:2537 builtin/blame.c:2538
msgid "score"
msgstr "мин-длина"
-#: builtin/blame.c:2518
+#: builtin/blame.c:2537
msgid "Find line copies within and across files"
msgstr "Ðайти копирование Ñтрок в пределах и между файлами"
-#: builtin/blame.c:2519
+#: builtin/blame.c:2538
msgid "Find line movements within and across files"
msgstr "Ðайти Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ñтрок в пределах и между файлами"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "n,m"
msgstr "начало,конец"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "Process only line range n,m, counting from 1"
msgstr "Обработать только Ñтроки в диапазоне начало,конец, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ 1"
@@ -3236,396 +3284,392 @@ msgstr "Обработать только Ñтроки в диапазоне нÐ
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2601
+#: builtin/blame.c:2620
msgid "4 years, 11 months ago"
msgstr "4 года и 11 меÑÑцев назад"
-#: builtin/branch.c:24
+#: builtin/branch.c:25
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<опции>] [-l] [-f] <имÑ-ветки> [<точка-начала>]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<опции>] [-r] (-d | -D) <имÑ-ветки>…"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<опции>] (-m | -M) [<ÑтараÑ-ветка>] <новаÑ-ветка>"
-#: builtin/branch.c:150
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<опции>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:142
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr "удаление ветки «%s», ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±Ñ‹Ð»Ð° Ñлита Ñ\n «%s», но не Ñлита Ñ HEAD."
-#: builtin/branch.c:154
+#: builtin/branch.c:146
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr "не удаление ветки «%s», ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÐµÑ‰Ðµ не Ñлита Ñ\n «%s», Ñ…Ð¾Ñ‚Ñ ÑƒÐ¶Ðµ Ñлита Ñ HEAD."
-#: builtin/branch.c:168
+#: builtin/branch.c:160
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Ðе удалоÑÑŒ найти объект коммита Ð´Ð»Ñ Â«%s»"
-#: builtin/branch.c:172
+#: builtin/branch.c:164
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr "Ветка «%s» не Ñлита полноÑтью.\nЕÑли вы уверены, что хотите ее удалить, запуÑтите «git branch -D %s»."
-#: builtin/branch.c:185
+#: builtin/branch.c:177
msgid "Update of config-file failed"
msgstr "Ðе удалоÑÑŒ обновить файл конфигурации"
-#: builtin/branch.c:213
+#: builtin/branch.c:205
msgid "cannot use -a with -d"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно ключи -a и -d"
-#: builtin/branch.c:219
+#: builtin/branch.c:211
msgid "Couldn't look up commit object for HEAD"
msgstr "Ðе удалоÑÑŒ найти объект коммита Ð´Ð»Ñ HEAD"
-#: builtin/branch.c:227
+#: builtin/branch.c:219
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ветку «%s», так как вы ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð° ней находитеÑÑŒ."
-#: builtin/branch.c:243
+#: builtin/branch.c:235
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "внешнÑÑ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s» не найдена."
-#: builtin/branch.c:244
+#: builtin/branch.c:236
#, c-format
msgid "branch '%s' not found."
msgstr "ветка «%s» не найдена."
-#: builtin/branch.c:259
+#: builtin/branch.c:251
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ отÑлеживаемой ветки «%s»"
-#: builtin/branch.c:260
+#: builtin/branch.c:252
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»"
-#: builtin/branch.c:267
+#: builtin/branch.c:259
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "ВнешнÑÑ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ° %s удалена (была %s).\n"
-#: builtin/branch.c:268
+#: builtin/branch.c:260
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Ветка %s удалена (была %s).\n"
-#: builtin/branch.c:369
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr "ветка «%s» не указывает на коммит"
-
-#: builtin/branch.c:452
+#: builtin/branch.c:303
#, c-format
msgid "[%s: gone]"
msgstr "[%s: пропал]"
-#: builtin/branch.c:457
+#: builtin/branch.c:308
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:462
+#: builtin/branch.c:313
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: позади %d]"
-#: builtin/branch.c:464
+#: builtin/branch.c:315
#, c-format
msgid "[behind %d]"
msgstr "[позади %d]"
-#: builtin/branch.c:468
+#: builtin/branch.c:319
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: впереди %d]"
-#: builtin/branch.c:470
+#: builtin/branch.c:321
#, c-format
msgid "[ahead %d]"
msgstr "[впереди %d]"
-#: builtin/branch.c:473
+#: builtin/branch.c:324
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: впереди %d, позади %d]"
-#: builtin/branch.c:476
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[впереди %d, позади %d]"
-#: builtin/branch.c:489
+#: builtin/branch.c:340
msgid " **** invalid ref ****"
msgstr " **** недейÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ ÑÑылка ****"
-#: builtin/branch.c:580
+#: builtin/branch.c:366
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(нет ветки, перемещение %s)"
-#: builtin/branch.c:583
+#: builtin/branch.c:369
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(нет ветки, двоичный поиÑк начат на %s)"
-#: builtin/branch.c:589
+#: builtin/branch.c:375
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD отделён на %s)"
-#: builtin/branch.c:592
+#: builtin/branch.c:378
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD отделён Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ %s)"
-#: builtin/branch.c:596
+#: builtin/branch.c:382
msgid "(no branch)"
msgstr "(нет ветки)"
-#: builtin/branch.c:643
-#, c-format
-msgid "object '%s' does not point to a commit"
-msgstr "объект «%s» не указывает на коммит"
-
-#: builtin/branch.c:691
-msgid "some refs could not be read"
-msgstr "не удаетÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ некоторые ÑÑылки"
-
-#: builtin/branch.c:704
+#: builtin/branch.c:524
msgid "cannot rename the current branch while not on any."
msgstr "невозможно переименовать текущую ветку, еÑли вы не находитеÑÑŒ ни на одной из них."
-#: builtin/branch.c:714
+#: builtin/branch.c:534
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "ÐедейÑтвительное Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸: «%s»"
-#: builtin/branch.c:729
+#: builtin/branch.c:549
msgid "Branch rename failed"
msgstr "Сбой Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²ÐµÑ‚ÐºÐ¸"
-#: builtin/branch.c:733
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Переименована неправильно Ð½Ð°Ð·Ð²Ð°Ð½Ð½Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s»"
-#: builtin/branch.c:737
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Ветка переименована в %s, но HEAD не обновлен!"
-#: builtin/branch.c:744
+#: builtin/branch.c:564
msgid "Branch is renamed, but update of config-file failed"
msgstr "Ветка переименована, но произошел Ñбой Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° конфигурации"
-#: builtin/branch.c:759
-#, c-format
-msgid "malformed object name %s"
-msgstr "плохое Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° %s"
-
-#: builtin/branch.c:781
+#: builtin/branch.c:587
#, c-format
msgid "could not write branch description template: %s"
msgstr "не удалоÑÑŒ запиÑать шаблон опиÑÐ°Ð½Ð¸Ñ Ð²ÐµÑ‚ÐºÐ¸: %s"
-#: builtin/branch.c:811
+#: builtin/branch.c:616
msgid "Generic options"
msgstr "Общие параметры"
-#: builtin/branch.c:813
+#: builtin/branch.c:618
msgid "show hash and subject, give twice for upstream branch"
msgstr "показывать хеш-Ñумму и тему, укажите дважды Ð´Ð»Ñ Ð²Ñ‹ÑˆÐµÑтоÑщей ветки"
-#: builtin/branch.c:814
+#: builtin/branch.c:619
msgid "suppress informational messages"
msgstr "не выводить информационные ÑообщениÑ"
-#: builtin/branch.c:815
+#: builtin/branch.c:620
msgid "set up tracking mode (see git-pull(1))"
msgstr "уÑтановить режим отÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ÑˆÐµÑтоÑщей ветки (Ñм. git-pull(1))"
-#: builtin/branch.c:817
+#: builtin/branch.c:622
msgid "change upstream info"
msgstr "изменить информацию о вышеÑтоÑщей ветке"
-#: builtin/branch.c:821
+#: builtin/branch.c:626
msgid "use colored output"
msgstr "иÑпользовать цветной вывод"
-#: builtin/branch.c:822
+#: builtin/branch.c:627
msgid "act on remote-tracking branches"
msgstr "выполнить дейÑÑ‚Ð²Ð¸Ñ Ð½Ð° отÑлеживаемых внешних ветках"
-#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
-#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
-#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
-#: builtin/tag.c:624
-msgid "commit"
-msgstr "коммит"
-
-#: builtin/branch.c:826 builtin/branch.c:832
+#: builtin/branch.c:629 builtin/branch.c:630
msgid "print only branches that contain the commit"
msgstr "вывод только веток, которые Ñодержат коммит"
-#: builtin/branch.c:838
+#: builtin/branch.c:633
msgid "Specific git-branch actions:"
msgstr "Специфичные Ð´Ð»Ñ git-branch дейÑтвиÑ:"
-#: builtin/branch.c:839
+#: builtin/branch.c:634
msgid "list both remote-tracking and local branches"
msgstr "показать ÑпиÑок и отÑлеживаемых и локальных веток"
-#: builtin/branch.c:841
+#: builtin/branch.c:636
msgid "delete fully merged branch"
msgstr "удалить полноÑтью Ñлитую ветку"
-#: builtin/branch.c:842
+#: builtin/branch.c:637
msgid "delete branch (even if not merged)"
msgstr "удалить ветку (даже никуда не Ñлитую)"
-#: builtin/branch.c:843
+#: builtin/branch.c:638
msgid "move/rename a branch and its reflog"
msgstr "перемеÑтить/переименовать ветки и ее журнал ÑÑылок"
-#: builtin/branch.c:844
+#: builtin/branch.c:639
msgid "move/rename a branch, even if target exists"
msgstr "перемеÑтить/переименовать ветку, даже еÑли целевое Ð¸Ð¼Ñ ÑƒÐ¶Ðµ ÑущеÑтвует"
-#: builtin/branch.c:845
+#: builtin/branch.c:640
msgid "list branch names"
msgstr "показать ÑпиÑок имен веток"
-#: builtin/branch.c:846
+#: builtin/branch.c:641
msgid "create the branch's reflog"
msgstr "Ñоздать журнал ÑÑылок ветки"
-#: builtin/branch.c:848
+#: builtin/branch.c:643
msgid "edit the description for the branch"
msgstr "изменить опиÑание ветки"
-#: builtin/branch.c:849
+#: builtin/branch.c:644
msgid "force creation, move/rename, deletion"
msgstr "принудительное Ñоздание, перемещение или удаление ветки"
-#: builtin/branch.c:852
-msgid "print only not merged branches"
-msgstr "вывод только не Ñлитых веток"
-
-#: builtin/branch.c:858
-msgid "print only merged branches"
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
msgstr "вывод только Ñлитых веток"
-#: builtin/branch.c:862
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
+msgstr "вывод только не Ñлитых веток"
+
+#: builtin/branch.c:647
msgid "list branches in columns"
msgstr "показать ÑпиÑок веток по Ñтолбцам"
-#: builtin/branch.c:875
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr "ключ"
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr "Ð¸Ð¼Ñ Ð¿Ð¾Ð»Ñ, по которому выполнить Ñортировку"
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr "объект"
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr "вывод только веток, определенного объекта"
+
+#: builtin/branch.c:670
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Ðе удалоÑÑŒ определить HEAD как дейÑтвительную ÑÑылку."
-#: builtin/branch.c:879 builtin/clone.c:690
+#: builtin/branch.c:674 builtin/clone.c:697
msgid "HEAD not found below refs/heads!"
msgstr "HEAD не найден в refs/heads!"
-#: builtin/branch.c:901
+#: builtin/branch.c:694
msgid "--column and --verbose are incompatible"
msgstr "--column и --verbose Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: builtin/branch.c:912 builtin/branch.c:951
+#: builtin/branch.c:705 builtin/branch.c:747
msgid "branch name required"
msgstr "требуетÑÑ Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸"
-#: builtin/branch.c:927
+#: builtin/branch.c:723
msgid "Cannot give description to detached HEAD"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð´Ð°Ñ‚ÑŒ опиÑание отделенному HEAD"
-#: builtin/branch.c:932
+#: builtin/branch.c:728
msgid "cannot edit description of more than one branch"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ опиÑание более одной ветки за раз"
-#: builtin/branch.c:939
+#: builtin/branch.c:735
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Еще нет коммита на ветке «%s»."
-#: builtin/branch.c:942
+#: builtin/branch.c:738
#, c-format
msgid "No branch named '%s'."
msgstr "Ðет ветки Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ «%s»."
-#: builtin/branch.c:957
+#: builtin/branch.c:753
msgid "too many branches for a rename operation"
msgstr "Ñлишком много веток Ð´Ð»Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸ переименованиÑ"
-#: builtin/branch.c:962
+#: builtin/branch.c:758
msgid "too many branches to set new upstream"
msgstr "Ñлишком много веток Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ñ‹Ñ… вышеÑтоÑщих"
-#: builtin/branch.c:966
+#: builtin/branch.c:762
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "невозможно уÑтановить вышеÑтоÑщий репозиторий Ð´Ð»Ñ HEAD на %s, когда он не указывает ни на одну ветку."
-#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
#, c-format
msgid "no such branch '%s'"
msgstr "нет такой ветки «%s»"
-#: builtin/branch.c:973
+#: builtin/branch.c:769
#, c-format
msgid "branch '%s' does not exist"
msgstr "ветка «%s» не ÑущеÑтвует"
-#: builtin/branch.c:985
+#: builtin/branch.c:781
msgid "too many branches to unset upstream"
msgstr "Ñлишком много веток Ð´Ð»Ñ ÑƒÐ±Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð²Ñ‹ÑˆÐµÑтоÑщих"
-#: builtin/branch.c:989
+#: builtin/branch.c:785
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "невозможно убрать вышеÑтоÑщий репозиторий Ð´Ð»Ñ HEAD, когда он не указывает ни на одну ветку."
-#: builtin/branch.c:995
+#: builtin/branch.c:791
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Ветка «%s» не имеет информации о вышеÑтоÑщей ветке"
-#: builtin/branch.c:1009
+#: builtin/branch.c:805
msgid "it does not make sense to create 'HEAD' manually"
msgstr "не имеет ÑмыÑла Ñоздавать «HEAD» вручную"
-#: builtin/branch.c:1015
+#: builtin/branch.c:811
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "параметры -a и -r Ð´Ð»Ñ Â«git branch» не имеют ÑмыÑла Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ имени ветки"
-#: builtin/branch.c:1018
+#: builtin/branch.c:814
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using "
"--track or --set-upstream-to\n"
msgstr "Флаг --set-upstream уÑтарел и будет удален в будущем. ВмеÑто него иÑпользуйте --track или --set-upstream-to\n"
-#: builtin/branch.c:1035
+#: builtin/branch.c:831
#, c-format
msgid ""
"\n"
@@ -3633,12 +3677,12 @@ msgid ""
"\n"
msgstr "\nЕÑли вы хотите, чтобы «%s» отÑлеживала «%s», Ñделайте Ñледующее:\n\n"
-#: builtin/branch.c:1036
+#: builtin/branch.c:832
#, c-format
msgid " git branch -d %s\n"
msgstr "git branch -d %s\n"
-#: builtin/branch.c:1037
+#: builtin/branch.c:833
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3663,10 +3707,8 @@ msgid ""
msgstr "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<тип>|--textconv) <объект>"
#: builtin/cat-file.c:429
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
-"objects>"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] < <ÑпиÑок-объектов>"
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
#: builtin/cat-file.c:466
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -3721,8 +3763,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <атрибут>…] [--] <путь>…"
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
-msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>…] < <ÑпиÑок путей>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>…]"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@ -3740,7 +3782,7 @@ msgstr "прочитать имена файлов из Ñтандартного
msgid "terminate input and output records by a NUL character"
msgstr "окончание ввода и вывода запиÑей по ÐУЛЕВОМУ Ñимволу"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "не выводить прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ"
@@ -3826,6 +3868,8 @@ msgid "write the content to temporary files"
msgstr "запиÑать Ñодержимое во временные файлы"
#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
msgid "string"
msgstr "Ñтрока"
@@ -3845,105 +3889,105 @@ msgstr "git checkout [<опции>] <ветка>"
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<опции>] [<ветка>] -- <файл>…"
-#: builtin/checkout.c:133 builtin/checkout.c:166
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
msgid "path '%s' does not have our version"
msgstr "путь «%s» не имеет нашей верÑии"
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have their version"
msgstr "путь «%s» не имеет их верÑии"
-#: builtin/checkout.c:151
+#: builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "путь «%s» не имеет вÑех необходимых верÑий"
-#: builtin/checkout.c:195
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "путь «%s» не имеет необходимых верÑий"
-#: builtin/checkout.c:212
+#: builtin/checkout.c:213
#, c-format
msgid "path '%s': cannot merge"
msgstr "путь «%s»: не удалоÑÑŒ Ñлить"
-#: builtin/checkout.c:229
+#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Ðе удалоÑÑŒ добавить результат ÑлиÑÐ½Ð¸Ñ Â«%s»"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "«%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать при обновлении путей"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:263 builtin/checkout.c:266
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "«%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:269
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÑÑ‚ÑŒ пути и переключатьÑÑ Ð½Ð° ветку «%s» одновременно."
-#: builtin/checkout.c:279 builtin/checkout.c:473
+#: builtin/checkout.c:280 builtin/checkout.c:474
msgid "corrupt index file"
msgstr "файл индекÑа поврежден"
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr "путь «%s» не Ñлит"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:496
msgid "you need to resolve your current index first"
msgstr "Ñначала нужно разрешить конфликты в вашем текущем индекÑе"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:623
#, c-format
msgid "Can not do reflog for '%s': %s\n"
-msgstr "Ðе удалоÑÑŒ Ñоздать журнал ÑÑылок Ð´Ð»Ñ Â«%s»': %s\n"
+msgstr "Ðе удалоÑÑŒ Ñоздать журнал ÑÑылок Ð´Ð»Ñ Â«%s»: %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:661
msgid "HEAD is now at"
msgstr "HEAD ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð°"
-#: builtin/checkout.c:667
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»\n"
-#: builtin/checkout.c:670
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Уже на «%s»\n"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Переключение и ÑÐ±Ñ€Ð¾Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»\n"
-#: builtin/checkout.c:676 builtin/checkout.c:1065
+#: builtin/checkout.c:677 builtin/checkout.c:1066
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Переключено на новую ветку «%s»\n"
-#: builtin/checkout.c:678
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Переключено на ветку «%s»\n"
-#: builtin/checkout.c:730
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " … и еще %d.\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -3960,7 +4004,7 @@ msgstr[1] "Предупреждение: вы оÑтавлÑете позади
msgstr[2] "Предупреждение: вы оÑтавлÑете позади %d коммитов не Ñоединенные ни Ñ Ð¾Ð´Ð½Ð¾Ð¹ из ваших веток:\n\n%s\n"
msgstr[3] "Предупреждение: вы оÑтавлÑете позади %d коммитов не Ñоединенные ни Ñ Ð¾Ð´Ð½Ð¾Ð¹ из ваших веток:\n\n%s\n"
-#: builtin/checkout.c:755
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -3979,156 +4023,162 @@ msgstr[1] "ЕÑли вы хотите Ñохранить их Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ
msgstr[2] "ЕÑли вы хотите Ñохранить их Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки, то ÑÐµÐ¹Ñ‡Ð°Ñ Ñамое времÑ\nÑделать Ñто Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:\n\n git branch <имÑ-новой-ветки> %s\n\n"
msgstr[3] "ЕÑли вы хотите Ñохранить их Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки, то ÑÐµÐ¹Ñ‡Ð°Ñ Ñамое времÑ\nÑделать Ñто Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:\n\n git branch <имÑ-новой-ветки> %s\n\n"
-#: builtin/checkout.c:791
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "внутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° при хождении по редакциÑм"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ HEAD была"
-#: builtin/checkout.c:822 builtin/checkout.c:1060
+#: builtin/checkout.c:823 builtin/checkout.c:1061
msgid "You are on a branch yet to be born"
msgstr "Ð’Ñ‹ находитеÑÑŒ на еще не Ñозданной ветке"
-#: builtin/checkout.c:967
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "ожидаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одна ÑÑылка, а передано %d."
-#: builtin/checkout.c:1006 builtin/worktree.c:210
+#: builtin/checkout.c:1007 builtin/worktree.c:213
#, c-format
msgid "invalid reference: %s"
msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑÑылка: %s"
-#: builtin/checkout.c:1035
+#: builtin/checkout.c:1036
#, c-format
msgid "reference is not a tree: %s"
msgstr "в дереве нет такой ÑÑылки: %s"
-#: builtin/checkout.c:1074
+#: builtin/checkout.c:1075
msgid "paths cannot be used with switching branches"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать пути при переключении веток"
-#: builtin/checkout.c:1077 builtin/checkout.c:1081
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать «%s» при переключении веток"
-#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ Â«%s»"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1102
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ветку на не коммит «%s»"
-#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
-#: builtin/worktree.c:319
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
msgid "branch"
msgstr "ветка"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1136
msgid "create and checkout a new branch"
msgstr "Ñоздать и перейти на новую ветку"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1138
msgid "create/reset and checkout a branch"
msgstr "Ñоздать/ÑброÑить и перейти на новую ветку"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1139
msgid "create reflog for new branch"
msgstr "Ñоздать журнал ÑÑылок Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1140
msgid "detach the HEAD at named commit"
msgstr "отÑоединить HEAD на указанном коммите"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1141
msgid "set upstream info for new branch"
msgstr "уÑтановить информацию о вышеÑтоÑщей ветке Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new-branch"
msgstr "новаÑ-ветка"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new unparented branch"
msgstr "Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ‚ÐºÐ° без родителей"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
msgid "checkout our version for unmerged files"
msgstr "перейти на нашу верÑию Ð´Ð»Ñ Ð½Ðµ Ñлитых файлов"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1146
msgid "checkout their version for unmerged files"
msgstr "перейти на их верÑию Ð´Ð»Ñ Ð½Ðµ Ñлитых файлов"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1148
msgid "force checkout (throw away local modifications)"
msgstr "принудительный переход (отбраÑывает вÑе локальные изменениÑ)"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1149
msgid "perform a 3-way merge with the new branch"
msgstr "выполнить трехходовое ÑлиÑние Ñ Ð½Ð¾Ð²Ð¾Ð¹ веткой"
-#: builtin/checkout.c:1149 builtin/merge.c:227
+#: builtin/checkout.c:1150 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr "обновить игнорируемые файлы (по умолчанию)"
-#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
+#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
msgid "style"
msgstr "Ñтиль"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1152
msgid "conflict style (merge or diff3)"
msgstr "Ñтиль конфликтов ÑлиÑÐ½Ð¸Ñ (merge или diff3)"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1155
msgid "do not limit pathspecs to sparse entries only"
msgstr "не ограничивать Ñпецификаторы пути только чаÑтичными запиÑÑми"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1157
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "переÑмотр «git checkout <no-such-branch>»"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1159
msgid "do not check if another worktree is holding the given ref"
msgstr "не проверÑÑ‚ÑŒ, что другое дерево уже Ñодержит указанную ÑÑылку"
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr "принудительно выводить прогреÑÑ"
+
+#: builtin/checkout.c:1191
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B и --orphan Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: builtin/checkout.c:1198
+#: builtin/checkout.c:1208
msgid "--track needs a branch name"
msgstr "--track требует Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1213
msgid "Missing branch name; try -b"
msgstr "Пропущено Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸; попробуйте -b"
-#: builtin/checkout.c:1239
+#: builtin/checkout.c:1249
msgid "invalid path specification"
msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿ÑƒÑ‚Ð¸"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1256
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ пути и одновременно переключить на ветку «%s».\nÐ’Ñ‹ хотели переключитьÑÑ Ð½Ð° «%s», что не может быть определено как коммит?"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1261
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1265
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4164,7 +4214,7 @@ msgstr "Будет пропущен репозиторий %s\n"
msgid "failed to remove %s"
msgstr "Ñбой ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s"
-#: builtin/clean.c:317
+#: builtin/clean.c:315
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -4172,7 +4222,7 @@ msgid ""
" - (empty) select nothing"
msgstr "Справка по выделению:\n1 - выбрать указанный Ñлемент\nfoo - выбрать Ñлемент Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ префикÑом\n - (пуÑто) не выбирать ничего"
-#: builtin/clean.c:321
+#: builtin/clean.c:319
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -4184,36 +4234,36 @@ msgid ""
" - (empty) finish selecting"
msgstr "Справка по выделению:\n1 - выбрать один Ñлемент\n3-5 - выбрать диапазон Ñлементов\n2-3,6-9 - выбрать неÑколько диапазонов\nfoo - выбрать Ñлемент Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ префикÑом\n-… - убрать выделение Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ñ… Ñлементов\n* - выбрать вÑе Ñлементы\n - (пуÑто) завершить выделение"
-#: builtin/clean.c:537
+#: builtin/clean.c:535
#, c-format
msgid "Huh (%s)?"
msgstr "Хм (%s)?"
-#: builtin/clean.c:679
+#: builtin/clean.c:677
#, c-format
msgid "Input ignore patterns>> "
msgstr "Шаблоны Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ð²Ð¾Ð´Ð°>> "
-#: builtin/clean.c:716
+#: builtin/clean.c:714
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕÐИЕ: Ðе удалоÑÑŒ найти Ñлементы ÑоответÑтвующие: %s"
-#: builtin/clean.c:737
+#: builtin/clean.c:735
msgid "Select items to delete"
msgstr "Укажите Ñлементы Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:778
+#: builtin/clean.c:776
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Удалить %s [y - да/N - нет]? "
-#: builtin/clean.c:803
+#: builtin/clean.c:801
msgid "Bye."
msgstr "До ÑвиданиÑ."
-#: builtin/clean.c:811
+#: builtin/clean.c:809
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -4224,15 +4274,15 @@ msgid ""
"? - help for prompt selection"
msgstr "clean - начать очиÑтку\nfilter by pattern - иÑключить удаление Ñлементов\nselect by numbers - иÑключить удаление Ñлементов по номерам\nask each - запрашивать подтверждение на удаление каждого Ñлемента (как «rm -i»)\nquit - прекратить очиÑтку\nhelp - Ñтот Ñкран\n? - Ñправка по выделению"
-#: builtin/clean.c:838
+#: builtin/clean.c:836
msgid "*** Commands ***"
msgstr "*** Команды ***"
-#: builtin/clean.c:839
+#: builtin/clean.c:837
msgid "What now"
msgstr "Что теперь"
-#: builtin/clean.c:847
+#: builtin/clean.c:845
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Удалить Ñледующие Ñлементы:"
@@ -4240,54 +4290,54 @@ msgstr[1] "Удалить Ñледующие Ñлементы:"
msgstr[2] "Удалить Ñледующие Ñлементы:"
msgstr[3] "Удалить Ñледующие Ñлементы:"
-#: builtin/clean.c:864
+#: builtin/clean.c:862
msgid "No more files to clean, exiting."
msgstr "Больше нет файлов Ð´Ð»Ñ Ð¾Ñ‡Ð¸Ñтки, выходим."
-#: builtin/clean.c:895
+#: builtin/clean.c:893
msgid "do not print names of files removed"
msgstr "не выводить имена удалÑемых файлов"
-#: builtin/clean.c:897
+#: builtin/clean.c:895
msgid "force"
msgstr "принудительно"
-#: builtin/clean.c:898
+#: builtin/clean.c:896
msgid "interactive cleaning"
msgstr "Ð¸Ð½Ñ‚ÐµÑ€Ð°ÐºÑ‚Ð¸Ð²Ð½Ð°Ñ Ð¾Ñ‡Ð¸Ñтка"
-#: builtin/clean.c:900
+#: builtin/clean.c:898
msgid "remove whole directories"
msgstr "удалить каталоги полноÑтью"
-#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
msgid "pattern"
msgstr "шаблон"
-#: builtin/clean.c:902
+#: builtin/clean.c:900
msgid "add <pattern> to ignore rules"
msgstr "добавить <шаблон> в правила игнорированиÑ"
-#: builtin/clean.c:903
+#: builtin/clean.c:901
msgid "remove ignored files, too"
msgstr "также удалить игнорируемые файлы"
-#: builtin/clean.c:905
+#: builtin/clean.c:903
msgid "remove only ignored files"
msgstr "удалить только игнорируемые файлы"
-#: builtin/clean.c:923
+#: builtin/clean.c:921
msgid "-x and -X cannot be used together"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно -x и -X"
-#: builtin/clean.c:927
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to"
" clean"
msgstr "clean.requireForce уÑтановлен как true и ни одна из опций -i, -n или -f не указана; отказ очиÑтки"
-#: builtin/clean.c:930
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -4297,16 +4347,11 @@ msgstr "clean.requireForce уÑтановлен по умолчанию как t
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]"
-#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
-#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
-msgid "force progress reporting"
-msgstr "принудительно выводить прогреÑÑ"
-
#: builtin/clone.c:59
msgid "don't create a checkout"
msgstr "не переключать рабочую копию на HEAD"
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
msgid "create a bare repository"
msgstr "Ñоздать голый репозиторий"
@@ -4330,15 +4375,15 @@ msgstr "наÑтроить как общедоÑтупный репозиторÐ
msgid "initialize submodules in the clone"
msgstr "инициализировать подмодули в клоне"
-#: builtin/clone.c:75 builtin/init-db.c:501
+#: builtin/clone.c:75 builtin/init-db.c:466
msgid "template-directory"
msgstr "каталог-шаблонов"
-#: builtin/clone.c:76 builtin/init-db.c:502
+#: builtin/clone.c:76 builtin/init-db.c:467
msgid "directory from which templates will be used"
msgstr "каталог, шаблоны из которого будут иÑпользованы"
-#: builtin/clone.c:78
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
msgid "reference repository"
msgstr "ÑÑылаемый репозиторий"
@@ -4362,7 +4407,7 @@ msgstr "перейти на <ветку>, вмеÑто HEAD внешнего Ñ€Ð
msgid "path to git-upload-pack on the remote"
msgstr "путь к git-upload-pack на внешнем репозитории"
-#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
#: builtin/pull.c:186
msgid "depth"
msgstr "глубина"
@@ -4375,11 +4420,11 @@ msgstr "Ñделать чаÑтичный клон указанной глуби
msgid "clone only one branch, HEAD or --branch"
msgstr "клонировать только одну ветку, HEAD или --branch"
-#: builtin/clone.c:91 builtin/init-db.c:510
+#: builtin/clone.c:91 builtin/init-db.c:475
msgid "gitdir"
msgstr "каталог-git"
-#: builtin/clone.c:92 builtin/init-db.c:511
+#: builtin/clone.c:92 builtin/init-db.c:476
msgid "separate git dir from working tree"
msgstr "размеÑтить каталог git отдельно от рабочей копии"
@@ -4391,173 +4436,174 @@ msgstr "ключ=значение"
msgid "set config inside the new repository"
msgstr "уÑтановить параметры внутри нового репозиториÑ"
-#: builtin/clone.c:298
+#: builtin/clone.c:300
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "ÑÑылаемый репозиторий «%s» как ÑвÑзанное ÑоÑтоÑние, пока не поддерживаетÑÑ."
+
+#: builtin/clone.c:302
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "ÑÑылаемый репозиторий «%s» не ÑвлÑетÑÑ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¼."
-#: builtin/clone.c:302
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "ÑÑылаемый репозиторий «%s» ÑвлÑетÑÑ Ñ‡Ð°Ñтичным"
-#: builtin/clone.c:305
+#: builtin/clone.c:310
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "ÑÑылаемый репозиторий «%s» ÑвлÑетÑÑ Ñращенным"
-#: builtin/clone.c:370 builtin/diff.c:84
+#: builtin/clone.c:375 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "не удалоÑÑŒ выполнить stat «%s»"
-#: builtin/clone.c:372
+#: builtin/clone.c:377
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s уже ÑущеÑтвует и не ÑвлÑетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼"
-#: builtin/clone.c:386
+#: builtin/clone.c:391
#, c-format
msgid "failed to stat %s\n"
msgstr "не удалоÑÑŒ выполнить stat %s\n"
-#: builtin/clone.c:408
+#: builtin/clone.c:413
#, c-format
msgid "failed to create link '%s'"
msgstr "не удалоÑÑŒ Ñоздать ÑÑылку «%s»"
-#: builtin/clone.c:412
+#: builtin/clone.c:417
#, c-format
msgid "failed to copy file to '%s'"
msgstr "не удалоÑÑŒ копировать файл в «%s»"
-#: builtin/clone.c:435 builtin/clone.c:619
+#: builtin/clone.c:442 builtin/clone.c:626
#, c-format
msgid "done.\n"
msgstr "готово.\n"
-#: builtin/clone.c:447
+#: builtin/clone.c:454
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr "Клонирование прошло уÑпешно, но во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð° на верÑию произошла ошибка.\nС помощь команды «git status» вы можете проÑмотреть, какие файлы были обновлены, а повторить попытку перехода на верÑию Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git checkout -f HEAD»\n"
-#: builtin/clone.c:524
+#: builtin/clone.c:531
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Ðе удалоÑÑŒ найти внешнюю ветку %s Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
-#: builtin/clone.c:614
+#: builtin/clone.c:621
#, c-format
msgid "Checking connectivity... "
msgstr "Проверка ÑоединениÑ… "
-#: builtin/clone.c:617
+#: builtin/clone.c:624
msgid "remote did not send all necessary objects"
msgstr "внешний репозиторий приÑлал не вÑе необходимые объекты"
-#: builtin/clone.c:681
+#: builtin/clone.c:688
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "внешний HEAD ÑÑылаетÑÑ Ð½Ð° неÑущеÑтвующую ÑÑылку, Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ на такую верÑию.\n"
-#: builtin/clone.c:712
+#: builtin/clone.c:719
msgid "unable to checkout working tree"
msgstr "не удалоÑÑŒ перейти на верÑию в рабочем каталоге"
-#: builtin/clone.c:799
+#: builtin/clone.c:808
msgid "cannot repack to clean up"
msgstr "не удалоÑÑŒ выполнить перепаковку Ð´Ð»Ñ Ð¾Ñ‡Ð¸Ñтки"
-#: builtin/clone.c:801
+#: builtin/clone.c:810
msgid "cannot unlink temporary alternates file"
msgstr "не удалоÑÑŒ отÑоединить временные альтернативные файлы"
-#: builtin/clone.c:831
+#: builtin/clone.c:842
msgid "Too many arguments."
msgstr "Слишком много аргументов."
-#: builtin/clone.c:835
+#: builtin/clone.c:846
msgid "You must specify a repository to clone."
msgstr "Ð’Ñ‹ должны указать репозиторий Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
-#: builtin/clone.c:846
+#: builtin/clone.c:857
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare и --origin %s Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно."
-#: builtin/clone.c:849
+#: builtin/clone.c:860
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare и --separate-git-dir Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно."
-#: builtin/clone.c:862
+#: builtin/clone.c:873
#, c-format
msgid "repository '%s' does not exist"
msgstr "репозиторий «%s» не ÑущеÑтвует"
-#: builtin/clone.c:868 builtin/fetch.c:1168
+#: builtin/clone.c:879 builtin/fetch.c:1166
#, c-format
msgid "depth %s is not a positive number"
msgstr "глубина %s не ÑвлÑетÑÑ Ð¿Ð¾Ð»Ð¾Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¼ чиÑлом"
-#: builtin/clone.c:878
+#: builtin/clone.c:889
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевой путь «%s» уже ÑущеÑтвует и не ÑвлÑетÑÑ Ð¿ÑƒÑтым каталогом."
-#: builtin/clone.c:888
+#: builtin/clone.c:899
#, c-format
msgid "working tree '%s' already exists."
msgstr "рабочий каталог «%s» уже ÑущеÑтвует."
-#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
-#: builtin/worktree.c:245
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "не удалоÑÑŒ Ñоздать родительÑкие каталоги Ð´Ð»Ñ Â«%s»"
-#: builtin/clone.c:906
+#: builtin/clone.c:917
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "не удалоÑÑŒ Ñоздать рабочий каталог «%s»"
-#: builtin/clone.c:924
+#: builtin/clone.c:935
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клонирование в голый репозиторий «%s»…\n"
-#: builtin/clone.c:926
+#: builtin/clone.c:937
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клонирование в «%s»…\n"
-#: builtin/clone.c:951
-msgid "--dissociate given, but there is no --reference"
-msgstr "передана Ð¾Ð¿Ñ†Ð¸Ñ --dissociate, но не передана --reference"
-
-#: builtin/clone.c:968
+#: builtin/clone.c:975
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth игнорируетÑÑ Ð½Ð° локальных клонах; вмеÑто Ñтого иÑпользуйте file://."
-#: builtin/clone.c:971
+#: builtin/clone.c:978
msgid "source repository is shallow, ignoring --local"
msgstr "иÑходный репозиторий ÑвлÑетÑÑ Ñ‡Ð°Ñтичным, --local игнорируетÑÑ"
-#: builtin/clone.c:976
+#: builtin/clone.c:983
msgid "--local is ignored"
msgstr "--local игнорируетÑÑ"
-#: builtin/clone.c:980
+#: builtin/clone.c:987
#, c-format
msgid "Don't know how to clone %s"
msgstr "Ðе знаю как клонировать %s"
-#: builtin/clone.c:1029 builtin/clone.c:1037
+#: builtin/clone.c:1036 builtin/clone.c:1044
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "ВнешнÑÑ Ð²ÐµÑ‚ÐºÐ° %s не найдена в вышеÑтоÑщем репозитории %s"
-#: builtin/clone.c:1040
+#: builtin/clone.c:1047
msgid "You appear to have cloned an empty repository."
msgstr "Похоже, что вы клонировали пуÑтой репозиторий."
@@ -4593,15 +4639,15 @@ msgstr "РаÑÑтоÑние отÑтупа между колонками"
msgid "--command must be the first argument"
msgstr "параметр --command должен быть первым"
-#: builtin/commit.c:37
+#: builtin/commit.c:38
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<опции>] [--] <ÑпецификациÑ-пути>…"
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<опции>] [--] <ÑпецификациÑ-пути>…"
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4616,7 +4662,7 @@ msgid ""
" git commit --amend --reset-author\n"
msgstr "Ваше Ð¸Ð¼Ñ Ð¸Ð»Ð¸ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð° наÑтроены автоматичеÑки на оÑновании вашего\nимени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ имени машины. ПожалуйÑта, проверьте, что они \nопределены правильно.\nÐ’Ñ‹ можете отключить Ñто уведомление уÑтановив их напрÑмую. ЗапуÑтите Ñледующую\nкоманду и Ñледуйте инÑтрукциÑм вашего текÑтового редактора, длÑ\nÑ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ файла конфигурации:\n\n git config --global --edit\n\nПоÑле Ñтого, изменить авторÑтво Ñтой коммита можно будет Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ команды:\n\n git commit --amend --reset-author\n"
-#: builtin/commit.c:60
+#: builtin/commit.c:61
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4630,14 +4676,14 @@ msgid ""
" git commit --amend --reset-author\n"
msgstr "Ваше Ð¸Ð¼Ñ Ð¸Ð»Ð¸ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð° наÑтроены автоматичеÑки на оÑновании вашего\nимени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ имени машины. ПожалуйÑта, проверьте, что они \nопределены правильно.\nÐ’Ñ‹ можете отключить Ñто уведомление уÑтановив их напрÑмую:\n\n git config --global user.name \"Ваше ИмÑ\"\n git config --global user.email you@example.com\n\nПоÑле Ñтого, изменить авторÑтво Ñтой коммита можно будет Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ команды:\n\n git commit --amend --reset-author\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
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 "Ð’Ñ‹ попроÑили иÑправить поÑледний коммит, но Ð´ÐµÐ»Ð°Ñ Ñто вы Ñделаете\nпуÑтой коммит. Ð’Ñ‹ можете повторить Ñту команду Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --allow-empty\nили вы можете удалить коммит полноÑтью Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ команды \n«git reset HEAD^».\n"
-#: builtin/commit.c:77
+#: builtin/commit.c:78
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4646,11 +4692,11 @@ msgid ""
"\n"
msgstr "Предыдущий отбор лучшего теперь пуÑÑ‚, возможно поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð².\nЕÑли вы вÑе равно хотите Ñделать пуÑтой коммит, иÑпользуйте:\n\n git commit --allow-empty\n\n"
-#: builtin/commit.c:84
+#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
msgstr "Ð’ противном Ñлучае, иÑпользуйте «git reset»\n"
-#: builtin/commit.c:87
+#: builtin/commit.c:88
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4660,103 +4706,103 @@ msgid ""
"the remaining commits.\n"
msgstr "ЕÑли вы хотите пропуÑтит Ñтот коммит, иÑпользуйте команду:\n\n git reset\n\nПоÑле Ñтого «git cherry-pick --continue» продолжит отбор лучшего\nв оÑтавшихÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°Ñ….\n"
-#: builtin/commit.c:304
+#: builtin/commit.c:305
msgid "failed to unpack HEAD tree object"
msgstr "Ñбой раÑпаковки объекта дерева HEAD"
-#: builtin/commit.c:345
+#: builtin/commit.c:346
msgid "unable to create temporary index"
msgstr "не удалоÑÑŒ Ñоздать временный индекÑ"
-#: builtin/commit.c:351
+#: builtin/commit.c:352
msgid "interactive add failed"
msgstr "Ñбой интерактивного добавлениÑ"
-#: builtin/commit.c:364
+#: builtin/commit.c:365
msgid "unable to update temporary index"
msgstr "не удалоÑÑŒ обновить временный индекÑ"
-#: builtin/commit.c:366
+#: builtin/commit.c:367
msgid "Failed to update main cache tree"
msgstr "Сбой при обновлении оÑновного кÑша дерева"
-#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr "не удалоÑÑŒ запиÑать файл new_index"
-#: builtin/commit.c:444
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñоздать чаÑтичный коммит во Ð²Ñ€ÐµÐ¼Ñ ÑлиÑниÑ."
-#: builtin/commit.c:446
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñоздать чаÑтичный коммит во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð±Ð¾Ñ€Ð° лучшего коммита."
-#: builtin/commit.c:455
+#: builtin/commit.c:456
msgid "cannot read the index"
msgstr "не удалоÑÑŒ прочитать индекÑ"
-#: builtin/commit.c:474
+#: builtin/commit.c:475
msgid "unable to write temporary index file"
msgstr "не удалоÑÑŒ запиÑать временный файл индекÑа"
-#: builtin/commit.c:579
+#: builtin/commit.c:580
#, c-format
msgid "commit '%s' lacks author header"
msgstr "у коммита «%s» отÑутÑтвует автор в заголовке"
-#: builtin/commit.c:581
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "у коммита «%s» автор в неверном формате"
-#: builtin/commit.c:600
+#: builtin/commit.c:601
msgid "malformed --author parameter"
msgstr "параметр --author в неверном формате"
-#: builtin/commit.c:608
+#: builtin/commit.c:609
#, c-format
msgid "invalid date format: %s"
msgstr "неправильный формат даты: %s"
-#: builtin/commit.c:652
+#: builtin/commit.c:653
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ñимвол комментариÑ, который\nне иÑпользуетÑÑ Ð² текущем Ñообщении коммита"
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr "не удалоÑÑŒ запроÑить коммит %s"
-#: builtin/commit.c:701 builtin/shortlog.c:273
+#: builtin/commit.c:702 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(чтение файла журнала из Ñтандартного ввода)\n"
-#: builtin/commit.c:703
+#: builtin/commit.c:704
msgid "could not read log from standard input"
msgstr "не удалоÑÑŒ прочитать файл журнала из Ñтандартного ввода"
-#: builtin/commit.c:707
+#: builtin/commit.c:708
#, c-format
msgid "could not read log file '%s'"
msgstr "не удалоÑÑŒ прочитать файл журнала «%s»"
-#: builtin/commit.c:729
+#: builtin/commit.c:730
msgid "could not read MERGE_MSG"
msgstr "не удалоÑÑŒ прочитать MERGE_MSG"
-#: builtin/commit.c:733
+#: builtin/commit.c:734
msgid "could not read SQUASH_MSG"
msgstr "не удалоÑÑŒ прочитать SQUASH_MSG"
-#: builtin/commit.c:784
+#: builtin/commit.c:785
msgid "could not write commit template"
msgstr "не удалоÑÑŒ запиÑать шаблон опиÑÐ°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°"
-#: builtin/commit.c:802
+#: builtin/commit.c:803
#, c-format
msgid ""
"\n"
@@ -4766,7 +4812,7 @@ msgid ""
"and try again.\n"
msgstr "\nПохоже, что вы пытаетеÑÑŒ закоммитить ÑлиÑние.\nЕÑли Ñто ошибка, пожалуйÑта удалите файл\n\t%s\nи попробуйте Ñнова.\n"
-#: builtin/commit.c:807
+#: builtin/commit.c:808
#, c-format
msgid ""
"\n"
@@ -4776,14 +4822,14 @@ msgid ""
"and try again.\n"
msgstr "\nПохоже, что вы пытаетеÑÑŒ закоммитить отбор лучшего.\nЕÑли Ñто ошибка, пожалуйÑта удалите файл\n\t%s\nи попробуйте Ñнова.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr "ПожалуйÑта, введите Ñообщение коммита Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… изменений. Строки,\nначинающиеÑÑ Ñ Â«%c» будут проигнорированы, а пуÑтое Ñообщение\nотменÑет процеÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n"
-#: builtin/commit.c:827
+#: builtin/commit.c:828
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4791,335 +4837,341 @@ msgid ""
"An empty message aborts the commit.\n"
msgstr "ПожалуйÑта, введите Ñообщение коммита Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… изменений. Строки,\nначинающиеÑÑ Ñ Â«%c» будут оÑтавлены; вы можете удалить их вручную,\nеÑли хотите. ПуÑтое Ñообщение отменÑет процеÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n"
-#: builtin/commit.c:847
+#: builtin/commit.c:848
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sÐвтор: %.*s <%.*s>"
-#: builtin/commit.c:855
+#: builtin/commit.c:856
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:862
+#: builtin/commit.c:863
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sКоммитер: %.*s <%.*s>"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "Cannot read index"
msgstr "Ðе удалоÑÑŒ прочитать индекÑ"
-#: builtin/commit.c:937
+#: builtin/commit.c:938
msgid "Error building trees"
msgstr "Ошибка при поÑтроении деревьев"
-#: builtin/commit.c:952 builtin/tag.c:495
+#: builtin/commit.c:953 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "ПожалуйÑта, укажите Ñообщение, при указании опций -m или -F.\n"
-#: builtin/commit.c:1054
+#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author «%s» не в формате Â«Ð˜Ð¼Ñ <почта>» и не Ñовпадает Ñ ÑущеÑтвующим автором"
-#: builtin/commit.c:1069 builtin/commit.c:1309
+#: builtin/commit.c:1070 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ðеправильный режим неотÑлеживаемых файлов «%s»"
-#: builtin/commit.c:1106
+#: builtin/commit.c:1107
msgid "--long and -z are incompatible"
msgstr "--long и -z Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: builtin/commit.c:1136
+#: builtin/commit.c:1137
msgid "Using both --reset-author and --author does not make sense"
msgstr "Указание одновременно опций --reset-author и --author не имеет ÑмыÑла"
-#: builtin/commit.c:1145
+#: builtin/commit.c:1146
msgid "You have nothing to amend."
msgstr "Ðечего иÑправлÑÑ‚ÑŒ."
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Ð’Ñ‹ в процеÑÑе ÑлиÑÐ½Ð¸Ñ â€” ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸ÑправлÑÑ‚ÑŒ."
-#: builtin/commit.c:1150
+#: builtin/commit.c:1151
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Ð’Ñ‹ в процеÑÑе отбора лучшего — ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸ÑправлÑÑ‚ÑŒ."
-#: builtin/commit.c:1153
+#: builtin/commit.c:1154
msgid "Options --squash and --fixup cannot be used together"
msgstr "Опции --squash и --fixup не могут иÑпользоватьÑÑ Ð¾Ð´Ð½Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾"
-#: builtin/commit.c:1163
+#: builtin/commit.c:1164
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одна из опций -c/-C/-F/--fixup."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "ÐžÐ¿Ñ†Ð¸Ñ -m не может иÑпользоватьÑÑ Ñ -c/-C/-F/--fixup."
-#: builtin/commit.c:1173
+#: builtin/commit.c:1174
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одновременно Ñ Ð¾Ð¿Ñ†Ð¸Ñми -C, -c или --amend."
-#: builtin/commit.c:1190
+#: builtin/commit.c:1191
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "Может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одна из опций --include/--only/--all/--interactive/--patch."
-#: builtin/commit.c:1192
+#: builtin/commit.c:1193
msgid "No paths with --include/--only does not make sense."
msgstr "Указание путей каталогов Ñ Ð¾Ð¿Ñ†Ð¸Ñми --include/--only не имеет ÑмыÑла."
-#: builtin/commit.c:1194
+#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
msgstr "Умно… отмена поÑледнего Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð½Ñ‹Ð¼ индекÑом."
-#: builtin/commit.c:1196
+#: builtin/commit.c:1197
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Пути Ñвно указаны пути без опций -i или -o; предполагаю опцию --only…"
-#: builtin/commit.c:1208 builtin/tag.c:730
+#: builtin/commit.c:1209 builtin/tag.c:475
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ðеправильное значение режима очиÑтки %s"
-#: builtin/commit.c:1213
+#: builtin/commit.c:1214
msgid "Paths with -a does not make sense."
msgstr "С опцией -a указание пути не имеет ÑмыÑла."
-#: builtin/commit.c:1323 builtin/commit.c:1602
+#: builtin/commit.c:1324 builtin/commit.c:1605
msgid "show status concisely"
msgstr "кратко показать ÑтатуÑ"
-#: builtin/commit.c:1325 builtin/commit.c:1604
+#: builtin/commit.c:1326 builtin/commit.c:1607
msgid "show branch information"
msgstr "показать информацию о верÑии"
-#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
+#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "машиночитаемый вывод"
-#: builtin/commit.c:1330 builtin/commit.c:1608
+#: builtin/commit.c:1331 builtin/commit.c:1611
msgid "show status in long format (default)"
msgstr "показать ÑÑ‚Ð°Ñ‚ÑƒÑ Ð² длинном формате (по умолчанию)"
-#: builtin/commit.c:1333 builtin/commit.c:1611
+#: builtin/commit.c:1334 builtin/commit.c:1614
msgid "terminate entries with NUL"
msgstr "завершать запиÑи ÐУЛЕВЫМ байтом"
-#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:604
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "режим"
-#: builtin/commit.c:1336 builtin/commit.c:1614
+#: builtin/commit.c:1337 builtin/commit.c:1617
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "показать неотÑлеживаемые файлы, опциональные режимы: all (вÑе), normal (как обычно), no (нет). (По умолчанию: all)"
-#: builtin/commit.c:1339
+#: builtin/commit.c:1340
msgid "show ignored files"
msgstr "показать игнорируемые файлы"
-#: builtin/commit.c:1340 parse-options.h:155
+#: builtin/commit.c:1341 parse-options.h:155
msgid "when"
msgstr "когда"
-#: builtin/commit.c:1341
+#: builtin/commit.c:1342
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr "игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² подмодулÑÑ…, опционально когда: all (вÑегда), dirty (измененные), untracked (неотÑлеживаемые). (По умолчанию: all)"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1344
msgid "list untracked files in columns"
msgstr "показать неотÑлеживаемые файлы по Ñтолбцам"
-#: builtin/commit.c:1429
+#: builtin/commit.c:1430
msgid "couldn't look up newly created commit"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñить новоÑозданный коммит"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1432
msgid "could not parse newly created commit"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñ€Ð°Ð·Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ новоÑозданный коммит"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1477
msgid "detached HEAD"
msgstr "отделенный HEAD"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1480
msgid " (root-commit)"
msgstr " (корневой коммит)"
-#: builtin/commit.c:1572
+#: builtin/commit.c:1575
msgid "suppress summary after successful commit"
msgstr "не выводить Ñводку поÑле уÑпешного коммита"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1576
msgid "show diff in commit message template"
msgstr "добавить ÑпиÑок изменений в шаблон ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1578
msgid "Commit message options"
msgstr "Опции ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°"
-#: builtin/commit.c:1576 builtin/tag.c:602
+#: builtin/commit.c:1579 builtin/tag.c:351
msgid "read message from file"
msgstr "прочитать Ñообщение из файла"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "author"
msgstr "автор"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "override author for commit"
msgstr "подменить автора коммита"
-#: builtin/commit.c:1578 builtin/gc.c:268
+#: builtin/commit.c:1581 builtin/gc.c:326
msgid "date"
msgstr "дата"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1581
msgid "override date for commit"
msgstr "подменить дату коммита"
-#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
-#: builtin/notes.c:555 builtin/tag.c:600
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
msgid "message"
msgstr "Ñообщение"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1582
msgid "commit message"
msgstr "Ñообщение коммита"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr "коммит"
+
+#: builtin/commit.c:1583
msgid "reuse and edit message from specified commit"
msgstr "иÑпользовать и отредактировать Ñообщение от указанного коммита"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1584
msgid "reuse message from specified commit"
msgstr "иÑпользовать Ñообщение указанного коммита"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1585
msgid "use autosquash formatted message to fixup specified commit"
msgstr "иÑпользовать форматированное Ñообщение Ð°Ð²Ñ‚Ð¾ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ коммита"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1586
msgid "use autosquash formatted message to squash specified commit"
msgstr "иÑпользовать форматированное Ñообщение Ð°Ð²Ñ‚Ð¾ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ коммита"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1587
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "коммит теперь за моим авторÑтвом (Ñ Ð¸Ñпользованием -C/-c/--amend)"
-#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "добавить Signed-off-by:"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1589
msgid "use specified template file"
msgstr "иÑпользовать указанный файл шаблона"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1590
msgid "force edit of commit"
msgstr "принудительно редактировать коммит"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1591
msgid "default"
msgstr "по-умолчанию"
-#: builtin/commit.c:1588 builtin/tag.c:605
+#: builtin/commit.c:1591 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "как удалÑÑ‚ÑŒ пробелы и #комментарии из ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1592
msgid "include status in commit message template"
msgstr "включить ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ„Ð°Ð¹Ð»Ð¾Ð² в шаблон ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°"
-#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "подпиÑать коммит Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1597
msgid "Commit contents options"
msgstr "Опции Ñодержимого коммита"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1598
msgid "commit all changed files"
msgstr "закоммитить вÑе измененные файлы"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1599
msgid "add specified files to index for commit"
msgstr "добавить указанные файлы в Ð¸Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1600
msgid "interactively add files"
msgstr "интерактивное добавление файлов"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1601
msgid "interactively add changes"
msgstr "интерактивное добавление изменений"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1602
msgid "commit only specified files"
msgstr "закоммитить только указанные файлы"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1603
msgid "bypass pre-commit hook"
msgstr "пропуÑтить перехватчик перед-коммитом"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1604
msgid "show what would be committed"
msgstr "показать, что будет закоммичено"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1615
msgid "amend previous commit"
msgstr "иÑправить предыдущий коммит"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1616
msgid "bypass post-rewrite hook"
msgstr "пропуÑтить перехватчик поÑле-перезапиÑи"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1621
msgid "ok to record an empty change"
msgstr "разрешить запиÑÑŒ пуÑтого коммита"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1623
msgid "ok to record a change with an empty message"
msgstr "разрешить запиÑÑŒ изменений Ñ Ð¿ÑƒÑтым Ñообщением"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
msgid "could not parse HEAD commit"
msgstr "не удалоÑÑŒ разобрать HEAD коммит"
-#: builtin/commit.c:1695
+#: builtin/commit.c:1698
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Файл MERGE_HEAD поврежден (%s)"
-#: builtin/commit.c:1702
+#: builtin/commit.c:1705
msgid "could not read MERGE_MODE"
msgstr "не удалоÑÑŒ прочитать MERGE_MODE"
-#: builtin/commit.c:1721
+#: builtin/commit.c:1724
#, c-format
msgid "could not read commit message: %s"
msgstr "не удалоÑÑŒ открыть Ñообщение коммита: %s"
-#: builtin/commit.c:1732
+#: builtin/commit.c:1735
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Отмена коммита; вы не изменили Ñообщение.\n"
-#: builtin/commit.c:1737
+#: builtin/commit.c:1740
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Отмена коммита из-за пуÑтого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1788
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5254,11 +5306,11 @@ msgstr "показывать только имена переменных"
msgid "respect include directives on lookup"
msgstr "учитывать директивы include (Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²) при запроÑе"
-#: builtin/config.c:311
+#: builtin/config.c:303
msgid "unable to parse default color value"
msgstr "не удалоÑÑŒ разобрать значение цвета по умолчанию"
-#: builtin/config.c:449
+#: builtin/config.c:441
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5268,16 +5320,16 @@ msgid ""
"#\temail = %s\n"
msgstr "# Это файл конфигурации Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Git.\n[user]\n# ПожалуйÑта, адаптируйте и раÑкомментируйте Ñледующие Ñтроки:\n#\tuser = %s\n#\temail = %s\n"
-#: builtin/config.c:583
+#: builtin/config.c:575
#, c-format
msgid "cannot create configuration file %s"
msgstr "не удалоÑÑŒ Ñоздать файл конфигурации %s"
-#: builtin/count-objects.c:55
+#: builtin/count-objects.c:77
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:65
+#: builtin/count-objects.c:87
msgid "print sizes in human readable format"
msgstr "вывод размеров в удобочитаемом Ð´Ð»Ñ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ° виде"
@@ -5391,7 +5443,7 @@ msgstr "раÑÑматривать поÑледние <n> меток (по умÐ
msgid "only consider tags matching <pattern>"
msgstr "раÑÑматривать только метки по <шаблону>"
-#: builtin/describe.c:410 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:314
msgid "show abbreviated commit object as fallback"
msgstr "еÑли не найдено, показать Ñокращенный номер ревизии коммита"
@@ -5610,7 +5662,7 @@ msgstr "[актуально]"
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s → %s (не удалоÑÑŒ извлечь в текущую ветку)"
-#: builtin/fetch.c:478 builtin/fetch.c:564
+#: builtin/fetch.c:478 builtin/fetch.c:566
msgid "[rejected]"
msgstr "[отклонено]"
@@ -5634,125 +5686,125 @@ msgstr "[Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ‚ÐºÐ°]"
msgid "[new ref]"
msgstr "[Ð½Ð¾Ð²Ð°Ñ ÑÑылка]"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "unable to update local ref"
msgstr "не удалоÑÑŒ обновить локальную ÑÑылку"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "forced update"
msgstr "принудительное обновление"
-#: builtin/fetch.c:566
+#: builtin/fetch.c:568
msgid "(non-fast-forward)"
msgstr "(без перемотки вперед)"
-#: builtin/fetch.c:600 builtin/fetch.c:842
+#: builtin/fetch.c:602 builtin/fetch.c:843
#, c-format
msgid "cannot open %s: %s\n"
msgstr "не удалоÑÑŒ открыть %s: %s\n"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:611
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s не отправил вÑе необходимые объекты\n"
-#: builtin/fetch.c:627
+#: builtin/fetch.c:629
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "%s отклонено из-за того, что чаÑтичные корни не разрешено обновлÑÑ‚ÑŒ"
-#: builtin/fetch.c:715 builtin/fetch.c:807
+#: builtin/fetch.c:716 builtin/fetch.c:808
#, c-format
msgid "From %.*s\n"
msgstr "Из %.*s\n"
-#: builtin/fetch.c:726
+#: builtin/fetch.c:727
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr "не удалоÑÑŒ обновить некоторые локальные ÑÑылки; попробуйте запуÑтить «git remote prune %s», чтобы почиÑтить Ñтарые, конфликтующие ветки"
-#: builtin/fetch.c:778
+#: builtin/fetch.c:779
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s будет виÑÑщей веткой)"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s Ñтала виÑÑщей веткой)"
-#: builtin/fetch.c:811
+#: builtin/fetch.c:812
msgid "[deleted]"
msgstr "[удалено]"
-#: builtin/fetch.c:812 builtin/remote.c:1034
+#: builtin/fetch.c:813 builtin/remote.c:1040
msgid "(none)"
msgstr "(нет)"
-#: builtin/fetch.c:832
+#: builtin/fetch.c:833
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Отказ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð² текущую ветку %s не голого репозиториÑ"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Ðеправильное значение «%2$s» Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%1$s» Ð´Ð»Ñ %3$s"
-#: builtin/fetch.c:854
+#: builtin/fetch.c:855
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Параметр «%s» игнорируетÑÑ Ð´Ð»Ñ %s\n"
-#: builtin/fetch.c:910
+#: builtin/fetch.c:911
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Ðе знаю как извлечь Ñ %s"
-#: builtin/fetch.c:1071
+#: builtin/fetch.c:1072
#, c-format
msgid "Fetching %s\n"
msgstr "Извлечение из %s\n"
-#: builtin/fetch.c:1073 builtin/remote.c:90
+#: builtin/fetch.c:1074 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Ðе удалоÑÑŒ извлечь %s"
-#: builtin/fetch.c:1091
+#: builtin/fetch.c:1092
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "Ðе указан внешний репозиторий. Укажите URL или Ð¸Ð¼Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ³Ð¾ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð¸Ð· которого должны извлекатьÑÑ Ð½Ð¾Ð²Ñ‹Ðµ редакции."
-#: builtin/fetch.c:1114
+#: builtin/fetch.c:1115
msgid "You need to specify a tag name."
msgstr "Вам нужно указать Ð¸Ð¼Ñ Ð¼ÐµÑ‚ÐºÐ¸."
-#: builtin/fetch.c:1156
+#: builtin/fetch.c:1157
msgid "--depth and --unshallow cannot be used together"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно --depth и --unshallow"
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1159
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow не имеет ÑмыÑла на полном репозитории"
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1179
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all не принимает Ð¸Ð¼Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ ÐºÐ°Ðº аргумент"
-#: builtin/fetch.c:1183
+#: builtin/fetch.c:1181
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all не имеет ÑмыÑла при указании Ñпецификаций ÑÑылок"
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1192
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Ðет такого внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð¸Ð»Ð¸ группы: %s"
-#: builtin/fetch.c:1202
+#: builtin/fetch.c:1200
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Получение группы и указание Ñпецификаций ÑÑылок не имеет ÑмыÑла"
@@ -5761,23 +5813,23 @@ msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <Ñообщение>] [--log[=<n>] | --no-log] [--file <файл>]"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:667
msgid "populate log with at most <n> entries from shortlog"
msgstr "отправить в журнал <n> запиÑей из короткого журнала"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:670
msgid "alias for --log (deprecated)"
msgstr "Ñокращение Ð´Ð»Ñ --log (уÑтаревшее)"
-#: builtin/fmt-merge-msg.c:676
+#: builtin/fmt-merge-msg.c:673
msgid "text"
msgstr "текÑÑ‚"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:674
msgid "use <text> as start of message"
msgstr "иÑпользовать <текÑÑ‚> как начальное Ñообщение"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:675
msgid "file to read from"
msgstr "файл Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
@@ -5785,95 +5837,115 @@ msgstr "файл Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<опции>] [<шаблон>]"
-#: builtin/for-each-ref.c:24
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <объект>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<объект>]]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr "git for-each-ref [--contains [<объект>]]"
+
+#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr "выводить указатели меÑта Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² подходÑщем формате Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ процеÑÑора"
-#: builtin/for-each-ref.c:26
+#: builtin/for-each-ref.c:29
msgid "quote placeholders suitably for perl"
msgstr "выводить указатели меÑта Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² подходÑщем формате Ð´Ð»Ñ perl"
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for python"
msgstr "выводить указатели меÑта Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² подходÑщем формате Ð´Ð»Ñ python"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for Tcl"
msgstr "выводить указатели меÑта Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² подходÑщем формате Ð´Ð»Ñ Tcl"
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:36
msgid "show only <n> matched refs"
msgstr "показать только <n> Ñовпадающих ÑÑылок"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
msgid "format to use for the output"
msgstr "иÑпользовать формат Ð´Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð°"
-#: builtin/for-each-ref.c:35
-msgid "key"
-msgstr "ключ"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
+msgstr "вывод только ÑÑылок, которые указывают на переданный объект"
-#: builtin/for-each-ref.c:36
-msgid "field name to sort on"
-msgstr "Ð¸Ð¼Ñ Ð¿Ð¾Ð»Ñ, по которому выполнить Ñортировку"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr "вывод только Ñлитых ÑÑылок"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr "вывод только не Ñлитых ÑÑылок"
-#: builtin/fsck.c:163 builtin/prune.c:137
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr "вывод только ÑÑылок, которые Ñодержат коммит"
+
+#: builtin/fsck.c:156 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "Проверка ÑоединениÑ"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:486
msgid "Checking object directories"
msgstr "Проверка каталогов объектов"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:553
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<опции>] [<объект>…]"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:559
msgid "show unreachable objects"
msgstr "показать недоÑтупные объекты"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:560
msgid "show dangling objects"
msgstr "показать объекты, на которые нет ÑÑылок"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:561
msgid "report tags"
msgstr "вывеÑти отчет по меткам"
-#: builtin/fsck.c:640
+#: builtin/fsck.c:562
msgid "report root nodes"
msgstr "вывеÑти отчет по корневым узлам"
-#: builtin/fsck.c:641
+#: builtin/fsck.c:563
msgid "make index objects head nodes"
msgstr "воÑпринимать объекты в индекÑе как корневые узлы"
-#: builtin/fsck.c:642
+#: builtin/fsck.c:564
msgid "make reflogs head nodes (default)"
msgstr "Ñоздать корневые узлы журналов ÑÑылок (по умолчанию)"
-#: builtin/fsck.c:643
+#: builtin/fsck.c:565
msgid "also consider packs and alternate objects"
msgstr "также проверÑÑ‚ÑŒ пакеты и альтернативные объекты"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:566
msgid "check only connectivity"
msgstr "только проверить Ñоединение"
-#: builtin/fsck.c:645
+#: builtin/fsck.c:567
msgid "enable more strict checking"
msgstr "иÑпользовать более Ñтрогую проверку"
-#: builtin/fsck.c:647
+#: builtin/fsck.c:569
msgid "write dangling objects in .git/lost-found"
msgstr "запиÑать объекты на которые нет ÑÑылок в .git/lost-found"
-#: builtin/fsck.c:648 builtin/prune.c:107
+#: builtin/fsck.c:570 builtin/prune.c:107
msgid "show progress"
msgstr "показать прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:631
msgid "Checking objects"
msgstr "Проверка объектов"
@@ -5881,54 +5953,64 @@ msgstr "Проверка объектов"
msgid "git gc [<options>]"
msgstr "git gc [<опции>]"
-#: builtin/gc.c:55
+#: builtin/gc.c:72
#, c-format
msgid "Invalid %s: '%s'"
msgstr "ÐедейÑтвительный %s: «%s»"
-#: builtin/gc.c:100
+#: builtin/gc.c:139
#, c-format
msgid "insanely long object directory %.*s"
msgstr "Ñлишком длинный путь к каталогу объекта %.*s"
-#: builtin/gc.c:269
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr "ПоÑледний запуÑк gc Ñообщил Ñледующее. ПожалуйÑта, иÑправьте ошибку и удалите %s.\nÐвтоматичеÑÐºÐ°Ñ Ð¾Ñ‡Ð¸Ñтка Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ будет производитьÑÑ, пока Ñтот файл не удалён.\n\n%s"
+
+#: builtin/gc.c:327
msgid "prune unreferenced objects"
msgstr "почиÑтить объекты, на которые нет ÑÑылок"
-#: builtin/gc.c:271
+#: builtin/gc.c:329
msgid "be more thorough (increased runtime)"
msgstr "проверÑÑ‚ÑŒ более внимательно (занимает больше времени)"
-#: builtin/gc.c:272
+#: builtin/gc.c:330
msgid "enable auto-gc mode"
msgstr "включить режим auto-gc"
-#: builtin/gc.c:273
+#: builtin/gc.c:331
msgid "force running gc even if there may be another gc running"
msgstr "принудительно запуÑтить gc, даже еÑÑ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ gc уже запущена"
-#: builtin/gc.c:315
+#: builtin/gc.c:373
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "ÐвтоматичеÑÐºÐ°Ñ ÑƒÐ¿Ð°ÐºÐ¾Ð²ÐºÐ° Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð² фоне, Ð´Ð»Ñ Ð¾Ð¿Ñ‚Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð¹ производительноÑти.\n"
-#: builtin/gc.c:317
+#: builtin/gc.c:375
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "ÐвтоматичеÑÐºÐ°Ñ ÑƒÐ¿Ð°ÐºÐ¾Ð²ÐºÐ° репозиториÑ, Ð´Ð»Ñ Ð¾Ð¿Ñ‚Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð¹ производительноÑти.\n"
-#: builtin/gc.c:318
+#: builtin/gc.c:376
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Смотрите «git help gc» руководÑтва по ручной очиÑтке.\n"
-#: builtin/gc.c:336
+#: builtin/gc.c:397
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr "gc уже запущен на Ñтом компьютере «%s» pid %<PRIuMAX> (еÑли нет, иÑпользуйте --force)"
-#: builtin/gc.c:364
+#: builtin/gc.c:441
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove "
"them."
@@ -5963,199 +6045,195 @@ msgstr "параметр «%c» ожидает чиÑловое значение
msgid "cannot open '%s'"
msgstr "не удалоÑÑŒ открыть «%s»"
-#: builtin/grep.c:638
+#: builtin/grep.c:633
msgid "search in index instead of in the work tree"
msgstr "иÑкать в индекÑе, а не в рабочем каталоге"
-#: builtin/grep.c:640
+#: builtin/grep.c:635
msgid "find in contents not managed by git"
msgstr "иÑкать в Ñодержимом не управлÑемым git"
-#: builtin/grep.c:642
+#: builtin/grep.c:637
msgid "search in both tracked and untracked files"
msgstr "иÑкать и в отÑлеживаемых, и в неотÑлеживаемых файлах"
-#: builtin/grep.c:644
+#: builtin/grep.c:639
msgid "ignore files specified via '.gitignore'"
msgstr "игнорировать файлы указанные в «.gitignore»"
-#: builtin/grep.c:647
+#: builtin/grep.c:642
msgid "show non-matching lines"
msgstr "иÑкать в неÑовпадающих Ñтроках"
-#: builtin/grep.c:649
+#: builtin/grep.c:644
msgid "case insensitive matching"
msgstr "без учета региÑтра"
-#: builtin/grep.c:651
+#: builtin/grep.c:646
msgid "match patterns only at word boundaries"
msgstr "иÑкать ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° только на границах Ñлов"
-#: builtin/grep.c:653
+#: builtin/grep.c:648
msgid "process binary files as text"
msgstr "обработка двоичных файлов как текÑта"
-#: builtin/grep.c:655
+#: builtin/grep.c:650
msgid "don't match patterns in binary files"
msgstr "не иÑкать ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° в двоичных файлах"
-#: builtin/grep.c:658
+#: builtin/grep.c:653
msgid "process binary files with textconv filters"
msgstr "обрабатыватьÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ðµ файлы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ фильтров textconv"
-#: builtin/grep.c:660
+#: builtin/grep.c:655
msgid "descend at most <depth> levels"
msgstr "на глубине макÑиму <глубина> уровней"
-#: builtin/grep.c:664
+#: builtin/grep.c:659
msgid "use extended POSIX regular expressions"
msgstr "иÑпользовать раÑширенные регулÑрные Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ POSIX"
-#: builtin/grep.c:667
+#: builtin/grep.c:662
msgid "use basic POSIX regular expressions (default)"
msgstr "иÑпользовать базовые регулÑрные Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ POSIX (по умолчанию)"
-#: builtin/grep.c:670
+#: builtin/grep.c:665
msgid "interpret patterns as fixed strings"
msgstr "интерпретировать шаблоны как фикÑированные Ñтроки"
-#: builtin/grep.c:673
+#: builtin/grep.c:668
msgid "use Perl-compatible regular expressions"
msgstr "иÑпользовать Perl-ÑовмеÑтимые регулÑрные выражениÑ"
-#: builtin/grep.c:676
+#: builtin/grep.c:671
msgid "show line numbers"
msgstr "вывеÑти номера Ñтрок"
-#: builtin/grep.c:677
+#: builtin/grep.c:672
msgid "don't show filenames"
msgstr "не выводить имена файлов"
-#: builtin/grep.c:678
+#: builtin/grep.c:673
msgid "show filenames"
msgstr "выводить имена файлов"
-#: builtin/grep.c:680
+#: builtin/grep.c:675
msgid "show filenames relative to top directory"
msgstr "выводить имена файлов отноÑительно каталога репозиториÑ"
-#: builtin/grep.c:682
+#: builtin/grep.c:677
msgid "show only filenames instead of matching lines"
msgstr "выводить только имена файлов, а не Ñовпадающие Ñтроки"
-#: builtin/grep.c:684
+#: builtin/grep.c:679
msgid "synonym for --files-with-matches"
msgstr "Ñиноним Ð´Ð»Ñ --files-with-matches"
-#: builtin/grep.c:687
+#: builtin/grep.c:682
msgid "show only the names of files without match"
msgstr "выводить только неÑовпадающие имена файлов"
-#: builtin/grep.c:689
+#: builtin/grep.c:684
msgid "print NUL after filenames"
msgstr "выводить двоичный ÐОЛЬ поÑле ÑпиÑка имен файлов"
-#: builtin/grep.c:691
+#: builtin/grep.c:686
msgid "show the number of matches instead of matching lines"
msgstr "выводить количеÑтво Ñовпадений, а не Ñовпадающие Ñтроки"
-#: builtin/grep.c:692
+#: builtin/grep.c:687
msgid "highlight matches"
msgstr "подÑвечивать ÑовпадениÑ"
-#: builtin/grep.c:694
+#: builtin/grep.c:689
msgid "print empty line between matches from different files"
msgstr "выводить пуÑтую Ñтроку поÑле Ñовпадений из разных файлов"
-#: builtin/grep.c:696
+#: builtin/grep.c:691
msgid "show filename only once above matches from same file"
msgstr "выводить Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° только раз на неÑколько Ñовпадений в одном файле"
-#: builtin/grep.c:699
+#: builtin/grep.c:694
msgid "show <n> context lines before and after matches"
msgstr "показать <n> Ñтрок контекÑта перед и поÑле ÑовпадениÑ"
-#: builtin/grep.c:702
+#: builtin/grep.c:697
msgid "show <n> context lines before matches"
msgstr "показать <n> Ñтрок контекÑта перед Ñовпадением"
-#: builtin/grep.c:704
+#: builtin/grep.c:699
msgid "show <n> context lines after matches"
msgstr "показать <n> Ñтрок контекÑта поÑле ÑовпадениÑ"
-#: builtin/grep.c:705
+#: builtin/grep.c:700
msgid "shortcut for -C NUM"
msgstr "тоже, что и -C КОЛИЧЕСТВО"
-#: builtin/grep.c:708
+#: builtin/grep.c:703
msgid "show a line with the function name before matches"
msgstr "показать Ñтроку Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ функции перед Ñовпадением"
-#: builtin/grep.c:710
+#: builtin/grep.c:705
msgid "show the surrounding function"
msgstr "показать окружающую функцию"
-#: builtin/grep.c:713
+#: builtin/grep.c:708
msgid "read patterns from file"
msgstr "прочитать шаблоны из файла"
-#: builtin/grep.c:715
+#: builtin/grep.c:710
msgid "match <pattern>"
msgstr "поиÑк ÑоответÑтвий Ñ <шаблоном>"
-#: builtin/grep.c:717
+#: builtin/grep.c:712
msgid "combine patterns specified with -e"
msgstr "объединить шаблоны указанные Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ -e"
-#: builtin/grep.c:729
+#: builtin/grep.c:724
msgid "indicate hit with exit status without output"
msgstr "ничего не выводить, указать на Ñовпадение Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ кода выхода"
-#: builtin/grep.c:731
+#: builtin/grep.c:726
msgid "show only matches from files that match all patterns"
msgstr "показать только ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð· файлов в которых Ñовпадают вÑе шаблоны"
-#: builtin/grep.c:733
+#: builtin/grep.c:728
msgid "show parse tree for grep expression"
msgstr "показать дерево разбора Ð´Ð»Ñ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð¸Ñка"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "pager"
msgstr "пейджер"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "show matching files in the pager"
msgstr "показать Ñовпадающие файлы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ программы-пейджера"
-#: builtin/grep.c:740
+#: builtin/grep.c:735
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "разрешить вызов grep(1) (игнорируетÑÑ Ð² Ñтой Ñборке)"
-#: builtin/grep.c:741 builtin/show-ref.c:189
-msgid "show usage"
-msgstr "показать иÑпользование"
-
-#: builtin/grep.c:808
+#: builtin/grep.c:793
msgid "no pattern given."
msgstr "не задан шаблон."
-#: builtin/grep.c:866
+#: builtin/grep.c:851
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager работает только в рабочем каталоге"
-#: builtin/grep.c:892
+#: builtin/grep.c:877
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached или --untracked Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --no-index."
-#: builtin/grep.c:897
+#: builtin/grep.c:882
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index или --untracked Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ ревизии."
-#: builtin/grep.c:900
+#: builtin/grep.c:885
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard не может иÑпользоватьÑÑ Ð´Ð»Ñ Ð¾Ñ‚Ñлеживаемого Ñодержимого."
-#: builtin/grep.c:908
+#: builtin/grep.c:893
msgid "both --cached and trees are given."
msgstr "указано одновременно --cached и дерево."
@@ -6166,10 +6244,10 @@ msgid ""
msgstr "git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] [--] <файл>…"
#: builtin/hash-object.c:81
-msgid "git hash-object --stdin-paths < <list-of-paths>"
-msgstr "git hash-object --stdin-paths < <ÑпиÑок-путей>"
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:92 builtin/tag.c:614
+#: builtin/hash-object.c:92
msgid "type"
msgstr "тип"
@@ -6240,80 +6318,80 @@ msgstr "Сбой при определении верÑии emacsclient."
msgid "emacsclient version '%d' too old (< 22)."
msgstr "верÑÐ¸Ñ emacsclient «%d» Ñлишком ÑÑ‚Ð°Ñ€Ð°Ñ (< 22)."
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
msgid "failed to exec '%s': %s"
msgstr "Ñбой при запуÑке «%s»: %s"
-#: builtin/help.c:215
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr "«%s»: путь Ð´Ð»Ñ Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ программы проÑмотра man.\nВмеÑто Ñтого иÑпользуйте «man.<программа>.cmd»."
-#: builtin/help.c:227
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr "«%s»: команда Ð´Ð»Ñ Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ программы проÑмотра man.\nВмеÑто Ñтого иÑпользуйте «man.<программа>.path»."
-#: builtin/help.c:354
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr "«%s»: неизвеÑÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° проÑмотра man."
-#: builtin/help.c:371
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr "программа проÑмотра man не обработала запроÑ"
-#: builtin/help.c:379
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr "программа проÑмотра info не обработала запроÑ"
-#: builtin/help.c:428
+#: builtin/help.c:411
msgid "Defining attributes per path"
msgstr "Определение атрибутов Ð´Ð»Ñ Ð¿ÑƒÑ‚ÐµÐ¹ файлов или каталогов"
-#: builtin/help.c:429
+#: builtin/help.c:412
msgid "Everyday Git With 20 Commands Or So"
msgstr "ПовÑедневный Git Ñ 20 командами или около того"
-#: builtin/help.c:430
+#: builtin/help.c:413
msgid "A Git glossary"
msgstr "ГлоÑÑарий Git"
-#: builtin/help.c:431
+#: builtin/help.c:414
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указание Ñпециально игнорируемых файлов"
-#: builtin/help.c:432
+#: builtin/help.c:415
msgid "Defining submodule properties"
msgstr "Определение ÑвойÑтв подмодулей"
-#: builtin/help.c:433
+#: builtin/help.c:416
msgid "Specifying revisions and ranges for Git"
msgstr "Указание редакций и диапазонов Ð´Ð»Ñ Git"
-#: builtin/help.c:434
+#: builtin/help.c:417
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Учебное введение в Git (Ð´Ð»Ñ Ð²ÐµÑ€Ñии 1.5.1 или новее)"
-#: builtin/help.c:435
+#: builtin/help.c:418
msgid "An overview of recommended workflows with Git"
msgstr "Обзор рекомендуемых поÑледовательноÑтей выполнÑемых дейÑтвий Ñ Git"
-#: builtin/help.c:447
+#: builtin/help.c:430
msgid "The common Git guides are:\n"
msgstr "ОÑновные руководÑтва Git:\n"
-#: builtin/help.c:468 builtin/help.c:485
+#: builtin/help.c:451 builtin/help.c:468
#, c-format
msgid "usage: %s%s"
msgstr "иÑпользование: %s%s"
-#: builtin/help.c:501
+#: builtin/help.c:484
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "«git %s» — Ñто Ñокращение Ð´Ð»Ñ Â«%s»"
@@ -6616,87 +6694,62 @@ msgstr "Ð¸Ð¼Ñ Ð¿Ð°ÐºÐµÑ‚Ð° «%s» не оканчиваетÑÑ Ð½Ð° «.pack»"
msgid "--verify with no packfile name given"
msgstr "--verify без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¸Ð¼ÐµÐ½Ð¸ файла пакета"
-#: builtin/init-db.c:36
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Ðе удалоÑÑŒ предоÑтавить доÑтуп к %s на запиÑÑŒ"
-
-#: builtin/init-db.c:63
-#, c-format
-msgid "insanely long template name %s"
-msgstr "Ñлишком длинное Ð¸Ð¼Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° %s"
-
-#: builtin/init-db.c:68
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ Â«%s»"
-#: builtin/init-db.c:74
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° «%s»"
-#: builtin/init-db.c:81
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "не удалоÑÑŒ выполнить opendir Ð´Ð»Ñ Â«%s»"
-#: builtin/init-db.c:98
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr "не удалоÑÑŒ выполнить readlink Ð´Ð»Ñ Â«%s»"
-#: builtin/init-db.c:100
-#, c-format
-msgid "insanely long symlink %s"
-msgstr "Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑŒÐ½Ð°Ñ ÑÑылка %s"
-
-#: builtin/init-db.c:103
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "не удалоÑÑŒ Ñоздать Ñимвольную ÑÑылку «%s» на «%s»"
-#: builtin/init-db.c:107
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "не удалоÑÑŒ Ñкопировать файл «%s» в «%s»"
-#: builtin/init-db.c:111
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr "игнорирование шаблона %s"
-#: builtin/init-db.c:137
-#, c-format
-msgid "insanely long template path %s"
-msgstr "Ñлишком длинный путь шаблона %s"
-
-#: builtin/init-db.c:145
+#: builtin/init-db.c:118
#, c-format
msgid "templates not found %s"
msgstr "шаблоны не найдены %s"
-#: builtin/init-db.c:158
+#: builtin/init-db.c:131
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr "не копирую шаблоны в неправильной верÑии формата %d из «%s»"
-#: builtin/init-db.c:212
-#, c-format
-msgid "insane git directory %s"
-msgstr "Ñлишком длинный путь к каталогу git %s"
-
-#: builtin/init-db.c:344 builtin/init-db.c:347
+#: builtin/init-db.c:309 builtin/init-db.c:312
#, c-format
msgid "%s already exists"
msgstr "%s уже ÑущеÑтвует"
-#: builtin/init-db.c:375
+#: builtin/init-db.c:340
#, c-format
msgid "unable to handle file type %d"
msgstr "не удаетÑÑ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ файл типа %d"
-#: builtin/init-db.c:378
+#: builtin/init-db.c:343
#, c-format
msgid "unable to move %s to %s"
msgstr "не удаетÑÑ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить файл %s в %s"
@@ -6704,55 +6757,55 @@ msgstr "не удаетÑÑ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить файл %s в %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:434
+#: builtin/init-db.c:399
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s репозиторий Git в %s%s\n"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Reinitialized existing"
msgstr "Ð ÐµÐ¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ ÑущеÑтвующего"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Initialized empty"
msgstr "Инициализирован пуÑтой"
-#: builtin/init-db.c:436
+#: builtin/init-db.c:401
msgid " shared"
msgstr " общий"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:448
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
"[--shared[=<permissions>]] [<directory>]"
msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доÑтупа>]] [<каталог>]"
-#: builtin/init-db.c:506
+#: builtin/init-db.c:471
msgid "permissions"
msgstr "права-доÑтупа"
-#: builtin/init-db.c:507
+#: builtin/init-db.c:472
msgid "specify that the git repository is to be shared amongst several users"
msgstr "укажите, еÑли репозиторий git будет иÑпользоватьÑÑ Ð½ÐµÑколькими пользователÑми"
-#: builtin/init-db.c:541 builtin/init-db.c:546
+#: builtin/init-db.c:506 builtin/init-db.c:511
#, c-format
msgid "cannot mkdir %s"
msgstr "не удалоÑÑŒ выполнить mkdir %s"
-#: builtin/init-db.c:550
+#: builtin/init-db.c:515
#, c-format
msgid "cannot chdir to %s"
msgstr "не удалоÑÑŒ выполнить chdir в %s"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:536
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr "%s (или --work-tree=<каталог>) Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ %s (или --git-dir=<каталог>)"
-#: builtin/init-db.c:599
+#: builtin/init-db.c:564
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Ðе удалоÑÑŒ получить доÑтуп к рабочему каталогу «%s»"
@@ -6836,33 +6889,33 @@ msgstr "в format.headers не указано значение"
msgid "name of output directory is too long"
msgstr "Ñлишком длинное Ð¸Ð¼Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ каталога"
-#: builtin/log.c:814
+#: builtin/log.c:813
#, c-format
msgid "Cannot open patch file %s"
msgstr "Ðу удалоÑÑŒ открыть файл изменений %s"
-#: builtin/log.c:828
+#: builtin/log.c:827
msgid "Need exactly one range."
msgstr "Ðужен только один диапазон."
-#: builtin/log.c:838
+#: builtin/log.c:837
msgid "Not a range."
msgstr "Ðе ÑвлÑетÑÑ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð¾Ð¼."
-#: builtin/log.c:944
+#: builtin/log.c:943
msgid "Cover letter needs email format"
msgstr "Сопроводительное пиÑьмо должно быть в формате Ñлектронной почты"
-#: builtin/log.c:1023
+#: builtin/log.c:1022
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ошибка в поле in-reply-to: %s"
-#: builtin/log.c:1051
+#: builtin/log.c:1050
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<опции>] [<начинаÑ-Ñ> | <диапазон-редакций>]"
-#: builtin/log.c:1096
+#: builtin/log.c:1095
msgid "Two output directories?"
msgstr "Два выходных каталога?"
@@ -6919,135 +6972,139 @@ msgid "don't output binary diffs"
msgstr "не выводить двоичные различиÑ"
#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr "выводить пуÑтую хеш-Ñумму в поле Отправитель"
+
+#: builtin/log.c:1243
msgid "don't include a patch matching a commit upstream"
msgstr "не включать патч, еÑли коммит уже еÑÑ‚ÑŒ в вышеÑтоÑщей ветке"
-#: builtin/log.c:1243
+#: builtin/log.c:1245
msgid "show patch format instead of default (patch + stat)"
msgstr "выводить в формате патча, а не в Ñтандартном (патч + ÑтатиÑтика)"
-#: builtin/log.c:1245
+#: builtin/log.c:1247
msgid "Messaging"
msgstr "Передача Ñообщений"
-#: builtin/log.c:1246
+#: builtin/log.c:1248
msgid "header"
msgstr "заголовок"
-#: builtin/log.c:1247
+#: builtin/log.c:1249
msgid "add email header"
msgstr "добавить заголовок ÑообщениÑ"
-#: builtin/log.c:1248 builtin/log.c:1250
+#: builtin/log.c:1250 builtin/log.c:1252
msgid "email"
msgstr "почта"
-#: builtin/log.c:1248
+#: builtin/log.c:1250
msgid "add To: header"
msgstr "добавить заголовок To:"
-#: builtin/log.c:1250
+#: builtin/log.c:1252
msgid "add Cc: header"
msgstr "добавить заголовок Cc:"
-#: builtin/log.c:1252
+#: builtin/log.c:1254
msgid "ident"
msgstr "идентификатор"
-#: builtin/log.c:1253
+#: builtin/log.c:1255
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "уÑтановить Ð°Ð´Ñ€ÐµÑ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÐµÐ»Ñ Ð½Ð° <идентификатор> (или на идентификатор коммитера, еÑли отÑутÑтвует)"
-#: builtin/log.c:1255
+#: builtin/log.c:1257
msgid "message-id"
msgstr "идентификатор-ÑообщениÑ"
-#: builtin/log.c:1256
+#: builtin/log.c:1258
msgid "make first mail a reply to <message-id>"
msgstr "Ñделать первое пиÑьмо ответом на <идентификатор-ÑообщениÑ>"
-#: builtin/log.c:1257 builtin/log.c:1260
+#: builtin/log.c:1259 builtin/log.c:1262
msgid "boundary"
msgstr "вложение"
-#: builtin/log.c:1258
+#: builtin/log.c:1260
msgid "attach the patch"
msgstr "приложить патч"
-#: builtin/log.c:1261
+#: builtin/log.c:1263
msgid "inline the patch"
msgstr "включить патч в текÑÑ‚ пиÑьма"
-#: builtin/log.c:1265
+#: builtin/log.c:1267
msgid "enable message threading, styles: shallow, deep"
msgstr "включить в пиÑьмах иерархичноÑÑ‚ÑŒ, Ñтили: shallow (чаÑтичную), deep (глубокую)"
-#: builtin/log.c:1267
+#: builtin/log.c:1269
msgid "signature"
msgstr "подпиÑÑŒ"
-#: builtin/log.c:1268
+#: builtin/log.c:1270
msgid "add a signature"
msgstr "добавить подпиÑÑŒ"
-#: builtin/log.c:1270
+#: builtin/log.c:1272
msgid "add a signature from a file"
msgstr "добавить подпиÑÑŒ из файла"
-#: builtin/log.c:1271
+#: builtin/log.c:1273
msgid "don't print the patch filenames"
msgstr "не выводить имена файлов патчей"
-#: builtin/log.c:1360
+#: builtin/log.c:1362
msgid "-n and -k are mutually exclusive."
msgstr "-n и -k Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: builtin/log.c:1362
+#: builtin/log.c:1364
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix и -k Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно."
-#: builtin/log.c:1370
+#: builtin/log.c:1372
msgid "--name-only does not make sense"
msgstr "--name-only не имеет ÑмыÑла"
-#: builtin/log.c:1372
+#: builtin/log.c:1374
msgid "--name-status does not make sense"
msgstr "--name-status не имеет ÑмыÑла"
-#: builtin/log.c:1374
+#: builtin/log.c:1376
msgid "--check does not make sense"
msgstr "--check не имеет ÑмыÑла"
-#: builtin/log.c:1397
+#: builtin/log.c:1401
msgid "standard output, or directory, which one?"
msgstr "Ñтандартный вывод или каталог?"
-#: builtin/log.c:1399
+#: builtin/log.c:1403
#, c-format
msgid "Could not create directory '%s'"
msgstr "Ðе удалоÑÑŒ Ñоздать каталог «%s»"
-#: builtin/log.c:1496
+#: builtin/log.c:1500
#, c-format
msgid "unable to read signature file '%s'"
msgstr "не удалоÑÑŒ прочитать файл подпиÑи «%s»"
-#: builtin/log.c:1559
+#: builtin/log.c:1563
msgid "Failed to create output files"
msgstr "Сбой при Ñоздании выходных файлов"
-#: builtin/log.c:1607
+#: builtin/log.c:1611
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<вышеÑтоÑщаÑ-ветка> [<голова> [<ограничение>]]]"
-#: builtin/log.c:1661
+#: builtin/log.c:1665
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> "
"manually.\n"
msgstr "Ðе удалоÑÑŒ найти отÑлеживаемую внешнюю ветку, укажите <вышеÑтоÑщую-ветку> вручную.\n"
-#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
+#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr "ÐеизвеÑтный коммит %s"
@@ -7148,35 +7205,35 @@ msgstr "показать отладочную информацию"
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<опции>] <указатель-дерева> [<путь>…]"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "выводить только деревьÑ"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "проходить рекурÑивно в поддеревьÑ"
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "выводить Ð´ÐµÑ€ÐµÐ²ÑŒÑ Ð¿Ñ€Ð¸ рекурÑивном проходе"
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "разделÑÑ‚ÑŒ запиÑи Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÐУЛЕВОГО байта"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "включить размер объекта"
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "выводить только имена файлов"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "иÑпользовать полные пути"
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "вывеÑти полное дерево; не только текущий каталог (включает в ÑÐµÐ±Ñ --full-name)"
@@ -7401,72 +7458,72 @@ msgstr "Ð”Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ ветки не указана вышеÑтоÑщÐ
msgid "No remote-tracking branch for %s from %s"
msgstr "Ðе указана внешнÑÑ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ° Ð´Ð»Ñ %s на %s"
-#: builtin/merge.c:1081
+#: builtin/merge.c:1079
#, c-format
msgid "could not close '%s'"
msgstr "не удалоÑÑŒ закрыть «%s»"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1206
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Ðет ÑлиÑниÑ, которое можно отменить (отÑутÑтвует файл MERGE_HEAD)."
-#: builtin/merge.c:1224
+#: builtin/merge.c:1222
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr "Ð’Ñ‹ не завершили ÑлиÑние (приÑутÑтвует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед ÑлиÑнием."
-#: builtin/merge.c:1231
+#: builtin/merge.c:1229
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr "Ð’Ñ‹ не завершили отбор лучшего (приÑутÑтвует файл CHERRY_PICK_HEAD).\nПожалуйÑта, выполните коммит ваших изменений, перед ÑлиÑнием."
-#: builtin/merge.c:1234
+#: builtin/merge.c:1232
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Ð’Ñ‹ не завершили отбор лучшего (приÑутÑтвует файл CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1243
+#: builtin/merge.c:1241
msgid "You cannot combine --squash with --no-ff."
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно --squash и --no-ff."
-#: builtin/merge.c:1251
+#: builtin/merge.c:1249
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Коммит не указан и параметр merge.defaultToUpstream не уÑтановлен."
-#: builtin/merge.c:1268
+#: builtin/merge.c:1266
msgid "Squash commit into empty head not supported yet"
msgstr "Уплотнение коммита в пуÑтой HEAD еще не поддерживаетÑÑ"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1268
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Коммит, не ÑвлÑющийÑÑ Ð¿ÐµÑ€ÐµÐ¼Ð¾Ñ‚ÐºÐ¾Ð¹ вперед, нет ÑмыÑла делать в пуÑтой HEAD."
-#: builtin/merge.c:1276
+#: builtin/merge.c:1274
#, c-format
msgid "%s - not something we can merge"
msgstr "%s не ÑвлÑетÑÑ Ñ‚ÐµÐ¼, что можно Ñлить"
-#: builtin/merge.c:1278
+#: builtin/merge.c:1276
msgid "Can merge only exactly one commit into empty head"
msgstr "Можно Ñлить Ñтрого один коммит в пуÑтой HEAD."
-#: builtin/merge.c:1333
+#: builtin/merge.c:1331
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Коммит %s Ñодержит не доверенную GPG подпиÑÑŒ, предположительно от %s."
-#: builtin/merge.c:1336
+#: builtin/merge.c:1334
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Коммит %s Ñодержит плохую GPG подпиÑÑŒ, предположительно от %s."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Коммит %s не Ñодержит GPG подпиÑÑŒ."
-#: builtin/merge.c:1342
+#: builtin/merge.c:1340
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Коммит %s Ñодержит дейÑтвительную GPG подпиÑÑŒ, от %s.\n"
@@ -7476,46 +7533,46 @@ msgstr "Коммит %s Ñодержит дейÑтвительную GPG под
msgid "Updating %s..%s\n"
msgstr "Обновление %s..%s\n"
-#: builtin/merge.c:1462
+#: builtin/merge.c:1460
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Попытка тривиального ÑлиÑÐ½Ð¸Ñ Ð² индекÑе…\n"
-#: builtin/merge.c:1469
+#: builtin/merge.c:1467
#, c-format
msgid "Nope.\n"
msgstr "Ðе вышло.\n"
-#: builtin/merge.c:1501
+#: builtin/merge.c:1499
msgid "Not possible to fast-forward, aborting."
msgstr "Перемотка вперед не возможна, отмена."
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Перемотка дерева к иÑходному ÑоÑтоÑнию…\n"
-#: builtin/merge.c:1528
+#: builtin/merge.c:1526
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Попытка ÑлиÑÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтратегии %s…\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1592
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ðи одна ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ ÑлиÑÐ½Ð¸Ñ Ð½Ðµ обработала ÑлиÑние.\n"
-#: builtin/merge.c:1596
+#: builtin/merge.c:1594
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Сбой при ÑлиÑнии Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтратегии %s.\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1603
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "ИÑпользую %s Ð´Ð»Ñ Ð¿Ð¾Ð´Ð³Ð¾Ñ‚Ð¾Ð²ÐºÐ¸ ручного Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð².\n"
-#: builtin/merge.c:1617
+#: builtin/merge.c:1615
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "ÐвтоматичеÑкое ÑлиÑние прошло уÑпешно; как и запрашивали, оÑтановлено перед выполнением коммита\n"
@@ -7701,48 +7758,48 @@ msgstr "%s, откуда=%s, куда=%s"
msgid "Renaming %s to %s\n"
msgstr "Переименование %s в %s\n"
-#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "Ñбой при переименовании «%s»"
-#: builtin/name-rev.c:255
+#: builtin/name-rev.c:251
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<опции>] <коммит>…"
-#: builtin/name-rev.c:256
+#: builtin/name-rev.c:252
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<опции>] --all"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:253
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<опции>] --stdin"
-#: builtin/name-rev.c:309
+#: builtin/name-rev.c:305
msgid "print only names (no SHA-1)"
msgstr "выводить только имена (без SHA-1)"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:306
msgid "only use tags to name the commits"
msgstr "иÑпользовать только метки Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð²"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:308
msgid "only use refs matching <pattern>"
msgstr "иÑпользовать только ÑÑылки, ÑоответÑтвующие <шаблону> "
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:310
msgid "list all commits reachable from all refs"
msgstr "вывеÑти ÑпиÑок вÑех коммитов, доÑтижимых Ñо вÑех ÑÑылок"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:311
msgid "read from stdin"
msgstr "прочитать из Ñтандартного ввода"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:312
msgid "allow to print `undefined` names (default)"
msgstr "разрешить вывод «undefined», еÑли не найдено (по умолчанию)"
-#: builtin/name-rev.c:322
+#: builtin/name-rev.c:318
msgid "dereference tags in the input (internal use)"
msgstr "разыменовывать введенные метки (Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ³Ð¾ иÑпользованиÑ)"
@@ -7865,7 +7922,7 @@ msgstr "не удалоÑÑŒ прочитать вывод «show»"
msgid "failed to finish 'show' for object '%s'"
msgstr "не удалоÑÑŒ завершить «show» Ð´Ð»Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° «%s»"
-#: builtin/notes.c:174 builtin/tag.c:477
+#: builtin/notes.c:174 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "не удалоÑÑŒ Ñоздать файл «%s»"
@@ -7883,12 +7940,12 @@ msgstr "не удалоÑÑŒ запиÑать объект заметки"
msgid "The note contents have been left in %s"
msgstr "Содержимое заметки оÑталоÑÑŒ в %s"
-#: builtin/notes.c:232 builtin/tag.c:695
+#: builtin/notes.c:232 builtin/tag.c:440
#, c-format
msgid "cannot read '%s'"
msgstr "не удалоÑÑŒ прочитать «%s»"
-#: builtin/notes.c:234 builtin/tag.c:698
+#: builtin/notes.c:234 builtin/tag.c:443
#, c-format
msgid "could not open or read '%s'"
msgstr "не удалоÑÑŒ открыть или прочитать «%s»"
@@ -7896,7 +7953,7 @@ msgstr "не удалоÑÑŒ открыть или прочитать «%s»"
#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
-#: builtin/notes.c:877 builtin/tag.c:711
+#: builtin/notes.c:877 builtin/tag.c:456
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Ðе удалоÑÑŒ разрешить «%s» как ÑÑылку."
@@ -7930,11 +7987,6 @@ msgstr "текÑтовое Ñодержимое заметки"
msgid "note contents in a file"
msgstr "Ñодержимое заметки в файле"
-#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
-#: builtin/notes.c:564 builtin/tag.c:630
-msgid "object"
-msgstr "объект"
-
#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr "иÑпользовать и отредактировать указанный объект заметки"
@@ -8055,7 +8107,7 @@ msgstr "ÑÑылка-на-заметку"
msgid "use notes from <notes-ref>"
msgstr "иÑпользовать заметку из <ÑÑылка-на-заметку>"
-#: builtin/notes.c:1012 builtin/remote.c:1588
+#: builtin/notes.c:1012 builtin/remote.c:1647
#, c-format
msgid "Unknown subcommand: %s"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s"
@@ -8261,21 +8313,25 @@ msgstr "Удаление дублирующихÑÑ Ð¾Ð±ÑŠÐµÐºÑ‚Ð¾Ð²"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <времÑ>] [--] [<имÑ-ветки>…]"
-#: builtin/prune.c:105 builtin/worktree.c:121
+#: builtin/prune.c:105 builtin/worktree.c:124
msgid "do not remove, show only"
msgstr "не удалÑÑ‚ÑŒ, только показать ÑпиÑок"
-#: builtin/prune.c:106 builtin/worktree.c:122
+#: builtin/prune.c:106 builtin/worktree.c:125
msgid "report pruned objects"
msgstr "вывеÑти ÑпиÑок удаленных объектов"
-#: builtin/prune.c:109 builtin/worktree.c:124
+#: builtin/prune.c:109 builtin/worktree.c:127
msgid "expire objects older than <time>"
msgstr "удалить объекты Ñтарее чем <дата-окончаниÑ>"
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ð¾Ñ‡Ð¸Ñтить неиÑпользуемые объекты в precious-objects репозитории"
+
#: builtin/pull.c:69
-msgid "git pull [options] [<repository> [<refspec>...]]"
-msgstr "git pull [опции] [<репозиторий> [<ÑпецификациÑ-ÑÑылки>…]]"
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<опции>] [<репозиторий> [<ÑпецификациÑ-ÑÑылки>…]]"
#: builtin/pull.c:113
msgid "Options related to merging"
@@ -8405,25 +8461,25 @@ msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñлить неÑколько веток в пуÑтой у
msgid "Cannot rebase onto multiple branches."
msgstr "Ðевозможно перемеÑтить над неÑколькими ветками."
-#: builtin/push.c:15
+#: builtin/push.c:16
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<опции>] [<репозиторий> [<ÑпецификациÑ-ÑÑылки>…]]"
-#: builtin/push.c:86
+#: builtin/push.c:88
msgid "tag shorthand without <tag>"
msgstr "указано Ñокращение tag, но не указана Ñама <метка>"
-#: builtin/push.c:96
+#: builtin/push.c:98
msgid "--delete only accepts plain target ref names"
msgstr "Ð¾Ð¿Ñ†Ð¸Ñ --delete принимает только проÑтые целевые имена ÑÑылок"
-#: builtin/push.c:140
+#: builtin/push.c:142
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr "\nЧтобы выбрать любую из опций на поÑтоÑнной оÑнове, Ñмотрите push.default в «git help config»."
-#: builtin/push.c:143
+#: builtin/push.c:145
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -8438,7 +8494,7 @@ msgid ""
"%s"
msgstr "Ð˜Ð¼Ñ Ð²Ñ‹ÑˆÐµÑтоÑщей ветки и вашей текущей ветки различаютÑÑ. Чтобы отправить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² вышеÑтоÑщую ветку на внешнем репозитории, иÑпользуйте:\n\n git push %s HEAD:%s\n\nЧтобы отправить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² ветку Ñ Ñ‚Ð°ÐºÐ¸Ð¼ же именем на внешнем репозитории, иÑпользуйте:\n\n git push %s %s\n%s"
-#: builtin/push.c:158
+#: builtin/push.c:160
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -8448,7 +8504,7 @@ msgid ""
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ðµ находитеÑÑŒ ни на одной из веток.\nЧтобы отправить иÑторию, ведущую к текущему (отделенный HEAD) ÑоÑтоÑнию, иÑпользуйте\n\n git push %s HEAD:<имÑ-внешней-ветки>\n"
-#: builtin/push.c:172
+#: builtin/push.c:174
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -8457,13 +8513,13 @@ msgid ""
" git push --set-upstream %s %s\n"
msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° %s не имеет вышеÑтоÑщей ветки.\nЧтобы отправить текущую ветку и уÑтановить внешнюю ветку как вышеÑтоÑщую Ð´Ð»Ñ Ñтой ветки, иÑпользуйте\n\n git push --set-upstream %s %s\n"
-#: builtin/push.c:180
+#: builtin/push.c:182
#, c-format
msgid ""
"The current branch %s has multiple upstream branches, refusing to push."
msgstr "Ваша Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° %s имеет неÑколько вышеÑтоÑщих веток, отказ в отправке изменений."
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -8471,7 +8527,7 @@ msgid ""
"to update which remote branch."
msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»Ñете Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð° внешний репозиторий «%s», который не ÑвлÑетÑÑ Ð²Ñ‹ÑˆÐµÑтоÑщим Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ текущей ветки «%s», без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ñ‚Ð¾Ð³Ð¾, что отправлÑÑ‚ÑŒ и в какую внешнюю ветку."
-#: builtin/push.c:206
+#: builtin/push.c:208
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -8495,11 +8551,11 @@ msgid ""
"'current' instead of 'simple' if you sometimes use older versions of Git)"
msgstr "push.default не уÑтановлен; его неÑвное значение было изменено в Git верÑии 2.0 Ñ Â«matching» на «simple». Чтобы прекратить вывод Ñтого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸ Ñохранить Ñтарое поведение, иÑпользуйте:\n\n git config --global push.default matching\n\nЧтобы прекратить вывод Ñтого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸ иÑпользовать новое поведение, иÑпользуйте:\n\n git config --global push.default simple\n\nКогда push.default уÑтановлено в «matching», git будет отправлÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ñ… веток в ÑущеÑтвующие внешние ветки Ñ Ñ‚Ð°ÐºÐ¸Ð¼ же именем.\n\nÐÐ°Ñ‡Ð¸Ð½Ð°Ñ Ñ Git верÑии 2.0, по умолчанию иÑпользуетÑÑ Ð±Ð¾Ð»ÐµÐµ конÑервативное поведение «simple», которое отправлÑет Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ ветки в ÑоответÑтвующую внешнюю ветку, из которой «git pull» забирает изменениÑ.\n\nСмотрите «git help config» и ищите «push.default» Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации.\n(режим «simple» поÑвилÑÑ Ð² Git верÑии 1.7.11. ИÑпользуйте похожий режим «current» вмеÑто «simple», еÑли вы иногда иÑпользуете Ñтарые верÑии Git)"
-#: builtin/push.c:273
+#: builtin/push.c:275
msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "Ð’Ñ‹ не указали Ñпецификацию ÑÑылки Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸, а push.default указан как \"nothing\"."
+msgstr "Ð’Ñ‹ не указали Ñпецификацию ÑÑылки Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸, а push.default указан как «nothing»."
-#: builtin/push.c:280
+#: builtin/push.c:282
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -8507,7 +8563,7 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней чаÑти. Заберите и Ñлейте внешние Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ \n(например, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git pull …») перед повторной попыткой отправки\nизменений.\nÐ”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации Ñмотрите «Note about fast-forwards»\nв «git push --help»."
-#: builtin/push.c:286
+#: builtin/push.c:288
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -8515,7 +8571,7 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отклонены, так как верхушка отправлÑемой ветки\nпозади ее внешней чаÑти. ПереключитеÑÑŒ на ветку и заберите внешние\nÐ¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ (например, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git pull …») перед повторной\nпопыткой отправки изменений.\nÐ”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации Ñмотрите «Note about fast-forwards»\nв «git push --help»."
-#: builtin/push.c:292
+#: builtin/push.c:294
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -8524,33 +8580,33 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отклонены, так как внешний репозиторий Ñодержит\nизменениÑ, которых у Ð²Ð°Ñ Ð½ÐµÑ‚ в вашем локальном репозитории.\nОбычно, Ñто ÑвÑзанно Ñ Ñ‚ÐµÐ¼, что кто-то уже отправил Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² \nто же меÑто. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и Ñлить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð· внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ñебе\n(например, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git pull …»).\nÐ”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации Ñмотрите «Note about fast-forwards»\nв «git push --help»."
-#: builtin/push.c:299
+#: builtin/push.c:301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отклонены, так как метка уже ÑущеÑтвует во внешнем репозитории."
-#: builtin/push.c:302
+#: builtin/push.c:304
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr "Ð’Ñ‹ не можете обновить внешнюю ÑÑылку, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÑ‚ на объект, не ÑвлÑющийÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð¼ или обновить внешнюю ÑÑылку так, чтобы она указывала на объект, не ÑвлÑющийÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð¼, без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¾Ð¿Ñ†Ð¸Ð¸ «--force».\n"
-#: builtin/push.c:361
+#: builtin/push.c:363
#, c-format
msgid "Pushing to %s\n"
msgstr "Отправка в %s\n"
-#: builtin/push.c:365
+#: builtin/push.c:367
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "не удалоÑÑŒ отправить некоторые ÑÑылки в «%s»"
-#: builtin/push.c:395
+#: builtin/push.c:397
#, c-format
msgid "bad repository '%s'"
msgstr "плохой Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s»"
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote repository using\n"
@@ -8562,100 +8618,104 @@ msgid ""
" git push <name>\n"
msgstr "Ðе наÑтроена точка Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸.\nЛибо укажите URL Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ коммандной Ñтроки, либо наÑтройте внешний репозиторий Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ\n\n git remote add <имÑ> <адреÑ>\n\nа затем отправьте Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ имени внешнего репозиториÑ\n\n git push <имÑ>\n"
-#: builtin/push.c:411
+#: builtin/push.c:413
msgid "--all and --tags are incompatible"
msgstr "--all и --tags Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: builtin/push.c:412
+#: builtin/push.c:414
msgid "--all can't be combined with refspecs"
msgstr "--all Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать вмеÑте Ñо ÑпецификациÑми ÑÑылок"
-#: builtin/push.c:417
+#: builtin/push.c:419
msgid "--mirror and --tags are incompatible"
msgstr "--mirror и --tags Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: builtin/push.c:418
+#: builtin/push.c:420
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать вмеÑте Ñо ÑпецификациÑми ÑÑылок"
-#: builtin/push.c:423
+#: builtin/push.c:425
msgid "--all and --mirror are incompatible"
msgstr "--all и --mirror Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: builtin/push.c:539
+#: builtin/push.c:537
msgid "repository"
msgstr "репозиторий"
-#: builtin/push.c:540 builtin/send-pack.c:161
+#: builtin/push.c:538 builtin/send-pack.c:161
msgid "push all refs"
msgstr "отправить вÑе ÑÑылки"
-#: builtin/push.c:541 builtin/send-pack.c:163
+#: builtin/push.c:539 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "Ñделать зеркало вÑех ÑÑылок"
-#: builtin/push.c:543
+#: builtin/push.c:541
msgid "delete refs"
msgstr "удалить ÑÑылки"
-#: builtin/push.c:544
+#: builtin/push.c:542
msgid "push tags (can't be used with --all or --mirror)"
msgstr "отправить метки (Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать вмеÑте Ñ --all или --mirror)"
-#: builtin/push.c:547 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:164
msgid "force updates"
msgstr "принудительное обновление"
-#: builtin/push.c:549 builtin/send-pack.c:175
+#: builtin/push.c:547 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "имÑ-ÑÑылки>:<ожидаетÑÑ"
-#: builtin/push.c:550 builtin/send-pack.c:176
+#: builtin/push.c:548 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "требовать, чтобы Ñтарое значение ÑÑылки было ожидаемым"
-#: builtin/push.c:553
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr "check|on-demand|no"
+
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr "управление рекурÑивной отправкой подмодулей"
-#: builtin/push.c:555 builtin/send-pack.c:169
+#: builtin/push.c:553 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "иÑпользовать тонкие пакеты"
-#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
+#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "путь к программе упаковки на Ñервере"
-#: builtin/push.c:558
+#: builtin/push.c:556
msgid "set upstream for git pull/status"
msgstr "уÑтановить вышеÑтоÑщую ветку Ð´Ð»Ñ git pull/status"
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "prune locally removed refs"
msgstr "почиÑтить локально удаленные ÑÑылки"
-#: builtin/push.c:563
+#: builtin/push.c:561
msgid "bypass pre-push hook"
msgstr "пропуÑтить перехватчик перед-отправкой"
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "push missing but relevant tags"
msgstr "отправить пропущенные, но нужные метки"
-#: builtin/push.c:567 builtin/send-pack.c:166
+#: builtin/push.c:565 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "подпиÑать отправку Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG"
-#: builtin/push.c:569 builtin/send-pack.c:170
+#: builtin/push.c:567 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "запроÑить выполнение атомарной транзакции на внешней Ñтороне"
-#: builtin/push.c:579
+#: builtin/push.c:577
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete неÑовмеÑтимо Ñ --all, --mirror и --tags"
-#: builtin/push.c:581
+#: builtin/push.c:579
msgid "--delete doesn't make sense without any refs"
msgstr "--delete не имеет ÑмыÑла без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÑÑылок"
@@ -8730,12 +8790,12 @@ msgstr "пропуÑтить применение фильтра чаÑтичнÐ
msgid "debug unpack-trees"
msgstr "отладка unpack-trees"
-#: builtin/reflog.c:432
+#: builtin/reflog.c:428
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "«%s» Ð´Ð»Ñ Â«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимой меткой даты/времени"
-#: builtin/reflog.c:549 builtin/reflog.c:554
+#: builtin/reflog.c:545 builtin/reflog.c:550
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимой меткой даты/времени"
@@ -8750,15 +8810,15 @@ msgid ""
"[--mirror=<fetch|push>] <name> <url>"
msgstr "git remote add [-t <ветка>] [-m <маÑтер-ветка>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <имÑ> <адреÑ>"
-#: builtin/remote.c:14 builtin/remote.c:33
+#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
msgstr "git remote rename <Ñтарое-название> <новое-название>"
-#: builtin/remote.c:15 builtin/remote.c:38
+#: builtin/remote.c:15 builtin/remote.c:39
msgid "git remote remove <name>"
msgstr "git remote remove <имÑ>"
-#: builtin/remote.c:16 builtin/remote.c:43
+#: builtin/remote.c:16 builtin/remote.c:44
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <имÑ> (-a | --auto | -d | --delete | <ветка>)"
@@ -8779,143 +8839,147 @@ msgstr "git remote [-v | --verbose] update [-p | --prune] [(<группа> | <и
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <имÑ> <ветка>…"
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <имÑ>"
+
+#: builtin/remote.c:22 builtin/remote.c:75
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <имÑ> <новый-url> [<Ñтарый-url>]"
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <имÑ> <новый-url>"
-#: builtin/remote.c:23 builtin/remote.c:71
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <имÑ> <url>"
-#: builtin/remote.c:28
+#: builtin/remote.c:29
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<опции>] <имÑ> <url>"
-#: builtin/remote.c:48
+#: builtin/remote.c:49
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <имÑ> <ветка>…"
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <имÑ> <ветка>…"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<опции>] <имÑ>"
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<опции>] <имÑ>"
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<опции>] [<группа> | <имÑ-внешнего-репозиториÑ>]…"
-#: builtin/remote.c:88
+#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
msgstr "Обновление %s"
-#: builtin/remote.c:120
+#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr "ключ --mirror небезопаÑен и не рекомендуетÑÑ Ðº иÑпользованию;\nиÑпользуйте вмеÑто него --mirror=fetch или --mirror=push"
-#: builtin/remote.c:137
+#: builtin/remote.c:143
#, c-format
msgid "unknown mirror argument: %s"
msgstr "неизвеÑтный аргумент Ð´Ð»Ñ mirror: %s"
-#: builtin/remote.c:153
+#: builtin/remote.c:159
msgid "fetch the remote branches"
msgstr "извлечь внешние ветки"
-#: builtin/remote.c:155
+#: builtin/remote.c:161
msgid "import all tags and associated objects when fetching"
msgstr "импортировать вÑе метки и аÑÑоциированные объекты при извлечении"
-#: builtin/remote.c:158
+#: builtin/remote.c:164
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "или не извлекать метки вообще (--no-tags)"
-#: builtin/remote.c:160
+#: builtin/remote.c:166
msgid "branch(es) to track"
msgstr "отÑлеживаемые ветки"
-#: builtin/remote.c:161
+#: builtin/remote.c:167
msgid "master branch"
msgstr "маÑтер ветка"
-#: builtin/remote.c:162
+#: builtin/remote.c:168
msgid "push|fetch"
msgstr "push|fetch"
-#: builtin/remote.c:163
+#: builtin/remote.c:169
msgid "set up remote as a mirror to push to or fetch from"
msgstr "наÑтроить внешний репозиторий как зеркало Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ или Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
-#: builtin/remote.c:175
+#: builtin/remote.c:181
msgid "specifying a master branch makes no sense with --mirror"
msgstr "указание маÑтер ветки не имеет ÑмыÑла Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --mirror"
-#: builtin/remote.c:177
+#: builtin/remote.c:183
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "указание отÑлеживаемых веток имеет ÑмыÑл только при зеркальном извлечении"
-#: builtin/remote.c:187 builtin/remote.c:637
+#: builtin/remote.c:193 builtin/remote.c:643
#, c-format
msgid "remote %s already exists."
msgstr "внешний репозиторий %s уже ÑущеÑтвует"
-#: builtin/remote.c:191 builtin/remote.c:641
+#: builtin/remote.c:197 builtin/remote.c:647
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым именем внешнего репозиториÑ."
-#: builtin/remote.c:235
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "Ðе удалоÑÑŒ наÑтроить маÑтер ветку «%s»"
-#: builtin/remote.c:335
+#: builtin/remote.c:341
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Ðе удалоÑÑŒ извлечь карту Ð´Ð»Ñ Ñпецификации ÑÑылки %s"
-#: builtin/remote.c:436 builtin/remote.c:444
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr "(ÑоответÑтвующаÑ)"
-#: builtin/remote.c:448
+#: builtin/remote.c:454
msgid "(delete)"
msgstr "(удаленнаÑ)"
-#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "Ðе удалоÑÑŒ добавить «%s» к «%s»"
-#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
#, c-format
msgid "No such remote: %s"
msgstr "Ðет такого внешнего репозиториÑ: %s"
-#: builtin/remote.c:647
+#: builtin/remote.c:653
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Ðе удалоÑÑŒ переименовать Ñекцию конфигурации Ñ Â«%s» на «%s»"
-#: builtin/remote.c:653 builtin/remote.c:821
+#: builtin/remote.c:659 builtin/remote.c:827
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Ðе удалоÑÑŒ удалить Ñекцию файла конфигурации «%s»"
-#: builtin/remote.c:668
+#: builtin/remote.c:674
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -8923,27 +8987,27 @@ msgid ""
"\tPlease update the configuration manually if necessary."
msgstr "Ðе обновлÑÑŽ неÑтандартную Ñпецификацию ÑÑылки Ð´Ð»Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ\n\t%s\n\tПожалуйÑта, еÑли требуетÑÑ, обновите конфигурацию вручную."
-#: builtin/remote.c:674
+#: builtin/remote.c:680
#, c-format
msgid "Could not append '%s'"
msgstr "Ðе удалоÑÑŒ добавить «%s»"
-#: builtin/remote.c:685
+#: builtin/remote.c:691
#, c-format
msgid "Could not set '%s'"
msgstr "Ðе удалоÑÑŒ уÑтановить «%s»"
-#: builtin/remote.c:707
+#: builtin/remote.c:713
#, c-format
msgid "deleting '%s' failed"
msgstr "не удалоÑÑŒ удалить «%s»"
-#: builtin/remote.c:741
+#: builtin/remote.c:747
#, c-format
msgid "creating '%s' failed"
msgstr "не удалоÑÑŒ Ñоздать «%s»"
-#: builtin/remote.c:807
+#: builtin/remote.c:813
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -8955,125 +9019,125 @@ msgstr[1] "Примечание: Ðекоторые ветки вне иерар
msgstr[2] "Примечание: Ðекоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, иÑпользуйте:"
msgstr[3] "Примечание: Ðекоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, иÑпользуйте:"
-#: builtin/remote.c:922
+#: builtin/remote.c:928
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " Ð½Ð¾Ð²Ð°Ñ (Ñледующее извлечение Ñохранит ее в remotes/%s)"
-#: builtin/remote.c:925
+#: builtin/remote.c:931
msgid " tracked"
msgstr " отÑлеживаетÑÑ"
-#: builtin/remote.c:927
+#: builtin/remote.c:933
msgid " stale (use 'git remote prune' to remove)"
msgstr " недейÑтвительна (иÑпользуйте «git remote prune», чтобы удалить)"
-#: builtin/remote.c:929
+#: builtin/remote.c:935
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:970
+#: builtin/remote.c:976
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно перемеÑтить более чем над 1 веткой"
-#: builtin/remote.c:977
+#: builtin/remote.c:983
#, c-format
msgid "rebases onto remote %s"
msgstr "будет перемещена над внешней веткой %s"
-#: builtin/remote.c:980
+#: builtin/remote.c:986
#, c-format
msgid " merges with remote %s"
msgstr " будет Ñлита Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ веткой %s"
-#: builtin/remote.c:981
+#: builtin/remote.c:987
msgid " and with remote"
msgstr " и Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ веткой"
-#: builtin/remote.c:983
+#: builtin/remote.c:989
#, c-format
msgid "merges with remote %s"
msgstr "будет Ñлита Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ веткой %s"
-#: builtin/remote.c:984
+#: builtin/remote.c:990
msgid " and with remote"
msgstr " и Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ веткой"
-#: builtin/remote.c:1030
+#: builtin/remote.c:1036
msgid "create"
msgstr "Ñоздана"
-#: builtin/remote.c:1033
+#: builtin/remote.c:1039
msgid "delete"
msgstr "удалена"
-#: builtin/remote.c:1037
+#: builtin/remote.c:1043
msgid "up to date"
msgstr "уже актуальна"
-#: builtin/remote.c:1040
+#: builtin/remote.c:1046
msgid "fast-forwardable"
msgstr "возможна перемотка вперед"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1049
msgid "local out of date"
msgstr "Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ‚ÐºÐ° уÑтарела"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s будет принудительно отправлена в %-*s (%s)"
-#: builtin/remote.c:1053
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s будет отправлена в %-*s (%s)"
-#: builtin/remote.c:1057
+#: builtin/remote.c:1063
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s будет принудительно отправлена в %s"
-#: builtin/remote.c:1060
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s будет отправлена в %s"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
msgid "do not query remotes"
msgstr "не опрашивать внешние репозитории"
-#: builtin/remote.c:1155
+#: builtin/remote.c:1161
#, c-format
msgid "* remote %s"
msgstr "* внешний репозиторий %s"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1162
#, c-format
msgid " Fetch URL: %s"
msgstr " URL Ð´Ð»Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ: %s"
-#: builtin/remote.c:1157 builtin/remote.c:1308
+#: builtin/remote.c:1163 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(нет URL)"
-#: builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr " URL Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s"
-#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD ветка: %s"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1182
#, c-format
msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD ветка (HEAD внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°Ñ‡Ð½Ñ‹Ð¹, может быть одним из):\n"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -9082,11 +9146,11 @@ msgstr[1] " Внешние ветки:%s"
msgstr[2] " Внешние ветки:%s"
msgstr[3] " Внешние ветки:%s"
-#: builtin/remote.c:1191 builtin/remote.c:1218
+#: builtin/remote.c:1197 builtin/remote.c:1224
msgid " (status not queried)"
msgstr " (ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ запрошен)"
-#: builtin/remote.c:1200
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ‚ÐºÐ°, наÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ð°Ñ Ð´Ð»Ñ Â«git pull»:"
@@ -9094,11 +9158,11 @@ msgstr[1] " Локальные ветки, наÑтроенные Ð´Ð»Ñ Â«git
msgstr[2] " Локальные ветки, наÑтроенные Ð´Ð»Ñ Â«git pull»:"
msgstr[3] " Локальные ветки, наÑтроенные Ð´Ð»Ñ Â«git pull»:"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локальные ÑÑылки, зеркалируемые Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git push»"
-#: builtin/remote.c:1215
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
@@ -9107,115 +9171,128 @@ msgstr[1] " Локальные ÑÑылки, наÑтроенные Ð´Ð»Ñ Â«gi
msgstr[2] " Локальные ÑÑылки, наÑтроенные Ð´Ð»Ñ Â«git push»%s:"
msgstr[3] " Локальные ÑÑылки, наÑтроенные Ð´Ð»Ñ Â«git push»%s:"
-#: builtin/remote.c:1236
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "уÑтановить refs/remotes/<имÑ>/HEAD в завиÑимоÑти от внешнего репозиториÑ"
-#: builtin/remote.c:1238
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "удалить refs/remotes/<имÑ>/HEAD"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "Ðе удалоÑÑŒ определить внешний HEAD"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "ÐеÑколько внешних HEAD веток. Укажите Ñвно одну из них:"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "Ðе удалоÑÑŒ удалить %s"
-#: builtin/remote.c:1273
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑÑылка: %s"
-#: builtin/remote.c:1275
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "Ðе удалоÑÑŒ наÑтроить %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s будет виÑÑщей веткой!"
-#: builtin/remote.c:1294
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s Ñтала виÑÑщей веткой!"
-#: builtin/remote.c:1304
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "Удаление %s"
-#: builtin/remote.c:1305
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1321
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [будет удалена] %s"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [удалена] %s"
-#: builtin/remote.c:1369
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "почиÑтить внешние репозитории поÑле извлечениÑ"
-#: builtin/remote.c:1435 builtin/remote.c:1509
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
#, c-format
msgid "No such remote '%s'"
msgstr "Ðет такого внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s»"
-#: builtin/remote.c:1455
+#: builtin/remote.c:1461
msgid "add branch"
msgstr "добавить ветку"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1468
msgid "no remote specified"
msgstr "не указан внешний репозиторий"
-#: builtin/remote.c:1484
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr "запроÑить URL отправки, вмеÑто URL извлечениÑ"
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr "вернуть вÑе URL"
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "URL не наÑтроены Ð´Ð»Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ³Ð¾ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s»"
+
+#: builtin/remote.c:1541
msgid "manipulate push URLs"
msgstr "управление URL отправки"
-#: builtin/remote.c:1486
+#: builtin/remote.c:1543
msgid "add URL"
msgstr "добавить URL"
-#: builtin/remote.c:1488
+#: builtin/remote.c:1545
msgid "delete URLs"
msgstr "удалить URL"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1552
msgid "--add --delete doesn't make sense"
msgstr "--add Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --delete"
-#: builtin/remote.c:1535
+#: builtin/remote.c:1592
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Ðеправильный шаблон Ñтарого URL: %s"
-#: builtin/remote.c:1543
+#: builtin/remote.c:1600
#, c-format
msgid "No such URL found: %s"
msgstr "Ðе найдены ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ URL: %s"
-#: builtin/remote.c:1545
+#: builtin/remote.c:1602
msgid "Will not delete all non-push URLs"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ вÑе URL не-отправки"
-#: builtin/remote.c:1559
+#: builtin/remote.c:1616
msgid "be verbose; must be placed before a subcommand"
msgstr "быть многоÑловнее; должно ÑтоÑÑ‚ÑŒ перед подкомандой"
@@ -9287,7 +9364,11 @@ msgstr "макÑимальный размер каждого из файлов Ð
msgid "repack objects in packs marked with .keep"
msgstr "переупаковать объекты в пакеты, помеченные файлом .keep"
-#: builtin/repack.c:378
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»ÑÑ‚ÑŒ пакеты в precious-objects репозитории"
+
+#: builtin/repack.c:381
#, c-format
msgid "removing '%s' failed"
msgstr "не удалоÑÑŒ удалить «%s»"
@@ -9380,7 +9461,7 @@ msgstr "иÑпользовать Ñтот формат"
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget <путь>… | status | remaining | diff | gc]"
-#: builtin/rerere.c:57
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "запиÑать чиÑтые Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð² в индекÑ"
@@ -9513,23 +9594,23 @@ msgstr "Ðе удалоÑÑŒ запиÑать новый файл индекÑа.
msgid "rev-list does not support display of notes"
msgstr "rev-list не поддерживает отображение заметок"
-#: builtin/rev-parse.c:361
+#: builtin/rev-parse.c:358
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]"
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
msgstr "передавать далее «--» как аргумент"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
msgstr "оÑтановить разбор поÑле первого аргумента не ÑвлÑющегоÑÑ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹"
-#: builtin/rev-parse.c:371
+#: builtin/rev-parse.c:368
msgid "output in stuck long form"
msgstr "выводить аргументы в длинном формате"
-#: builtin/rev-parse.c:502
+#: builtin/rev-parse.c:499
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -9770,79 +9851,79 @@ msgstr "w[,i1[,i2]]"
msgid "Linewrap output"
msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок на выводе"
-#: builtin/show-branch.c:9
+#: builtin/show-branch.c:10
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
-msgstr "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n\t\t[--current] [--color[=<когда>] | --no-color] [--sparse]\n\t\t[--more=<n> | --list | --independent | --merge-base]\n\t\t[--no-name | --sha1-name] [--topics] [(<редакциÑ> | <шаблон>)...]"
+msgstr "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n\t\t[--current] [--color[=<когда>] | --no-color] [--sparse]\n\t\t[--more=<n> | --list | --independent | --merge-base]\n\t\t[--no-name | --sha1-name] [--topics] [(<редакциÑ> | <шаблон>)…]"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<база>]] [--list] [<ÑÑылка>]"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
msgstr "показать ÑпиÑок и отÑлеживаемых внешних и локальных веток"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
msgstr "показать ÑпиÑок отÑлеживаемых внешних веток"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
msgstr "окрашивать «*!+-» в ÑоответÑтвии Ñ Ð²ÐµÑ‚ÐºÐ¾Ð¹"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:646
msgid "show <n> more commits after the common ancestor"
msgstr "показать <n> коммитов поÑле общего предка"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:648
msgid "synonym to more=-1"
msgstr "Ñиноним Ð´Ð»Ñ more=-1"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:649
msgid "suppress naming strings"
msgstr "не выводить именованые Ñтроки"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:651
msgid "include the current branch"
msgstr "включить в вывод текущую ветку"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:653
msgid "name commits with their object names"
msgstr "именовать коммиты их именами объектов"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:655
msgid "show possible merge bases"
msgstr "вывеÑти возможные базы ÑлиÑниÑ"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
msgstr "вывеÑти ÑÑылки, недоÑтупные из любых других ÑÑылок"
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:659
msgid "show commits in topological order"
msgstr "вывеÑти коммиты в топологичеÑком порÑдке"
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:662
msgid "show only commits not on the first branch"
msgstr "вывеÑти только коммиты, отÑуцтвующие в первой ветке"
-#: builtin/show-branch.c:683
+#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
msgstr "вывеÑти ÑлиÑниÑ, доÑтижимые только из одной из верхушек"
-#: builtin/show-branch.c:685
+#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
msgstr "топологичеÑÐºÐ°Ñ Ñортировка, Ñ Ñохранением порÑдка дат, еÑли возможно"
-#: builtin/show-branch.c:688
+#: builtin/show-branch.c:669
msgid "<n>[,<base>]"
msgstr "<n>[,<база>]"
-#: builtin/show-branch.c:689
+#: builtin/show-branch.c:670
msgid "show <n> most recent ref-log entries starting at base"
msgstr "показать <n> поÑледних запиÑей в журнале ÑÑылок, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ Ð±Ð°Ð·Ñ‹"
@@ -9853,41 +9934,132 @@ msgid ""
msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<шаблон>…]"
#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"
-msgstr "git show-ref --exclude-existing[=<шаблон>] < <ÑпиÑок-ÑÑылок>"
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<шаблон>]"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
msgstr "вывеÑти только метки (можно иÑпользовать одновременно Ñ --heads)"
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
msgstr "вывеÑти только головы (можно иÑпользовать одновременно Ñ --tags)"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
msgstr "более ÑÑ‚Ñ€Ð¾Ð³Ð°Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ° ÑÑылок, требует точный путь ÑÑылки"
-#: builtin/show-ref.c:175 builtin/show-ref.c:177
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "вывеÑти ÑÑылку HEAD, даже еÑли она будет отфильтрована"
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:174
msgid "dereference tags into object IDs"
msgstr "разыменовать метки в идентификаторы объектов"
-#: builtin/show-ref.c:181
+#: builtin/show-ref.c:176
msgid "only show SHA1 hash using <n> digits"
msgstr "иÑпользовать <n> цифр Ð´Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð° SHA-1"
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:180
msgid "do not print results to stdout (useful with --verify)"
msgstr "не печатать результат на Ñтандартный вывод (полезно Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ «--verify»)"
-#: builtin/show-ref.c:187
+#: builtin/show-ref.c:182
msgid "show refs from stdin that aren't in local repository"
msgstr "вывеÑти ÑÑылки Ñо Ñтандартного ввода, которых нет в локальном репозитории"
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr "пропуÑтить и удалить вÑе Ñтроки, начинающиеÑÑ Ñ Ñимвола комметариÑ"
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr "добавить Ñпереди вÑе Ñтрок Ñимвол ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ñ Ð¸ пробел"
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr "альтернативный Ñимвол Ð´Ð»Ñ Ð¾Ñ‚Ð½Ð¾Ñительных путей"
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]"
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <путь>"
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "не найдено ÑоответÑтвие подмодулей в .gitmodules Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «%s»"
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr "куда должен быть Ñклонирован новый подмодуль"
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr "Ð¸Ð¼Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ подмодулÑ"
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr "url откуда должен был Ñклонирован новый подмодуль"
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr "глубина Ð´Ð»Ñ Ñ‡Ð°Ñтичного клона"
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] "
+"[<path>...]"
+msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имÑ>] [--url <url>][--depth <глубина>] [--] [<путь>…]"
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "не удалоÑÑŒ Ñоздать каталог «%s»"
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "не удалоÑÑŒ клонировать «%s» в подмодуль по пути «%s»"
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr "не удалоÑÑŒ открыть файл «%s»"
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr "не удалоÑÑŒ закрыть файл %s"
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "не удалоÑÑŒ получить каталог Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«%s»"
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: подкоманда submodule--helper должна вызыватьÑÑ Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ подкоманды"
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: «%s» не ÑвлÑетÑÑ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ submodule--helper"
+
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<опции>] <имÑ> [<ÑÑылка>]"
@@ -9916,52 +10088,47 @@ msgstr "причина"
msgid "reason of the update"
msgstr "причина обновлениÑ"
-#: builtin/tag.c:22
+#: builtin/tag.c:23
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
msgstr "git tag [-a | -s | -u <идентификатор-ключа>] [-f] [-m <Ñообщение> | -F <файл>] <имÑ-метки> [<редакциÑ>]"
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid "git tag -d <tagname>..."
msgstr "git tag -d <имÑ-метки>…"
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[<pattern>...]"
-msgstr "git tag -l [-n[<количеÑтво>]] [--contains <коммит>] [--points-at <объект>]\n\t\t[<шаблон>…]"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+msgstr "git tag -l [-n[<количеÑтво>]] [--contains <коммит>] [--points-at <объект>]\n\t\t[--format=<формат>] [--[no-]merged [<коммит>]] [<шаблон>…]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -v <tagname>..."
msgstr "git tag -v <имÑ-метки>…"
-#: builtin/tag.c:69
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "Поврежденный объект «%s»"
-
-#: builtin/tag.c:301
+#: builtin/tag.c:80
#, c-format
msgid "tag name too long: %.*s..."
msgstr "Ñлишком длинное Ð¸Ð¼Ñ Ð¼ÐµÑ‚ÐºÐ¸: %.*s…"
-#: builtin/tag.c:306
+#: builtin/tag.c:85
#, c-format
msgid "tag '%s' not found."
msgstr "метка «%s» не найдена."
-#: builtin/tag.c:321
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Метка «%s» удалена (была %s)\n"
-#: builtin/tag.c:333
+#: builtin/tag.c:112
#, c-format
msgid "could not verify the tag '%s'"
msgstr "не удалоÑÑŒ проверить метку «%s»"
-#: builtin/tag.c:343
+#: builtin/tag.c:122
#, c-format
msgid ""
"\n"
@@ -9970,7 +10137,7 @@ msgid ""
"Lines starting with '%c' will be ignored.\n"
msgstr "\nВведите Ñообщение Ð´Ð»Ñ Ð¼ÐµÑ‚ÐºÐ¸:\n %s\nСтроки, начинающиеÑÑ Ñ Â«%c» будут проигнорированы.\n"
-#: builtin/tag.c:347
+#: builtin/tag.c:126
#, c-format
msgid ""
"\n"
@@ -9979,153 +10146,138 @@ msgid ""
"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
msgstr "\nВведите Ñообщение Ð´Ð»Ñ Ð¼ÐµÑ‚ÐºÐ¸:\n %s\nСтроки, начинающиеÑÑ Ñ Â«%c» будут оÑтавлены; вы можете удалить их вручную, еÑли хотите.\n"
-#: builtin/tag.c:371
-#, c-format
-msgid "unsupported sort specification '%s'"
-msgstr "неподдерживаемый ÑпоÑоб Ñортировки «%s»"
-
-#: builtin/tag.c:373
-#, c-format
-msgid "unsupported sort specification '%s' in variable '%s'"
-msgstr "неподдерживаемый ÑпоÑоб Ñортировки «%s» в переменной «%s»"
-
-#: builtin/tag.c:428
+#: builtin/tag.c:199
msgid "unable to sign the tag"
msgstr "не удалоÑÑŒ подпиÑать метку"
-#: builtin/tag.c:430
+#: builtin/tag.c:201
msgid "unable to write tag file"
msgstr "не удалоÑÑŒ запиÑать файл метки"
-#: builtin/tag.c:455
+#: builtin/tag.c:226
msgid "bad object type."
msgstr "неправильный тип объекта"
-#: builtin/tag.c:468
+#: builtin/tag.c:239
msgid "tag header too big."
msgstr "заголовок метки Ñлишком большой."
-#: builtin/tag.c:504
+#: builtin/tag.c:275
msgid "no tag message?"
msgstr "нет опиÑÐ°Ð½Ð¸Ñ Ð¼ÐµÑ‚ÐºÐ¸?"
-#: builtin/tag.c:510
+#: builtin/tag.c:281
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Сообщение метки было оÑтавлено в %s\n"
-#: builtin/tag.c:559
-msgid "switch 'points-at' requires an object"
-msgstr "при указании параметра «points-at» требуетÑÑ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ объект"
-
-#: builtin/tag.c:561
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "Поврежденное Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° «%s»"
-
-#: builtin/tag.c:590
+#: builtin/tag.c:339
msgid "list tag names"
msgstr "ÑпиÑок названий меток"
-#: builtin/tag.c:592
+#: builtin/tag.c:341
msgid "print <n> lines of each tag message"
msgstr "печатать <n> Ñтрок опиÑÐ°Ð½Ð¸Ñ Ð¾Ñ‚ каждой метки"
-#: builtin/tag.c:594
+#: builtin/tag.c:343
msgid "delete tags"
msgstr "удалить метки"
-#: builtin/tag.c:595
+#: builtin/tag.c:344
msgid "verify tags"
msgstr "проверить метки"
-#: builtin/tag.c:597
+#: builtin/tag.c:346
msgid "Tag creation options"
msgstr "ÐаÑтройки ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¼ÐµÑ‚ÐºÐ¸"
-#: builtin/tag.c:599
+#: builtin/tag.c:348
msgid "annotated tag, needs a message"
msgstr "Ð´Ð»Ñ Ð°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ð¹ метки нужно Ñообщение"
-#: builtin/tag.c:601
+#: builtin/tag.c:350
msgid "tag message"
msgstr "опиÑание метки"
-#: builtin/tag.c:603
+#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
msgstr "Ð°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¸ подпиÑÐ°Ð½Ð½Ð°Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG метка"
-#: builtin/tag.c:607
+#: builtin/tag.c:356
msgid "use another key to sign the tag"
msgstr "иÑпользовать другой ключ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ Ð¼ÐµÑ‚ÐºÐ¸"
-#: builtin/tag.c:608
+#: builtin/tag.c:357
msgid "replace the tag if exists"
msgstr "замена метки, еÑли она ÑущеÑтвует"
-#: builtin/tag.c:609 builtin/update-ref.c:368
+#: builtin/tag.c:358 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "Ñоздать журнал ÑÑылок"
-#: builtin/tag.c:611
+#: builtin/tag.c:360
msgid "Tag listing options"
msgstr "ÐаÑтройки вывода ÑпиÑка меток"
-#: builtin/tag.c:612
+#: builtin/tag.c:361
msgid "show tag list in columns"
msgstr "показать ÑпиÑок меток по Ñтолбцам"
-#: builtin/tag.c:614
-msgid "sort tags"
-msgstr "отÑортировать метки"
-
-#: builtin/tag.c:619 builtin/tag.c:625
+#: builtin/tag.c:362 builtin/tag.c:363
msgid "print only tags that contain the commit"
msgstr "вывод только меток, которые Ñодержат коммит"
-#: builtin/tag.c:631
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
+msgstr "вывод только Ñлитых меток"
+
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
+msgstr "вывод только не Ñлитых меток"
+
+#: builtin/tag.c:370
msgid "print only tags of the object"
msgstr "вывод только меток, определенного объекта"
-#: builtin/tag.c:657
+#: builtin/tag.c:399
msgid "--column and -n are incompatible"
msgstr "--column и -n Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: builtin/tag.c:669
-msgid "--sort and -n are incompatible"
-msgstr "--sort и -n Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-
-#: builtin/tag.c:676
+#: builtin/tag.c:419
msgid "-n option is only allowed with -l."
msgstr "опцию -n можно иÑпользовать только вмеÑте Ñ -l."
-#: builtin/tag.c:678
+#: builtin/tag.c:421
msgid "--contains option is only allowed with -l."
msgstr "опцию --contains можно иÑпользовать только вмеÑте Ñ -l."
-#: builtin/tag.c:680
+#: builtin/tag.c:423
msgid "--points-at option is only allowed with -l."
msgstr "опцию --points-at можно иÑпользовать только вмеÑте Ñ -l."
-#: builtin/tag.c:688
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr "опции --merged и --no-merged можно иÑпользовать только вмеÑте Ñ -l."
+
+#: builtin/tag.c:433
msgid "only one -F or -m option is allowed."
msgstr "-F и -m Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно."
-#: builtin/tag.c:708
+#: builtin/tag.c:453
msgid "too many params"
msgstr "передано Ñлишком много параметров"
-#: builtin/tag.c:714
+#: builtin/tag.c:459
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым именем метки."
-#: builtin/tag.c:719
+#: builtin/tag.c:464
#, c-format
msgid "tag '%s' already exists"
msgstr "метка «%s» уже ÑущеÑтвует"
-#: builtin/tag.c:744
+#: builtin/tag.c:489
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Метка «%s» обновлена (была %s)\n"
@@ -10246,7 +10398,7 @@ msgstr "переопределить бит Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð½Ð° указа
#: builtin/update-index.c:951
msgid "mark files as \"not changing\""
-msgstr "пометить файлы как \"не измененные\""
+msgstr "пометить файлы как «не измененные»"
#: builtin/update-index.c:954
msgid "clear assumed-unchanged bit"
@@ -10254,7 +10406,7 @@ msgstr "убрать пометку assumed-unchanged"
#: builtin/update-index.c:957
msgid "mark files as \"index-only\""
-msgstr "пометить файлы как \"только в индекÑе\""
+msgstr "пометить файлы как «только в индекÑе»"
#: builtin/update-index.c:960
msgid "clear skip-worktree bit"
@@ -10384,76 +10536,80 @@ msgstr "git verify-tag [-v | --verbose] <метка>…"
msgid "print tag contents"
msgstr "вывеÑти Ñодержимое метки"
-#: builtin/worktree.c:13
-msgid "git worktree add [<options>] <path> <branch>"
-msgstr "git worktree add [<опции>] <путь> <ветка>"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<опции>] <путь> [<ветка>]"
-#: builtin/worktree.c:14
+#: builtin/worktree.c:16
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<опции>]"
-#: builtin/worktree.c:36
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<опции>]"
+
+#: builtin/worktree.c:39
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Удаление рабочих каталогов/%s: не ÑвлÑетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:45
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Удаление рабочих каталогов/%s: файл gitdir не ÑущеÑтвует"
-#: builtin/worktree.c:47
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Удаление рабочих каталогов/%s: не удалоÑÑŒ прочитать файл gitdir (%s)"
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Удаление рабочих каталогов/%s: недейÑтвительный файл gitdir"
-#: builtin/worktree.c:74
+#: builtin/worktree.c:77
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Удаление рабочих каталогов/%s: gitdir указывает на неÑущеÑтвующее раÑположение"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:112
#, c-format
msgid "failed to remove: %s"
msgstr "не удалоÑÑŒ удалить: %s"
-#: builtin/worktree.c:198
+#: builtin/worktree.c:201
#, c-format
msgid "'%s' already exists"
msgstr "«%s» уже ÑущеÑтвует"
-#: builtin/worktree.c:232
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "не удалоÑÑŒ Ñоздать каталог «%s»"
-#: builtin/worktree.c:268
+#: builtin/worktree.c:271
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Подготовка %s (идентификатор %s)"
-#: builtin/worktree.c:316
+#: builtin/worktree.c:319
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "перейти на <ветка> даже еÑли она уже активна в другом рабочеÑм каталоге"
-#: builtin/worktree.c:318
+#: builtin/worktree.c:321
msgid "create a new branch"
msgstr "Ñоздать новую ветку"
-#: builtin/worktree.c:320
+#: builtin/worktree.c:323
msgid "create or reset a branch"
msgstr "Ñоздать или перейти на ветку"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:324
msgid "detach HEAD at named commit"
msgstr "отÑоединить HEAD на указанном коммите"
-#: builtin/worktree.c:328
+#: builtin/worktree.c:331
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B и --detach Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
@@ -10596,86 +10752,86 @@ msgstr "дата-окончаниÑ"
msgid "no-op (backward compatibility)"
msgstr "ничего не делает (оÑтавлено Ð´Ð»Ñ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾Ð¹ ÑовмеÑтимоÑти)"
-#: parse-options.h:236
+#: parse-options.h:237
msgid "be more verbose"
msgstr "быть многоÑловнее"
-#: parse-options.h:238
+#: parse-options.h:239
msgid "be more quiet"
msgstr "тихий режим"
-#: parse-options.h:244
+#: parse-options.h:245
msgid "use <n> digits to display SHA-1s"
msgstr "иÑпользовать <n> цифр Ð´Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð° SHA-1"
-#: rerere.h:28
+#: rerere.h:38
msgid "update the index with reused conflict resolution if possible"
msgstr "обновить Ð¸Ð½Ð´ÐµÐºÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ переиÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð°, еÑли возможно"
-#: git-bisect.sh:50
+#: git-bisect.sh:55
msgid "You need to start by \"git bisect start\""
msgstr "Вам нужно начать Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git bisect start»"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:56
+#: git-bisect.sh:61
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Ð’Ñ‹ уверены, что хотите, чтобы Ñ Ñделал Ñто [Y - да/n - нет]? "
-#: git-bisect.sh:99
+#: git-bisect.sh:122
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ: «$arg»"
-#: git-bisect.sh:103
+#: git-bisect.sh:126
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "«$arg» не похоже на дейÑтвительную редакцию"
-#: git-bisect.sh:132
+#: git-bisect.sh:155
msgid "Bad HEAD - I need a HEAD"
msgstr "Плохой указатель HEAD — Ðеобходим указатель HEAD"
-#: git-bisect.sh:145
+#: git-bisect.sh:168
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr "Сбой перехода на «$start_head». Попробуйте выполнить «git bisect reset <ÑущеÑтвующаÑ-ветка>»."
-#: git-bisect.sh:155
+#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ двоичный поиÑк на дереве поÑле cg-seek"
-#: git-bisect.sh:159
+#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
msgstr "Плохой указатель HEAD — ÑÑ‚Ñ€Ð°Ð½Ð½Ð°Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑŒÐ½Ð°Ñ ÑÑылка"
-#: git-bisect.sh:211
+#: git-bisect.sh:234
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Плохой аргумент bisect_write: $state"
-#: git-bisect.sh:240
+#: git-bisect.sh:263
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Плохой ввод номера редакции: $arg"
-#: git-bisect.sh:255
+#: git-bisect.sh:278
msgid "Please call 'bisect_state' with at least one argument."
msgstr "ПожалуйÑта, вызывайте «bisect_state» как минимум Ñ Ð¾Ð´Ð½Ð¸Ð¼ аргументом."
-#: git-bisect.sh:267
+#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Плохой ввод номера редакции: $rev"
-#: git-bisect.sh:276
+#: git-bisect.sh:299
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "«git bisect $TERM_BAD» может принимать только один аргумент."
-#: git-bisect.sh:299
+#: git-bisect.sh:322
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "Предупреждение: попытка двоичного поиÑка Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ только $TERM_BAD коммита."
@@ -10683,18 +10839,18 @@ msgstr "Предупреждение: попытка двоичного поиÑ
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:305
+#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
msgstr "Вы уверены [Y - да/n - нет]? "
-#: git-bisect.sh:317
+#: git-bisect.sh:340
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr "Вам нужно передать мне как минимум одну $bad_syn и одну $good_syn редакцию.\n(Ð”Ð»Ñ Ñтого вы можете иÑпользовать команды «git bisect $bad_syn» и «git bisect $good_syn».)"
-#: git-bisect.sh:320
+#: git-bisect.sh:343
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10702,67 +10858,97 @@ msgid ""
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr "Ð”Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° нужно запуÑтить «git bisect start».\nПоÑле Ñтого, вам нужно передать мне как минимум одну $good_syn и одну $bad_syn редакцию.\n(Ð”Ð»Ñ Ñтого вы можете иÑпользовать команды «git bisect $good_syn» и «git bisect $good_syn».)"
-#: git-bisect.sh:391 git-bisect.sh:521
+#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ðµ в процеÑÑе бинарного поиÑка."
-#: git-bisect.sh:398
+#: git-bisect.sh:421
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "«$invalid» не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным коммитом"
-#: git-bisect.sh:407
+#: git-bisect.sh:430
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr "Ðе удалоÑÑŒ перейти на оригинальную ветку HEAD «$branch».\nПопробуйте запуÑтить «git bisect reset <коммит>»."
-#: git-bisect.sh:435
+#: git-bisect.sh:458
msgid "No logfile given"
msgstr "Ðе передан файл журнала"
-#: git-bisect.sh:436
+#: git-bisect.sh:459
#, sh-format
msgid "cannot read $file for replaying"
msgstr "не удалоÑÑŒ прочитать $file Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð° изменений"
-#: git-bisect.sh:455
+#: git-bisect.sh:480
msgid "?? what are you talking about?"
msgstr "?? вы о чем?"
-#: git-bisect.sh:467
+#: git-bisect.sh:492
#, sh-format
msgid "running $command"
msgstr "запуÑкаю $command"
-#: git-bisect.sh:474
+#: git-bisect.sh:499
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr "не удалоÑÑŒ выполнить двоичный поиÑк:\nкод Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ $res от «$command» оказалÑÑ < 0 или >= 128"
-#: git-bisect.sh:500
+#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
msgstr "bisect run больше не может продолжать"
-#: git-bisect.sh:506
+#: git-bisect.sh:531
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr "не удалоÑÑŒ выполнить двоичный поиÑк:\n«bisect_state $state» завершилÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ ошибки $res"
-#: git-bisect.sh:513
+#: git-bisect.sh:538
msgid "bisect run success"
msgstr "bisect run выполнен уÑпешно"
-#: git-bisect.sh:548
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "иÑпользуйте два разных определениÑ"
+
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "«$term» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым определением"
+
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать вÑтроенную команду «$term» как определение"
+
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ значение Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Â«$term»"
+
+#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: вы ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÐµÑÑŒ на $TERM_BAD/$TERM_GOOD двоичном поиÑке."
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð½Ðµ заданы"
+
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr "недопуÑтимый аргумент $arg Ð´Ð»Ñ Â«git bisect terms».\nПоддерживаемые параметры: --term-good|--term-old и --term-bad|--term-new."
+
#: git-rebase.sh:57
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
@@ -10794,34 +10980,34 @@ msgstr "Перехватчик пре-Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚ÐºÐ°Ð·Ð°Ð» в Ð
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Похоже, git-am выполнÑетÑÑ. Перемещение невозможно."
-#: git-rebase.sh:351
+#: git-rebase.sh:354
msgid "The --exec option must be used with the --interactive option"
msgstr "ÐžÐ¿Ñ†Ð¸Ñ --exec должна иÑпользоватьÑÑ Ð²Ð¼ÐµÑте Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --interactive"
-#: git-rebase.sh:356
+#: git-rebase.sh:359
msgid "No rebase in progress?"
msgstr "Ðет Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð² процеÑÑе?"
-#: git-rebase.sh:367
+#: git-rebase.sh:370
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "ДейÑтвие --edit-todo может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ при интерактивном перемещении."
-#: git-rebase.sh:374
+#: git-rebase.sh:377
msgid "Cannot read HEAD"
msgstr "Ðе удалоÑÑŒ прочитать HEAD"
-#: git-rebase.sh:377
+#: git-rebase.sh:380
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr "Ð’Ñ‹ должны отредактировать вÑе\nконфликты ÑлиÑниÑ, а потом пометить\nих как разрешенные Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ git add"
-#: git-rebase.sh:395
+#: git-rebase.sh:398
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Ðе удалоÑÑŒ перейти назад на $head_name"
-#: git-rebase.sh:414
+#: git-rebase.sh:417
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -10834,64 +11020,64 @@ msgid ""
"valuable there."
msgstr "Похоже, каталог $state_dir_base уже ÑущеÑтвует и Ñ Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÑŽ, что вы в процеÑÑе другого перемещениÑ. ЕÑли Ñто так, попробуйте\n\t$cmd_live_rebase\nЕÑли нет\n\t$cmd_clear_stale_rebase\nи запуÑтите Ð¼ÐµÐ½Ñ Ñнова. Я оÑтанавливаюÑÑŒ, чтобы вы не потерÑли что-то важное."
-#: git-rebase.sh:465
+#: git-rebase.sh:468
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "недейÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ñ‹ÑˆÐµÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° $upstream_name"
-#: git-rebase.sh:489
+#: git-rebase.sh:492
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: имеетÑÑ Ð±Ð¾Ð»ÑŒÑˆÐµ одной базы ÑлиÑниÑ"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:495 git-rebase.sh:499
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: нет базы ÑлиÑниÑ"
-#: git-rebase.sh:501
+#: git-rebase.sh:504
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Ðе указаывает на дейÑтвительный коммит: $onto_name"
-#: git-rebase.sh:524
+#: git-rebase.sh:527
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: нет такой ветки: $branch_name"
-#: git-rebase.sh:557
+#: git-rebase.sh:560
msgid "Cannot autostash"
msgstr "Ðе удалоÑÑŒ выполнить автоматичеÑкое прÑтанье"
-#: git-rebase.sh:562
+#: git-rebase.sh:565
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки ÑпрÑтаны: $stash_abbrev"
-#: git-rebase.sh:566
+#: git-rebase.sh:569
msgid "Please commit or stash them."
msgstr "Сделайте коммит или ÑпрÑчьте их."
-#: git-rebase.sh:586
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° $branch_name уже ÑвежаÑ."
-#: git-rebase.sh:590
+#: git-rebase.sh:593
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° $branch_name уже ÑвежаÑ, принудительное перемещение."
-#: git-rebase.sh:601
+#: git-rebase.sh:604
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ñ‚ $mb до $onto:"
-#: git-rebase.sh:610
+#: git-rebase.sh:613
msgid "First, rewinding head to replay your work on top of it..."
msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð²ÐµÑ€Ñ… него…"
-#: git-rebase.sh:620
+#: git-rebase.sh:623
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Перемотана вперед $branch_name до $onto_name."
@@ -10961,112 +11147,97 @@ msgstr "Ðе удалоÑÑŒ Ñохранить текущий ÑтатуÑ"
msgid "Cannot remove worktree changes"
msgstr "Ðе удалоÑÑŒ удалить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ³Ð¾ каталога"
-#: git-stash.sh:387
+#: git-stash.sh:405
#, sh-format
msgid "unknown option: $opt"
msgstr "неизвеÑÑ‚Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ: $opt"
-#: git-stash.sh:397
+#: git-stash.sh:415
msgid "No stash found."
msgstr "Ðе найдены ÑпрÑтанные изменениÑ."
-#: git-stash.sh:404
+#: git-stash.sh:422
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Передано Ñлишком много редакций: $REV"
-#: git-stash.sh:410
+#: git-stash.sh:428
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительной ÑÑылкой"
-#: git-stash.sh:438
+#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "«$args» не похоже на коммит Ñо ÑпрÑтанными изменениÑми"
-#: git-stash.sh:449
+#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "«$args» не ÑвлÑетÑÑ ÑÑылкой на ÑпрÑтанные изменениÑ"
-#: git-stash.sh:457
+#: git-stash.sh:475
msgid "unable to refresh index"
msgstr "не удалоÑÑŒ обновить индекÑ"
-#: git-stash.sh:461
+#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑпрÑтанные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑлиÑниÑ"
-#: git-stash.sh:469
+#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
msgstr "Конфликты в индекÑе. Попробуйте без --index."
-#: git-stash.sh:471
+#: git-stash.sh:489
msgid "Could not save index tree"
msgstr "Ðе удалоÑÑŒ Ñохранить дерево индекÑа"
-#: git-stash.sh:505
+#: git-stash.sh:523
msgid "Cannot unstage modified files"
msgstr "Ðевозможно убрать из индекÑа измененные файлы"
-#: git-stash.sh:520
+#: git-stash.sh:538
msgid "Index was not unstashed."
msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð½Ðµ был доÑтат из ÑпрÑтанных изменений."
-#: git-stash.sh:543
+#: git-stash.sh:561
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Отброшено ${REV} ($s)"
-#: git-stash.sh:544
+#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Ðе удалоÑÑŒ отброÑить запиÑÑŒ из ÑпрÑтанных изменений"
-#: git-stash.sh:552
+#: git-stash.sh:570
msgid "No branch name specified"
msgstr "Ðе указано Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸"
-#: git-stash.sh:624
+#: git-stash.sh:642
msgid "(To restore them type \"git stash apply\")"
msgstr "(Чтобы воÑÑтановить их, наберите «git stash apply»)"
-#: git-submodule.sh:95
+#: git-submodule.sh:104
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "не удалоÑÑŒ отрезать один компонент адреÑа «$remoteurl»"
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr "Ðе найдено ÑоответÑтвие подмодулей в .gitmodules Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «$sm_path»"
-
-#: git-submodule.sh:287
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr "Ðе удалоÑÑŒ клонировать «$url» в подмодуль по пути «$sm_path»"
-
-#: git-submodule.sh:296
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr "Каталог Git «$a» ÑвлÑетÑÑ Ñ‡Ð°Ñтью пути Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$b» или наоборот"
-
-#: git-submodule.sh:406
+#: git-submodule.sh:281
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "ОтноÑительный путь можно иÑпользовать только находÑÑÑŒ на вершине рабочего каталога"
-#: git-submodule.sh:416
+#: git-submodule.sh:291
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL репозиториÑ: «$repo» должен быть абÑолютным или начинатьÑÑ Ñ ./|../"
-#: git-submodule.sh:433
+#: git-submodule.sh:308
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "«$sm_path» уже ÑодержитÑÑ Ð² индекÑе"
-#: git-submodule.sh:437
+#: git-submodule.sh:312
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11074,235 +11245,235 @@ msgid ""
"Use -f if you really want to add it."
msgstr "Следующие пути игнорируютÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ваших файлов .gitignore:\n$sm_path\nИÑпользуйте опцию -f, еÑли вы дейÑтвительно хотите его добавить."
-#: git-submodule.sh:455
+#: git-submodule.sh:330
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "ДобавлÑÑŽ ÑущеÑтвующий репозиторий из «$sm_path» в индекÑ"
-#: git-submodule.sh:457
+#: git-submodule.sh:332
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "«$sm_path» уже ÑущеÑтвует и не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным репозиторием git"
-#: git-submodule.sh:465
+#: git-submodule.sh:340
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "Каталог git Ð´Ð»Ñ Â«$sm_name» найден локально на внешних репозиториÑÑ…:"
-#: git-submodule.sh:467
+#: git-submodule.sh:342
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr "ЕÑли вы хотите переиÑпользовать локальный каталог git вмеÑто повторного ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð·"
-#: git-submodule.sh:469
+#: git-submodule.sh:344
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr ", то иÑпользуйте опцию «--force». ЕÑли локальный каталог git не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным репозиторием"
-#: git-submodule.sh:470
+#: git-submodule.sh:345
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr "или еÑли вы не понÑли, что Ñто значит, то проÑто иÑпользуйте другое Ð¸Ð¼Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ опции «--name»."
-#: git-submodule.sh:472
+#: git-submodule.sh:347
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "ВоÑÑтановление локального каталога git Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_name»."
-#: git-submodule.sh:484
+#: git-submodule.sh:359
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Ðе удалоÑÑŒ перейти на ÑоÑтоÑние у Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_path»"
-#: git-submodule.sh:489
+#: git-submodule.sh:364
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Сбой Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_path»"
-#: git-submodule.sh:498
+#: git-submodule.sh:373
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Ðе удалоÑÑŒ зарегиÑтрировать подмодуль «$sm_path»"
-#: git-submodule.sh:542
+#: git-submodule.sh:417
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr "Заходим в «$prefix$displaypath»"
-#: git-submodule.sh:562
+#: git-submodule.sh:437
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr "ОÑтанавливаемÑÑ Ð½Ð° «$prefix$displaypath»; Ñценарий вернул не нулевой код возврата."
-#: git-submodule.sh:608
+#: git-submodule.sh:483
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr "ÐÐ´Ñ€ÐµÑ Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath» не найден в .gitmodules"
-#: git-submodule.sh:617
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
msgstr "Сбой региÑтрации адреÑе Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»"
-#: git-submodule.sh:619
+#: git-submodule.sh:494
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr "Подмодуль «$name» ($url) зарегиÑтрирован Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «$displaypath»"
-#: git-submodule.sh:636
+#: git-submodule.sh:511
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr "Сбой региÑтрации режима Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»"
-#: git-submodule.sh:674
+#: git-submodule.sh:549
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr "ИÑпользуйте «.», еÑли вы дейÑтвительно хотите деинициализировать вÑе подмодули"
-#: git-submodule.sh:691
+#: git-submodule.sh:566
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr "Рабочий каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath» Ñодержит каталог .git"
-#: git-submodule.sh:692
+#: git-submodule.sh:567
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr "(иÑпользуйте «rm -rf», еÑли вы дейÑтвительно хотите удалить его, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð²ÑÑŽ его иÑторию)"
-#: git-submodule.sh:698
+#: git-submodule.sh:573
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to"
" discard them"
msgstr "Рабочий каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath» Ñодержит локальные изменениÑ; иÑпользуйте «-f», чтобы отменить их"
-#: git-submodule.sh:701
+#: git-submodule.sh:576
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Очищен каталог «$displaypath»"
-#: git-submodule.sh:702
+#: git-submodule.sh:577
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Ðе удалоÑÑŒ удалить рабочий каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»"
-#: git-submodule.sh:705
+#: git-submodule.sh:580
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Ðе удалоÑÑŒ Ñоздать пуÑтой каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»"
-#: git-submodule.sh:714
+#: git-submodule.sh:589
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Подмодуль «$name» ($url) был ÑнÑÑ‚ Ñ Ñ€ÐµÐ³Ð¸Ñтрации по пути «$displaypath»"
-#: git-submodule.sh:830
+#: git-submodule.sh:705
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr "Подмодуль по пути «$displaypath» не инициализирован\nВозможно, вам нужно иÑпользовать «update --init»?"
-#: git-submodule.sh:843
+#: git-submodule.sh:718
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Ðе удалоÑÑŒ найти текущую редакцию Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:852
+#: git-submodule.sh:727
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Ðе удалоÑÑŒ выполнить извлечение Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$sm_path»"
-#: git-submodule.sh:876
+#: git-submodule.sh:751
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Ðе удалоÑÑŒ выполнить извлечение Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:890
+#: git-submodule.sh:765
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Ðе удалоÑÑŒ выполнить переход на ÑоÑтоÑние «$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:891
+#: git-submodule.sh:766
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: забрано ÑоÑтоÑние «$sha1»"
-#: git-submodule.sh:895
+#: git-submodule.sh:770
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Ðе удалоÑÑŒ перемеÑтить «$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:896
+#: git-submodule.sh:771
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»"
-#: git-submodule.sh:901
+#: git-submodule.sh:776
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Ðе удалоÑÑŒ выполнить ÑлиÑние Ñ Â«$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:902
+#: git-submodule.sh:777
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: Ñлито Ñ Â«$sha1»"
-#: git-submodule.sh:907
+#: git-submodule.sh:782
#, sh-format
msgid ""
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
msgstr "Сбой Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Â«$command $sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$prefix$sm_path»"
-#: git-submodule.sh:908
+#: git-submodule.sh:783
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr "Подмодуль по пути «$prefix$sm_path»: «$command $sha1»"
-#: git-submodule.sh:938
+#: git-submodule.sh:813
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Ðе удалоÑÑŒ выполнить рекурÑивно Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:1046
+#: git-submodule.sh:921
msgid "The --cached option cannot be used with the --files option"
msgstr "Опцию --cached Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --files"
-#: git-submodule.sh:1098
+#: git-submodule.sh:973
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "неизвеÑтный режим $mod_dst"
-#: git-submodule.sh:1118
+#: git-submodule.sh:993
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Предупреждение: $display_name не Ñодержит коммит $sha1_src"
-#: git-submodule.sh:1121
+#: git-submodule.sh:996
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Предупреждение: $display_name не Ñодержит коммит $sha1_dst"
-#: git-submodule.sh:1124
+#: git-submodule.sh:999
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Предупреждение: $display_name не Ñодержит коммиты $sha1_src и $sha1_dst"
-#: git-submodule.sh:1149
+#: git-submodule.sh:1024
msgid "blob"
msgstr "двоичный объект"
-#: git-submodule.sh:1267
+#: git-submodule.sh:1142
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Ðе удалоÑÑŒ выполнить рекурÑивно Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$sm_path»"
-#: git-submodule.sh:1331
+#: git-submodule.sh:1206
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ url Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»"
diff --git a/po/sv.po b/po/sv.po
index 587d296..940c5c5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git 2.6.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-09-05 09:16+0800\n"
-"PO-Revision-Date: 2015-09-09 21:45+0100\n"
+"POT-Creation-Date: 2015-12-22 22:50+0800\n"
+"PO-Revision-Date: 2015-12-26 12:25+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -31,13 +31,13 @@ msgstr ""
"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
"som lämpligt för att ange lösning och checka in."
-#: advice.c:101 builtin/merge.c:1227
+#: advice.c:101 builtin/merge.c:1225
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
#: advice.c:103
-msgid "Please, commit your changes before you can merge."
-msgstr "Ange ett incheckningsmeddelande för dina ändringar."
+msgid "Please, commit your changes before merging."
+msgstr "Checka in dina ändringar innan du utför sammanslagningen."
#: advice.c:104
msgid "Exiting because of unfinished merge."
@@ -62,76 +62,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-#: archive.c:428
+#: archive.c:429
msgid "fmt"
msgstr "fmt"
-#: archive.c:428
+#: archive.c:429
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:429 builtin/log.c:1229
+#: archive.c:430 builtin/log.c:1229
msgid "prefix"
msgstr "prefix"
-#: archive.c:430
+#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516
-#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535
+#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99
#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "fil"
-#: archive.c:432 builtin/archive.c:89
+#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "skriv arkivet till filen"
-#: archive.c:434
+#: archive.c:435
msgid "read .gitattributes in working directory"
msgstr "läs .gitattributes i arbetskatalogen"
-#: archive.c:435
+#: archive.c:436
msgid "report archived files on stderr"
msgstr "rapportera arkiverade filer på standard fel"
-#: archive.c:436
+#: archive.c:437
msgid "store only"
msgstr "endast spara"
-#: archive.c:437
+#: archive.c:438
msgid "compress faster"
msgstr "komprimera snabbare"
-#: archive.c:445
+#: archive.c:446
msgid "compress better"
msgstr "komprimera bättre"
-#: archive.c:448
+#: archive.c:449
msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
-#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr "arkiv"
-#: archive.c:451 builtin/archive.c:91
+#: archive.c:452 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr "kommando"
-#: archive.c:453 builtin/archive.c:93
+#: archive.c:454 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "sökväg till kommandot git-upload-archive på fjärren"
@@ -143,83 +143,83 @@ msgstr ""
"Negativa mönster ignoreras i git-attribut\n"
"Använd '\\!' för att inleda med ett utropstecken."
-#: branch.c:60
+#: branch.c:61
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."
-#: branch.c:83
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
"Grenen %s ställdes in att spåra fjärrgrenen %s från %s genom ombasering."
-#: branch.c:84
+#: branch.c:85
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "Grenen %s ställdes in att spåra fjärrgrenen %s från %s."
-#: branch.c:88
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr "Grenen %s ställdes in att spåra den lokala grenen %s genom ombasering."
-#: branch.c:89
+#: branch.c:90
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "Grenen %s ställdes in att spåra den lokala grenen %s."
-#: branch.c:94
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr "Grenen %s ställdes in att spåra fjärreferensen %s genom ombasering."
-#: branch.c:95
+#: branch.c:96
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "Grenen %s ställdes in att spåra fjärreferensen %s."
-#: branch.c:99
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
"Grenen %s ställdes in att spåra den lokala referensen %s genom ombasering."
-#: branch.c:100
+#: branch.c:101
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "Grenen %s ställdes in att spåra den lokala referensen %s."
-#: branch.c:133
+#: branch.c:134
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Spårar inte: tvetydig information för referensen %s"
-#: branch.c:162
+#: branch.c:163
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "\"%s\" är inte ett giltigt grennamn."
-#: branch.c:167
+#: branch.c:168
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Det finns redan en gren som heter \"%s\""
-#: branch.c:175
+#: branch.c:176
msgid "Cannot force update the current branch."
msgstr "Kan inte tvinga uppdatering av aktuell gren."
-#: branch.c:195
+#: branch.c:196
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."
-#: branch.c:197
+#: branch.c:198
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
-#: branch.c:199
+#: branch.c:200
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -239,22 +239,22 @@ msgstr ""
"spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"
"för att ställa in uppströmskonfigurationen när du sänder in."
-#: branch.c:243
+#: branch.c:244
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Objektnamnet är inte giltigt: \"%s\"."
-#: branch.c:263
+#: branch.c:264
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Objektnamnet är tvetydigt: \"%s\"."
-#: branch.c:268
+#: branch.c:269
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Avgreningspunkten är inte giltig: \"%s\""
-#: branch.c:399
+#: branch.c:322
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "\"%s\" är redan utcheckad på \"%s\""
@@ -269,7 +269,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:765
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
@@ -278,9 +278,9 @@ msgstr "kunde inte öppna \"%s\""
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708
-#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
-#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
@@ -320,7 +320,7 @@ msgstr "rev-list dog"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
@@ -338,13 +338,13 @@ msgstr "kan inte skapa \"%s\""
msgid "index-pack died"
msgstr "index-pack dog"
-#: color.c:260
+#: color.c:275
#, c-format
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489
-#: builtin/am.c:2101
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
@@ -502,22 +502,22 @@ msgstr "kunde inte läsa orderfilen \"%s\""
msgid "Performing inexact rename detection"
msgstr "Utför onöjaktig namnbytesdetektering"
-#: diff.c:116
+#: diff.c:115
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
-#: diff.c:121
+#: diff.c:120
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Okänd dirstat-parameter \"%s\"\n"
-#: diff.c:216
+#: diff.c:215
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
-#: diff.c:268
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -526,16 +526,16 @@ msgstr ""
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:2998
+#: diff.c:3000
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:3394
+#: diff.c:3396
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:3557
+#: diff.c:3559
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -544,16 +544,16 @@ msgstr ""
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:3571
+#: diff.c:3573
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: dir.c:1853
+#: dir.c:1915
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:1936
+#: dir.c:1998
msgid "Untracked cache is disabled on this system."
msgstr "Ospårad cache är inaktiverad på detta system."
@@ -662,8 +662,8 @@ msgstr "%s: %s - %s"
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:715
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
@@ -681,64 +681,64 @@ msgstr "addinfo_cache misslyckades för sökvägen \"%s\""
msgid "error building trees"
msgstr "fel vid byggande av träd"
-#: merge-recursive.c:687
+#: merge-recursive.c:686
#, c-format
msgid "failed to create path '%s'%s"
msgstr "misslyckades skapa sökvägen \"%s\"%s"
-#: merge-recursive.c:698
+#: merge-recursive.c:697
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Tar bort %s för att göra plats för underkatalog\n"
-#: merge-recursive.c:712 merge-recursive.c:733
+#: merge-recursive.c:711 merge-recursive.c:732
msgid ": perhaps a D/F conflict?"
msgstr ": kanske en K/F-konflikt?"
-#: merge-recursive.c:723
+#: merge-recursive.c:722
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "vägrar förlora ospårad fil vid \"%s\""
-#: merge-recursive.c:763
+#: merge-recursive.c:762
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kan inte läsa objektet %s: \"%s\""
-#: merge-recursive.c:765
+#: merge-recursive.c:764
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:788 builtin/clone.c:364
+#: merge-recursive.c:787 builtin/clone.c:369
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: merge-recursive.c:796
+#: merge-recursive.c:795
#, c-format
msgid "failed to symlink '%s'"
msgstr "misslyckades skapa symboliska länken \"%s\""
-#: merge-recursive.c:799
+#: merge-recursive.c:798
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
-#: merge-recursive.c:937
+#: merge-recursive.c:936
msgid "Failed to execute internal merge"
msgstr "Misslyckades exekvera intern sammanslagning"
-#: merge-recursive.c:941
+#: merge-recursive.c:940
#, c-format
msgid "Unable to add %s to database"
msgstr "Kunde inte lägga till %s till databasen"
-#: merge-recursive.c:957
+#: merge-recursive.c:956
msgid "unsupported object type in the tree"
msgstr "objekttyp som ej stöds upptäcktes i trädet"
-#: merge-recursive.c:1032 merge-recursive.c:1046
+#: merge-recursive.c:1031 merge-recursive.c:1045
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -747,7 +747,7 @@ msgstr ""
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet."
-#: merge-recursive.c:1038 merge-recursive.c:1051
+#: merge-recursive.c:1037 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -756,20 +756,20 @@ msgstr ""
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet vid %s."
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "rename"
msgstr "namnbyte"
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1148
+#: merge-recursive.c:1147
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s är en katalog i %s lägger till som %s istället"
-#: merge-recursive.c:1170
+#: merge-recursive.c:1169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -778,144 +778,144 @@ msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1174
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1229
+#: merge-recursive.c:1228
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
-#: merge-recursive.c:1259
+#: merge-recursive.c:1258
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Byter namn på %s till %s och %s till %s istället"
-#: merge-recursive.c:1458
+#: merge-recursive.c:1457
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"
-#: merge-recursive.c:1468
+#: merge-recursive.c:1467
#, c-format
msgid "Adding merged %s"
msgstr "Lägger till sammanslagen %s"
-#: merge-recursive.c:1473 merge-recursive.c:1671
+#: merge-recursive.c:1472 merge-recursive.c:1674
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s istället"
-#: merge-recursive.c:1524
+#: merge-recursive.c:1523
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-recursive.c:1527
+#: merge-recursive.c:1526
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:1585
+#: merge-recursive.c:1588
msgid "content"
msgstr "innehåll"
-#: merge-recursive.c:1592
+#: merge-recursive.c:1595
msgid "add/add"
msgstr "tillägg/tillägg"
-#: merge-recursive.c:1626
+#: merge-recursive.c:1629
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:1640
+#: merge-recursive.c:1643
#, c-format
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-recursive.c:1644 git-submodule.sh:1150
+#: merge-recursive.c:1647 git-submodule.sh:1025
msgid "submodule"
msgstr "undermodul"
-#: merge-recursive.c:1645
+#: merge-recursive.c:1648
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1734
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:1756
+#: merge-recursive.c:1759
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1765
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:1767
+#: merge-recursive.c:1770
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
-#: merge-recursive.c:1777
+#: merge-recursive.c:1780
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:1794
+#: merge-recursive.c:1797
msgid "Fatal merge failure, shouldn't happen."
msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."
-#: merge-recursive.c:1813
+#: merge-recursive.c:1816
msgid "Already up-to-date!"
msgstr "Redan à jour!"
-#: merge-recursive.c:1822
+#: merge-recursive.c:1825
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:1852
+#: merge-recursive.c:1855
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Obehandlad sökväg??? %s"
-#: merge-recursive.c:1900
+#: merge-recursive.c:1903
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:1913
+#: merge-recursive.c:1916
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "hittade %u gemensam förfader:"
msgstr[1] "hittade %u gemensamma förfäder:"
-#: merge-recursive.c:1950
+#: merge-recursive.c:1953
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:2007
+#: merge-recursive.c:2010
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:2018 builtin/merge.c:645
+#: merge-recursive.c:2021 builtin/merge.c:645
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
@@ -945,31 +945,41 @@ msgstr "Felaktigt värde på %s: \"%s\""
msgid "unable to parse object: %s"
msgstr "kunde inte tolka objektet: %s"
-#: parse-options.c:563
+#: parse-options.c:570
msgid "..."
msgstr "..."
-#: parse-options.c:581
+#: parse-options.c:588
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:585
+#: parse-options.c:592
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:588
+#: parse-options.c:595
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:622
+#: parse-options.c:629
msgid "-NUM"
msgstr "-TAL"
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "felformat objektnamn \"%s\""
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Kunde inte göra %s skrivbar för gruppen"
+
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
@@ -1039,11 +1049,11 @@ msgstr ""
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
-#: progress.c:236
+#: progress.c:235
msgid "done"
msgstr "klart"
-#: read-cache.c:1296
+#: read-cache.c:1281
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -1052,7 +1062,7 @@ msgstr ""
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1306
+#: read-cache.c:1291
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1061,118 +1071,163 @@ msgstr ""
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
#: builtin/merge.c:983
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Kunde inte öppna \"%s\" för skrivning"
-#: refs.c:3001
+#: refs/files-backend.c:2359
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
-#: refs.c:3004
+#: refs/files-backend.c:2362
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
-#: refs.c:3013
+#: refs/files-backend.c:2371
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
-#: ref-filter.c:660
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "format: atomen %%(end) använd utan motsvarande atom"
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "positivt värde förväntat contents:lines=%s"
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "förväntat format: %%(color:<color>)"
+
+#: ref-filter.c:835
msgid "unable to parse format"
msgstr "kan inte tolka formatet"
-#: remote.c:792
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "förväntat format: %%(align:<bredd>,<position>)"
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr "felaktigt format angivet align:%s"
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "positiv bredd förväntad med atomen %%(align)"
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "felformat objekt vid \"%s\""
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: atomen %%(end) saknas"
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr "felformat objektnamn %s"
+
+#: remote.c:756
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Kan inte hämta både %s och %s till %s"
-#: remote.c:796
+#: remote.c:760
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s spårar vanligtvis %s, inte %s"
-#: remote.c:800
+#: remote.c:764
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s spårar både %s och %s"
-#: remote.c:808
+#: remote.c:772
msgid "Internal error"
msgstr "Internt fel"
-#: remote.c:1723 remote.c:1766
+#: remote.c:1687 remote.c:1730
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: remote.c:1732
+#: remote.c:1696
#, c-format
msgid "no such branch: '%s'"
msgstr "okänd gren: \"%s\""
-#: remote.c:1735
+#: remote.c:1699
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "ingen standarduppström angiven för grenen \"%s\""
-#: remote.c:1741
+#: remote.c:1705
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
-#: remote.c:1756
+#: remote.c:1720
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
-#: remote.c:1771
+#: remote.c:1735
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "grenen \"%s\" har ingen fjärr för \"push\""
-#: remote.c:1782
+#: remote.c:1746
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-#: remote.c:1795
+#: remote.c:1759
msgid "push has no destination (push.default is 'nothing')"
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: remote.c:1817
+#: remote.c:1781
msgid "cannot resolve 'simple' push to a single destination"
msgstr "\"enkel push\" motsvarar flera olika mål"
-#: remote.c:2124
+#: remote.c:2083
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
-#: remote.c:2128
+#: remote.c:2087
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
-#: remote.c:2131
+#: remote.c:2090
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Din gren är à jour med \"%s\".\n"
-#: remote.c:2135
+#: remote.c:2094
#, 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] "Din gren ligger före \"%s\" med %d incheckning.\n"
msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
-#: remote.c:2141
+#: remote.c:2100
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"
-#: remote.c:2144
+#: remote.c:2103
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1182,11 +1237,11 @@ msgstr[0] ""
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:2152
+#: remote.c:2111
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"
-#: remote.c:2155
+#: remote.c:2114
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1201,28 +1256,28 @@ msgstr[1] ""
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:2165
+#: remote.c:2124
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
-#: revision.c:2198
+#: revision.c:2193
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2201
+#: revision.c:2196
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
-#: revision.c:2395
+#: revision.c:2390
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent är inkompatibelt med --bisect"
-#: run-command.c:83
+#: run-command.c:90
msgid "open /dev/null failed"
msgstr "misslyckades öppna /dev/null"
-#: run-command.c:85
+#: run-command.c:92
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) misslyckades"
@@ -1440,7 +1495,7 @@ msgstr "kan inte bestämma HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född"
-#: sequencer.c:887 builtin/apply.c:4291
+#: sequencer.c:887 builtin/apply.c:4287
#, c-format
msgid "cannot open %s: %s"
msgstr "kan inte öppna %s: %s"
@@ -1482,12 +1537,12 @@ msgstr "Kan inte ångra som första incheckning"
msgid "Can't cherry-pick into empty head"
msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
-#: setup.c:243
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
-#: sha1_name.c:453
+#: sha1_name.c:463
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1534,7 +1589,7 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s"
msgid "staging updated .gitmodules failed"
msgstr "misslyckades köa uppdaterad .gitmodules"
-#: submodule.c:1045
+#: submodule.c:1040
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "Kunde inte sätta core.worktree i %s"
@@ -1545,7 +1600,7 @@ msgstr "Kunde inte sätta core.worktree i %s"
msgid "unknown value '%s' for key '%s'"
msgstr "okänt värde \"%s\" för nyckeln \"%s\""
-#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
#, c-format
msgid "more than one %s"
msgstr "mer än en %s"
@@ -1612,8 +1667,8 @@ msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
-#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
-#: builtin/merge.c:1076 builtin/pull.c:380
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
@@ -1628,30 +1683,21 @@ msgstr "kan inte komma åt \"%s\": %s"
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
-#: wrapper.c:611
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
-
-#: wrapper.c:612
-msgid "no such user"
-msgstr "okänd användare"
-
-#: wrapper.c:620
+#: wrapper.c:608
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
-#: wrapper.c:631
+#: wrapper.c:635
#, c-format
msgid "could not open %s for writing"
msgstr "kunde inte öppna %s för skrivning"
-#: wrapper.c:642 builtin/am.c:424
+#: wrapper.c:646 builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "kunde inte skriva till %s"
-#: wrapper.c:648
+#: wrapper.c:652
#, c-format
msgid "could not close %s"
msgstr "kunde inte stänga %s"
@@ -1994,27 +2040,27 @@ msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
-#: wt-status.c:1437
+#: wt-status.c:1438
msgid "On branch "
msgstr "PÃ¥ grenen "
-#: wt-status.c:1445
+#: wt-status.c:1444
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå"
-#: wt-status.c:1447
+#: wt-status.c:1446
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå"
-#: wt-status.c:1452
+#: wt-status.c:1451
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:1454
+#: wt-status.c:1453
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:1457
+#: wt-status.c:1456
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
@@ -2101,23 +2147,23 @@ msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
msgid "nothing to commit, working directory clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1644
-msgid "HEAD (no branch)"
-msgstr "HEAD (ingen gren)"
-
-#: wt-status.c:1650
+#: wt-status.c:1642
msgid "Initial commit on "
msgstr "Första incheckning på "
-#: wt-status.c:1677
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
+msgstr "HEAD (ingen gren)"
+
+#: wt-status.c:1675
msgid "gone"
msgstr "försvunnen"
-#: wt-status.c:1679 wt-status.c:1687
+#: wt-status.c:1677 wt-status.c:1685
msgid "behind "
msgstr "efter "
-#: compat/precompose_utf8.c:55 builtin/clone.c:403
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
@@ -2131,7 +2177,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..."
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:70 builtin/commit.c:277
+#: builtin/add.c:70 builtin/commit.c:278
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
@@ -2142,9 +2188,9 @@ msgstr "ta bort \"%s\"\n"
#: builtin/add.c:134
msgid "Unstaged changes after refreshing the index:"
-msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"
+msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:194 builtin/rev-parse.c:799
+#: builtin/add.c:194 builtin/rev-parse.c:796
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
@@ -2179,15 +2225,15 @@ msgstr "Kunde inte tillämpa \"%s\""
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
-#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
-#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
-#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
-#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "var pratsam"
@@ -2195,7 +2241,7 @@ msgstr "var pratsam"
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
@@ -2252,148 +2298,148 @@ msgstr "-A och -u är ömsesidigt inkompatibla"
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
-#: builtin/add.c:358
+#: builtin/add.c:352
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/add.c:359
+#: builtin/add.c:353
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
-#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
-#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: builtin/am.c:41
+#: builtin/am.c:42
#, c-format
msgid "could not stat %s"
msgstr "kunde inte ta status på %s"
-#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737
-#: builtin/merge.c:1079
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/am.c:444
+#: builtin/am.c:445
msgid "could not parse author script"
msgstr "kunde inte tolka författarskript"
-#: builtin/am.c:521
+#: builtin/am.c:522
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "\"%s\" togs bort av kroken applypatch-msg"
-#: builtin/am.c:562 builtin/notes.c:300
+#: builtin/am.c:563 builtin/notes.c:300
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Felaktig indatarad: \"%s\"."
-#: builtin/am.c:599 builtin/notes.c:315
+#: builtin/am.c:600 builtin/notes.c:315
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-#: builtin/am.c:625
+#: builtin/am.c:626
msgid "fseek failed"
msgstr "\"fseek\" misslyckades"
-#: builtin/am.c:786 builtin/am.c:874
+#: builtin/am.c:787 builtin/am.c:875
#, c-format
msgid "could not open '%s' for reading: %s"
msgstr "kunde inte öppna \"%s\" för läsning: %s"
-#: builtin/am.c:793
+#: builtin/am.c:794
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "Kunde inte öppna \"%s\" för skrivning: %s"
-#: builtin/am.c:802
+#: builtin/am.c:803
#, c-format
msgid "could not parse patch '%s'"
msgstr "kunde inte tolka patchen \"%s\""
-#: builtin/am.c:867
+#: builtin/am.c:868
msgid "Only one StGIT patch series can be applied at once"
msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
-#: builtin/am.c:915
+#: builtin/am.c:916
msgid "invalid timestamp"
msgstr "ogiltig tidsstämpel"
-#: builtin/am.c:918 builtin/am.c:926
+#: builtin/am.c:919 builtin/am.c:927
msgid "invalid Date line"
msgstr "ogiltig \"Date\"-rad"
-#: builtin/am.c:923
+#: builtin/am.c:924
msgid "invalid timezone offset"
msgstr "ogiltig tidszons-offset"
-#: builtin/am.c:1010
+#: builtin/am.c:1011
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:1015 builtin/clone.c:368
+#: builtin/am.c:1016 builtin/clone.c:373
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/am.c:1019
+#: builtin/am.c:1020
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:1151 builtin/commit.c:362
+#: builtin/am.c:1152 builtin/commit.c:363
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1202
+#: builtin/am.c:1203
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "När du har löst problemet, kör \"%s --continue\"."
-#: builtin/am.c:1203
+#: builtin/am.c:1204
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."
-#: builtin/am.c:1204
+#: builtin/am.c:1205
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."
-#: builtin/am.c:1312
+#: builtin/am.c:1343
msgid "Patch is empty. Was it split wrong?"
msgstr "Patchen är tom. Delades den upp felaktigt?"
-#: builtin/am.c:1386 builtin/log.c:1345
+#: builtin/am.c:1417 builtin/log.c:1347
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/am.c:1413
+#: builtin/am.c:1444
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: builtin/am.c:1587
+#: builtin/am.c:1646
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: builtin/am.c:1589
+#: builtin/am.c:1648
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1608
+#: builtin/am.c:1667
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2401,39 +2447,39 @@ msgstr ""
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1614
+#: builtin/am.c:1673
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1639
+#: builtin/am.c:1688
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1664 builtin/merge.c:632
+#: builtin/am.c:1712 builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: builtin/am.c:1671
+#: builtin/am.c:1719
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
#: builtin/merge.c:854
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: builtin/am.c:1716 builtin/am.c:1720
+#: builtin/am.c:1764 builtin/am.c:1768
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1736
+#: builtin/am.c:1784
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-#: builtin/am.c:1741
+#: builtin/am.c:1789
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
@@ -2441,35 +2487,35 @@ msgstr "Incheckningskroppen är:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1751
+#: builtin/am.c:1799
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
-#: builtin/am.c:1801
+#: builtin/am.c:1849
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1836 builtin/am.c:1907
+#: builtin/am.c:1884 builtin/am.c:1955
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1852
+#: builtin/am.c:1900
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1860
+#: builtin/am.c:1908
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1866
+#: builtin/am.c:1914
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "En kopia av patchen som misslyckades finns i: %s"
-#: builtin/am.c:1910
+#: builtin/am.c:1958
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2479,7 +2525,7 @@ msgstr ""
"Om det inte är något kvar att köa kan det hända att något annat redan\n"
"introducerat samma ändringar; kanske du bör hoppa över patchen."
-#: builtin/am.c:1917
+#: builtin/am.c:1965
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2487,17 +2533,17 @@ msgstr ""
"Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"
"Glömde du använda \"git add\"?"
-#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet \"%s\""
-#: builtin/am.c:2077
+#: builtin/am.c:2125
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2111
+#: builtin/am.c:2159
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2505,150 +2551,152 @@ msgstr ""
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2172
+#: builtin/am.c:2220
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2194
-msgid "git am [options] [(<mbox>|<Maildir>)...]"
-msgstr "git am [flaggor] [(<mbox>|<Maildir>)...]"
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2195
-msgid "git am [options] (--continue | --skip | --abort)"
-msgstr "git am [flaggor] (--continue | --skip | --abort)"
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2201
+#: builtin/am.c:2260
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2203
+#: builtin/am.c:2262
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2205
+#: builtin/am.c:2264
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2208
+#: builtin/am.c:2267
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/am.c:2211
+#: builtin/am.c:2270
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2213
+#: builtin/am.c:2272
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2215
+#: builtin/am.c:2274
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2217
+#: builtin/am.c:2276
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2219
+#: builtin/am.c:2278
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
-#: builtin/am.c:2222
+#: builtin/am.c:2281
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
-#: builtin/am.c:2225
+#: builtin/am.c:2284
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2226 builtin/apply.c:4563
+#: builtin/am.c:2285 builtin/apply.c:4554
msgid "action"
msgstr "åtgärd"
-#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236
-#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
-#: builtin/am.c:2254
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2235 builtin/apply.c:4587
+#: builtin/am.c:2294 builtin/apply.c:4578
msgid "root"
msgstr "rot"
-#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525
-#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
-#: builtin/pull.c:167
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
msgid "path"
msgstr "sökväg"
-#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
-#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
-#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
-#: parse-options.h:134 parse-options.h:243
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2247 builtin/apply.c:4531
+#: builtin/am.c:2306 builtin/apply.c:4522
msgid "num"
msgstr "antal"
-#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
msgid "format"
msgstr "format"
-#: builtin/am.c:2251
+#: builtin/am.c:2310
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2257
+#: builtin/am.c:2316
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2259
+#: builtin/am.c:2318
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2262
+#: builtin/am.c:2321
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2265
+#: builtin/am.c:2324
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2268
+#: builtin/am.c:2327
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/am.c:2272
+#: builtin/am.c:2331
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2274
+#: builtin/am.c:2333
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225
-#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2277
+#: builtin/am.c:2336
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2280
+#: builtin/am.c:2339
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2295
+#: builtin/am.c:2354
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -2656,16 +2704,16 @@ msgstr ""
"Flaggan -b/--binary har varit utan funktion länge, och\n"
"kommer tas bort. Vi ber dig att inte använda den längre."
-#: builtin/am.c:2302
+#: builtin/am.c:2361
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2317
+#: builtin/am.c:2376
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
-#: builtin/am.c:2341
+#: builtin/am.c:2400
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2674,7 +2722,7 @@ msgstr ""
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2347
+#: builtin/am.c:2406
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
@@ -2682,62 +2730,62 @@ msgstr "Lösningsoperation pågår inte, vi återupptar inte."
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<flaggor>] [<patch>...]"
-#: builtin/apply.c:112
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "okänt alternativ för whitespace: \"%s\""
-#: builtin/apply.c:127
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
-#: builtin/apply.c:822
+#: builtin/apply.c:818
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
-#: builtin/apply.c:831
+#: builtin/apply.c:827
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec returnerade %d för indata: %s"
-#: builtin/apply.c:912
+#: builtin/apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "kan inte hitta filnamn i patchen på rad %d"
-#: builtin/apply.c:944
+#: builtin/apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
-#: builtin/apply.c:948
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
-#: builtin/apply.c:949
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
-#: builtin/apply.c:956
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
-#: builtin/apply.c:1419
+#: builtin/apply.c:1415
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: förväntade rad: %.*s"
-#: builtin/apply.c:1476
+#: builtin/apply.c:1472
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "patch-fragment utan huvud på rad %d: %.*s"
-#: builtin/apply.c:1493
+#: builtin/apply.c:1489
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2753,77 +2801,77 @@ msgstr[1] ""
"sökvägskomponenter\n"
"tas bort (rad %d)"
-#: builtin/apply.c:1659
+#: builtin/apply.c:1655
msgid "new file depends on old contents"
msgstr "ny fil beror på gammalt innehåll"
-#: builtin/apply.c:1661
+#: builtin/apply.c:1657
msgid "deleted file still has contents"
msgstr "borttagen fil har fortfarande innehåll"
-#: builtin/apply.c:1687
+#: builtin/apply.c:1683
#, c-format
msgid "corrupt patch at line %d"
msgstr "trasig patch på rad %d"
-#: builtin/apply.c:1723
+#: builtin/apply.c:1719
#, c-format
msgid "new file %s depends on old contents"
msgstr "nya filen %s beror på gammalt innehåll"
-#: builtin/apply.c:1725
+#: builtin/apply.c:1721
#, c-format
msgid "deleted file %s still has contents"
msgstr "borttagna filen %s har fortfarande innehåll"
-#: builtin/apply.c:1728
+#: builtin/apply.c:1724
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** varning: filen %s blir tom men har inte tagits bort"
-#: builtin/apply.c:1874
+#: builtin/apply.c:1870
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "trasig binärpatch på rad %d: %.*s"
-#: builtin/apply.c:1903
+#: builtin/apply.c:1899
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "binärpatchen på rad %d känns inte igen"
-#: builtin/apply.c:2054
+#: builtin/apply.c:2050
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch med bara skräp på rad %d"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2140
#, c-format
msgid "unable to read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: builtin/apply.c:2148
+#: builtin/apply.c:2144
#, c-format
msgid "unable to open or read %s"
msgstr "kunde inte öppna eller läsa %s"
-#: builtin/apply.c:2781
+#: builtin/apply.c:2777
#, c-format
msgid "invalid start of line: '%c'"
msgstr "felaktig inledning på rad: \"%c\""
-#: builtin/apply.c:2900
+#: builtin/apply.c:2896
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
-#: builtin/apply.c:2912
+#: builtin/apply.c:2908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
-#: builtin/apply.c:2918
+#: builtin/apply.c:2914
#, c-format
msgid ""
"while searching for:\n"
@@ -2832,319 +2880,319 @@ msgstr ""
"vid sökning efter:\n"
"%.*s"
-#: builtin/apply.c:2938
+#: builtin/apply.c:2934
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "saknar binära patchdata för \"%s\""
-#: builtin/apply.c:3039
+#: builtin/apply.c:3035
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "binärpatchen kan inte tillämpas på \"%s\""
-#: builtin/apply.c:3045
+#: builtin/apply.c:3041
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
-#: builtin/apply.c:3066
+#: builtin/apply.c:3062
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
-#: builtin/apply.c:3190
+#: builtin/apply.c:3186
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
#, c-format
msgid "read of %s failed"
msgstr "misslyckades läsa %s"
-#: builtin/apply.c:3243
+#: builtin/apply.c:3239
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
-#: builtin/apply.c:3271 builtin/apply.c:3493
+#: builtin/apply.c:3267 builtin/apply.c:3489
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: builtin/apply.c:3352 builtin/apply.c:3507
+#: builtin/apply.c:3348 builtin/apply.c:3503
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3361 builtin/apply.c:3515
+#: builtin/apply.c:3357 builtin/apply.c:3511
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
-#: builtin/apply.c:3463
+#: builtin/apply.c:3459
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
-#: builtin/apply.c:3532
+#: builtin/apply.c:3528
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
-#: builtin/apply.c:3534
+#: builtin/apply.c:3530
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: builtin/apply.c:3693 builtin/apply.c:3695
+#: builtin/apply.c:3689 builtin/apply.c:3691
#, c-format
msgid "invalid path '%s'"
msgstr "ogiltig sökväg: %s"
-#: builtin/apply.c:3750
+#: builtin/apply.c:3746
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: builtin/apply.c:3753
+#: builtin/apply.c:3749
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: builtin/apply.c:3773
+#: builtin/apply.c:3769
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
-#: builtin/apply.c:3778
+#: builtin/apply.c:3774
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3794
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
-#: builtin/apply.c:3802
+#: builtin/apply.c:3798
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: builtin/apply.c:3816
+#: builtin/apply.c:3812
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: builtin/apply.c:4052
+#: builtin/apply.c:4048
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4077
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: builtin/apply.c:4085
+#: builtin/apply.c:4081
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: builtin/apply.c:4090
+#: builtin/apply.c:4086
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
-#: builtin/apply.c:4093 builtin/apply.c:4201
+#: builtin/apply.c:4089 builtin/apply.c:4197
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: builtin/apply.c:4126
+#: builtin/apply.c:4122
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: builtin/apply.c:4175
+#: builtin/apply.c:4171
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: builtin/apply.c:4262
+#: builtin/apply.c:4258
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: builtin/apply.c:4270
+#: builtin/apply.c:4266
msgid "internal error"
msgstr "internt fel"
-#: builtin/apply.c:4273
+#: builtin/apply.c:4269
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
-#: builtin/apply.c:4283
+#: builtin/apply.c:4279
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: builtin/apply.c:4304
+#: builtin/apply.c:4300
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: builtin/apply.c:4307
+#: builtin/apply.c:4303
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: builtin/apply.c:4397
+#: builtin/apply.c:4393
msgid "unrecognized input"
msgstr "indata känns inte igen"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4404
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4517
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: builtin/apply.c:4529
+#: builtin/apply.c:4520
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4523
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: builtin/apply.c:4535
+#: builtin/apply.c:4526
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: builtin/apply.c:4537
+#: builtin/apply.c:4528
msgid "instead of applying the patch, output diffstat for the input"
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
-#: builtin/apply.c:4541
+#: builtin/apply.c:4532
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4534
msgid "instead of applying the patch, output a summary for the input"
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4536
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4538
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: builtin/apply.c:4549
+#: builtin/apply.c:4540
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: builtin/apply.c:4551
+#: builtin/apply.c:4542
msgid "accept a patch that touches outside the working area"
msgstr "godta en patch som rör filer utanför arbetskatalogen"
-#: builtin/apply.c:4553
+#: builtin/apply.c:4544
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: builtin/apply.c:4555
+#: builtin/apply.c:4546
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
-#: builtin/apply.c:4557
+#: builtin/apply.c:4548
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4553
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: builtin/apply.c:4564
+#: builtin/apply.c:4555
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: builtin/apply.c:4567 builtin/apply.c:4570
+#: builtin/apply.c:4558 builtin/apply.c:4561
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: builtin/apply.c:4573
+#: builtin/apply.c:4564
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: builtin/apply.c:4575
+#: builtin/apply.c:4566
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: builtin/apply.c:4577
+#: builtin/apply.c:4568
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: builtin/apply.c:4579
+#: builtin/apply.c:4570
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: builtin/apply.c:4582
+#: builtin/apply.c:4573
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: builtin/apply.c:4585
+#: builtin/apply.c:4576
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: builtin/apply.c:4588
+#: builtin/apply.c:4579
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
-#: builtin/apply.c:4610
+#: builtin/apply.c:4601
msgid "--3way outside a repository"
msgstr "--3way utanför arkiv"
-#: builtin/apply.c:4618
+#: builtin/apply.c:4609
msgid "--index outside a repository"
msgstr "--index utanför arkiv"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4612
msgid "--cached outside a repository"
msgstr "--cached utanför arkiv"
-#: builtin/apply.c:4640
+#: builtin/apply.c:4631
#, c-format
msgid "can't open patch '%s'"
msgstr "kan inte öppna patchen \"%s\""
-#: builtin/apply.c:4654
+#: builtin/apply.c:4645
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "undertryckte %d fel i blanksteg"
msgstr[1] "undertryckte %d fel i blanksteg"
-#: builtin/apply.c:4660 builtin/apply.c:4670
+#: builtin/apply.c:4651 builtin/apply.c:4661
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3206,95 +3254,95 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:2500
+#: builtin/blame.c:2519
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:2501
+#: builtin/blame.c:2520
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:2502
+#: builtin/blame.c:2521
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:2503
+#: builtin/blame.c:2522
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:2504
+#: builtin/blame.c:2523
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:2505
+#: builtin/blame.c:2524
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:2506
+#: builtin/blame.c:2525
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:2507
+#: builtin/blame.c:2526
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:2508
+#: builtin/blame.c:2527
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:2509
+#: builtin/blame.c:2528
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
-#: builtin/blame.c:2510
+#: builtin/blame.c:2529
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:2511
+#: builtin/blame.c:2530
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:2512
+#: builtin/blame.c:2531
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:2513
+#: builtin/blame.c:2532
msgid "Show author email instead of name (Default: off)"
msgstr "Visa författarens e-post istället för namn (Standard: av)"
-#: builtin/blame.c:2514
+#: builtin/blame.c:2533
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:2515
+#: builtin/blame.c:2534
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:2516
+#: builtin/blame.c:2535
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
-#: builtin/blame.c:2517
+#: builtin/blame.c:2536
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:2518 builtin/blame.c:2519
+#: builtin/blame.c:2537 builtin/blame.c:2538
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:2518
+#: builtin/blame.c:2537
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:2519
+#: builtin/blame.c:2538
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
@@ -3304,27 +3352,31 @@ msgstr "Behandla endast radintervallet n,m, med början på 1"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2601
+#: builtin/blame.c:2620
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/branch.c:24
+#: builtin/branch.c:25
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..."
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"
-#: builtin/branch.c:150
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:142
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3333,7 +3385,7 @@ msgstr ""
"tar bort grenen \"%s\" som har slagits ihop med\n"
" \"%s\", men ännu inte slagits ihop med HEAD."
-#: builtin/branch.c:154
+#: builtin/branch.c:146
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3342,12 +3394,12 @@ msgstr ""
"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
" \"%s\", trots att den har slagits ihop med HEAD."
-#: builtin/branch.c:168
+#: builtin/branch.c:160
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
-#: builtin/branch.c:172
+#: builtin/branch.c:164
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3356,348 +3408,340 @@ msgstr ""
"Grenen \"%s\" har inte slagits samman i sin helhet.\n"
"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
-#: builtin/branch.c:185
+#: builtin/branch.c:177
msgid "Update of config-file failed"
msgstr "Misslyckades uppdatera konfigurationsfil"
-#: builtin/branch.c:213
+#: builtin/branch.c:205
msgid "cannot use -a with -d"
msgstr "kan inte ange -a med -d"
-#: builtin/branch.c:219
+#: builtin/branch.c:211
msgid "Couldn't look up commit object for HEAD"
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
-#: builtin/branch.c:227
+#: builtin/branch.c:219
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande."
-#: builtin/branch.c:243
+#: builtin/branch.c:235
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "fjärrspårande grenen \"%s\" hittades inte."
-#: builtin/branch.c:244
+#: builtin/branch.c:236
#, c-format
msgid "branch '%s' not found."
msgstr "grenen \"%s\" hittades inte."
-#: builtin/branch.c:259
+#: builtin/branch.c:251
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
-#: builtin/branch.c:260
+#: builtin/branch.c:252
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fel vid borttagning av grenen \"%s\""
-#: builtin/branch.c:267
+#: builtin/branch.c:259
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
-#: builtin/branch.c:268
+#: builtin/branch.c:260
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:369
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr "grenen \"%s\" pekar inte på en incheckning"
-
-#: builtin/branch.c:452
+#: builtin/branch.c:303
#, c-format
msgid "[%s: gone]"
msgstr "[%s: försvunnen]"
-#: builtin/branch.c:457
+#: builtin/branch.c:308
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:462
+#: builtin/branch.c:313
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: bakom %d] "
-#: builtin/branch.c:464
+#: builtin/branch.c:315
#, c-format
msgid "[behind %d]"
msgstr "[bakom %d] "
-#: builtin/branch.c:468
+#: builtin/branch.c:319
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: före %d] "
-#: builtin/branch.c:470
+#: builtin/branch.c:321
#, c-format
msgid "[ahead %d]"
msgstr "[före %d] "
-#: builtin/branch.c:473
+#: builtin/branch.c:324
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: före %d, bakom %d] "
-#: builtin/branch.c:476
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[före %d, bakom %d] "
-#: builtin/branch.c:489
+#: builtin/branch.c:340
msgid " **** invalid ref ****"
msgstr " **** ogiltig ref ****"
-#: builtin/branch.c:580
+#: builtin/branch.c:366
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ingen gren, ombaserar %s)"
-#: builtin/branch.c:583
+#: builtin/branch.c:369
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ingen gren, \"bisect\" startad på %s)"
-#: builtin/branch.c:589
+#: builtin/branch.c:375
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD frånkopplat vid %s)"
-#: builtin/branch.c:592
+#: builtin/branch.c:378
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD frånkopplat från %s)"
-#: builtin/branch.c:596
+#: builtin/branch.c:382
msgid "(no branch)"
msgstr "(ingen gren)"
-#: builtin/branch.c:643
-#, c-format
-msgid "object '%s' does not point to a commit"
-msgstr "objektet \"%s\" pekar på en incheckning"
-
-#: builtin/branch.c:691
-msgid "some refs could not be read"
-msgstr "vissa referenser kunde inte läsas"
-
-#: builtin/branch.c:704
+#: builtin/branch.c:524
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:714
+#: builtin/branch.c:534
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:729
+#: builtin/branch.c:549
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:733
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:737
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:744
+#: builtin/branch.c:564
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:759
-#, c-format
-msgid "malformed object name %s"
-msgstr "felformat objektnamn %s"
-
-#: builtin/branch.c:781
+#: builtin/branch.c:587
#, c-format
msgid "could not write branch description template: %s"
msgstr "kunde inte skriva grenbeskrivningsmall: %s"
-#: builtin/branch.c:811
+#: builtin/branch.c:616
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:813
+#: builtin/branch.c:618
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
-#: builtin/branch.c:814
+#: builtin/branch.c:619
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:815
+#: builtin/branch.c:620
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:817
+#: builtin/branch.c:622
msgid "change upstream info"
msgstr "ändra uppströmsinformation"
-#: builtin/branch.c:821
+#: builtin/branch.c:626
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:822
+#: builtin/branch.c:627
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
-#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
-#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
-#: builtin/tag.c:624
-msgid "commit"
-msgstr "incheckning"
-
-#: builtin/branch.c:826 builtin/branch.c:832
+#: builtin/branch.c:629 builtin/branch.c:630
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:838
+#: builtin/branch.c:633
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:839
+#: builtin/branch.c:634
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:841
+#: builtin/branch.c:636
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:842
+#: builtin/branch.c:637
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:843
+#: builtin/branch.c:638
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:844
+#: builtin/branch.c:639
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:845
+#: builtin/branch.c:640
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:846
+#: builtin/branch.c:641
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:848
+#: builtin/branch.c:643
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:849
+#: builtin/branch.c:644
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:852
-msgid "print only not merged branches"
-msgstr "visa endast ej sammanslagna grenar"
-
-#: builtin/branch.c:858
-msgid "print only merged branches"
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:862
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
+msgstr "visa endast ej sammanslagna grenar"
+
+#: builtin/branch.c:647
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:875
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr "nyckel"
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr "fältnamn att sortera på"
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr "objekt"
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr "visa endast grenar för objektet"
+
+#: builtin/branch.c:670
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens"
-#: builtin/branch.c:879 builtin/clone.c:690
+#: builtin/branch.c:674 builtin/clone.c:697
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:901
+#: builtin/branch.c:694
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:912 builtin/branch.c:951
+#: builtin/branch.c:705 builtin/branch.c:747
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:927
+#: builtin/branch.c:723
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:932
+#: builtin/branch.c:728
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:939
+#: builtin/branch.c:735
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu"
-#: builtin/branch.c:942
+#: builtin/branch.c:738
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:957
+#: builtin/branch.c:753
msgid "too many branches for a rename operation"
msgstr "för många grenar för namnbyte"
-#: builtin/branch.c:962
+#: builtin/branch.c:758
msgid "too many branches to set new upstream"
msgstr "för många grenar för att byta uppström"
-#: builtin/branch.c:966
+#: builtin/branch.c:762
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
-#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:973
+#: builtin/branch.c:769
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:985
+#: builtin/branch.c:781
msgid "too many branches to unset upstream"
msgstr "för många grenar för att ta bort uppström"
-#: builtin/branch.c:989
+#: builtin/branch.c:785
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
-#: builtin/branch.c:995
+#: builtin/branch.c:791
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:1009
+#: builtin/branch.c:805
msgid "it does not make sense to create 'HEAD' manually"
msgstr "kan inte skapa \"HEAD\" manuellt"
-#: builtin/branch.c:1015
+#: builtin/branch.c:811
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
"grennamn"
-#: builtin/branch.c:1018
+#: builtin/branch.c:814
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3706,7 +3750,7 @@ msgstr ""
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
"eller --set-upstream-to\n"
-#: builtin/branch.c:1035
+#: builtin/branch.c:831
#, c-format
msgid ""
"\n"
@@ -3717,12 +3761,12 @@ msgstr ""
"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
"\n"
-#: builtin/branch.c:1036
+#: builtin/branch.c:832
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1037
+#: builtin/branch.c:833
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3749,11 +3793,8 @@ msgstr ""
"<typ>|--textconv) <objekt>"
#: builtin/cat-file.c:429
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
-"objects>"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <objektlista>"
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
#: builtin/cat-file.c:466
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -3809,8 +3850,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..."
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
-msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...] < <sökvägslista>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@ -3828,7 +3869,7 @@ msgstr "läs filnamn från standard in"
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
@@ -3914,6 +3955,8 @@ msgid "write the content to temporary files"
msgstr "skriv innehåll till temporära filer"
#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
msgid "string"
msgstr "sträng"
@@ -3933,105 +3976,105 @@ msgstr "git checkout [<flaggor>] <gren>"
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."
-#: builtin/checkout.c:133 builtin/checkout.c:166
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
msgid "path '%s' does not have our version"
msgstr "sökvägen \"%s\" har inte vår version"
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have their version"
msgstr "sökvägen \"%s\" har inte deras version"
-#: builtin/checkout.c:151
+#: builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
-#: builtin/checkout.c:195
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
-#: builtin/checkout.c:212
+#: builtin/checkout.c:213
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:229
+#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:263 builtin/checkout.c:266
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "\"%s\" kan inte användas med %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:269
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
-#: builtin/checkout.c:279 builtin/checkout.c:473
+#: builtin/checkout.c:280 builtin/checkout.c:474
msgid "corrupt index file"
msgstr "indexfilen är trasig"
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:496
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:623
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:661
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:667
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:670
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:676 builtin/checkout.c:1065
+#: builtin/checkout.c:677 builtin/checkout.c:1066
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:678
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:730
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4054,7 +4097,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:755
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4081,145 +4124,151 @@ msgstr[1] ""
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:791
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:822 builtin/checkout.c:1060
+#: builtin/checkout.c:823 builtin/checkout.c:1061
msgid "You are on a branch yet to be born"
msgstr "Du är på en gren som ännu inte är född"
-#: builtin/checkout.c:967
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1006 builtin/worktree.c:210
+#: builtin/checkout.c:1007 builtin/worktree.c:213
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1035
+#: builtin/checkout.c:1036
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1074
+#: builtin/checkout.c:1075
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1077 builtin/checkout.c:1081
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1102
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
-#: builtin/worktree.c:319
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1136
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1138
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1139
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1140
msgid "detach the HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1141
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1146
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1148
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1149
msgid "perform a 3-way merge with the new branch"
msgstr "utför en 3-vägssammanslagning för den nya grenen"
-#: builtin/checkout.c:1149 builtin/merge.c:227
+#: builtin/checkout.c:1150 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
+#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1152
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1155
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1157
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1159
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr "tvinga förloppsrapportering"
+
+#: builtin/checkout.c:1191
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1198
+#: builtin/checkout.c:1208
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1213
msgid "Missing branch name; try -b"
msgstr "Grennamn saknas; försök med -b"
-#: builtin/checkout.c:1239
+#: builtin/checkout.c:1249
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1256
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4228,12 +4277,12 @@ msgstr ""
"Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"
"Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1261
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1265
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4273,7 +4322,7 @@ msgstr "Skulle hoppa över arkivet %s\n"
msgid "failed to remove %s"
msgstr "misslyckades ta bort %s"
-#: builtin/clean.c:317
+#: builtin/clean.c:315
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -4285,7 +4334,7 @@ msgstr ""
"foo - markera post baserad på unikt prefix\n"
" - (tomt) markera ingenting"
-#: builtin/clean.c:321
+#: builtin/clean.c:319
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -4305,36 +4354,36 @@ msgstr ""
"* - välj alla poster\n"
" - (tomt) avsluta markering"
-#: builtin/clean.c:537
+#: builtin/clean.c:535
#, c-format
msgid "Huh (%s)?"
msgstr "Vadå (%s)?"
-#: builtin/clean.c:679
+#: builtin/clean.c:677
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ange ignoreringsmönster>>"
-#: builtin/clean.c:716
+#: builtin/clean.c:714
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "VARNING: Hittar inte poster som motsvarar: %s"
-#: builtin/clean.c:737
+#: builtin/clean.c:735
msgid "Select items to delete"
msgstr "Välj poster att ta bort"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:778
+#: builtin/clean.c:776
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Ta bort %s [Y=ja / N=nej]?"
-#: builtin/clean.c:803
+#: builtin/clean.c:801
msgid "Bye."
msgstr "Hej då."
-#: builtin/clean.c:811
+#: builtin/clean.c:809
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -4352,62 +4401,62 @@ msgstr ""
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:838
+#: builtin/clean.c:836
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: builtin/clean.c:839
+#: builtin/clean.c:837
msgid "What now"
msgstr "Vad nu"
-#: builtin/clean.c:847
+#: builtin/clean.c:845
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Skulle ta bort följande post:"
msgstr[1] "Skulle ta bort följande poster:"
-#: builtin/clean.c:864
+#: builtin/clean.c:862
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
-#: builtin/clean.c:895
+#: builtin/clean.c:893
msgid "do not print names of files removed"
msgstr "skriv inte ut namn på borttagna filer"
-#: builtin/clean.c:897
+#: builtin/clean.c:895
msgid "force"
msgstr "tvinga"
-#: builtin/clean.c:898
+#: builtin/clean.c:896
msgid "interactive cleaning"
msgstr "städa interaktivt"
-#: builtin/clean.c:900
+#: builtin/clean.c:898
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
msgid "pattern"
msgstr "mönster"
-#: builtin/clean.c:902
+#: builtin/clean.c:900
msgid "add <pattern> to ignore rules"
msgstr "lägg till <mönster> till ignoreringsregler"
-#: builtin/clean.c:903
+#: builtin/clean.c:901
msgid "remove ignored files, too"
msgstr "ta även bort ignorerade filer"
-#: builtin/clean.c:905
+#: builtin/clean.c:903
msgid "remove only ignored files"
msgstr "ta endast bort ignorerade filer"
-#: builtin/clean.c:923
+#: builtin/clean.c:921
msgid "-x and -X cannot be used together"
msgstr "-x och -X kan inte användas samtidigt"
-#: builtin/clean.c:927
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -4415,7 +4464,7 @@ msgstr ""
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
-#: builtin/clean.c:930
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -4427,16 +4476,11 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
-#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
-msgid "force progress reporting"
-msgstr "tvinga förloppsrapportering"
-
#: builtin/clone.c:59
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
@@ -4460,15 +4504,15 @@ msgstr "skapa som ett delat arkiv"
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:75 builtin/init-db.c:501
+#: builtin/clone.c:75 builtin/init-db.c:466
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:76 builtin/init-db.c:502
+#: builtin/clone.c:76 builtin/init-db.c:467
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:78
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
msgid "reference repository"
msgstr "referensarkiv"
@@ -4492,7 +4536,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD"
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
#: builtin/pull.c:186
msgid "depth"
msgstr "djup"
@@ -4505,11 +4549,11 @@ msgstr "skapa en grund klon på detta djup"
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
-#: builtin/clone.c:91 builtin/init-db.c:510
+#: builtin/clone.c:91 builtin/init-db.c:475
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:92 builtin/init-db.c:511
+#: builtin/clone.c:92 builtin/init-db.c:476
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
@@ -4521,52 +4565,57 @@ msgstr "nyckel=värde"
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:298
+#: builtin/clone.c:300
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
+
+#: builtin/clone.c:302
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: builtin/clone.c:302
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: builtin/clone.c:305
+#: builtin/clone.c:310
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: builtin/clone.c:370 builtin/diff.c:84
+#: builtin/clone.c:375 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: builtin/clone.c:372
+#: builtin/clone.c:377
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:386
+#: builtin/clone.c:391
#, c-format
msgid "failed to stat %s\n"
msgstr "misslyckades ta status på %s\n"
-#: builtin/clone.c:408
+#: builtin/clone.c:413
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:412
+#: builtin/clone.c:417
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:435 builtin/clone.c:619
+#: builtin/clone.c:442 builtin/clone.c:626
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:447
+#: builtin/clone.c:454
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4576,124 +4625,120 @@ msgstr ""
"Du kan inspektera det som checkades ut med \"git status\"\n"
"och försöka checka ut igen med \"git checkout -f HEAD\"\n"
-#: builtin/clone.c:524
+#: builtin/clone.c:531
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
# Vague original, not networking-related, but rather related to the actual
# objects downloaded.
-#: builtin/clone.c:614
+#: builtin/clone.c:621
#, c-format
msgid "Checking connectivity... "
msgstr "Kontrollerar om vi fick alla objekt..."
-#: builtin/clone.c:617
+#: builtin/clone.c:624
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: builtin/clone.c:681
+#: builtin/clone.c:688
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
-#: builtin/clone.c:712
+#: builtin/clone.c:719
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:799
+#: builtin/clone.c:808
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:801
+#: builtin/clone.c:810
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:831
+#: builtin/clone.c:842
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:835
+#: builtin/clone.c:846
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:846
+#: builtin/clone.c:857
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:849
+#: builtin/clone.c:860
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:862
+#: builtin/clone.c:873
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:868 builtin/fetch.c:1168
+#: builtin/clone.c:879 builtin/fetch.c:1166
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:878
+#: builtin/clone.c:889
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
-#: builtin/clone.c:888
+#: builtin/clone.c:899
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
-#: builtin/worktree.c:245
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:906
+#: builtin/clone.c:917
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:924
+#: builtin/clone.c:935
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:926
+#: builtin/clone.c:937
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:951
-msgid "--dissociate given, but there is no --reference"
-msgstr "--dissociate angavs, men --reference har inte angivits"
-
-#: builtin/clone.c:968
+#: builtin/clone.c:975
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
-#: builtin/clone.c:971
+#: builtin/clone.c:978
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:976
+#: builtin/clone.c:983
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:980
+#: builtin/clone.c:987
#, c-format
msgid "Don't know how to clone %s"
msgstr "Vet inte hur man klonar %s"
-#: builtin/clone.c:1029 builtin/clone.c:1037
+#: builtin/clone.c:1036 builtin/clone.c:1044
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1040
+#: builtin/clone.c:1047
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
@@ -4729,15 +4774,15 @@ msgstr "Spaltfyllnad mellan spalter"
msgid "--command must be the first argument"
msgstr "--command måste vara första argument"
-#: builtin/commit.c:37
+#: builtin/commit.c:38
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<flaggor>] [--] <sökväg>..."
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<flaggor>] [--] <sökväg>..."
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4764,7 +4809,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:60
+#: builtin/commit.c:61
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4789,7 +4834,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
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"
@@ -4799,7 +4844,7 @@ msgstr ""
"blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
"så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
-#: builtin/commit.c:77
+#: builtin/commit.c:78
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4813,11 +4858,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:84
+#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
msgstr "Använd annars \"git reset\"\n"
-#: builtin/commit.c:87
+#: builtin/commit.c:88
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4833,66 +4878,66 @@ msgstr ""
"\"git cherry-pick --continue\" kommer därefter att återuppta\n"
"cherry-pick för återstående incheckningar.\n"
-#: builtin/commit.c:304
+#: builtin/commit.c:305
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:345
+#: builtin/commit.c:346
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:351
+#: builtin/commit.c:352
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:364
+#: builtin/commit.c:365
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:366
+#: builtin/commit.c:367
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:444
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:446
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
-#: builtin/commit.c:455
+#: builtin/commit.c:456
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:474
+#: builtin/commit.c:475
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:579
+#: builtin/commit.c:580
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:581
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:600
+#: builtin/commit.c:601
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:608
+#: builtin/commit.c:609
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
-#: builtin/commit.c:652
+#: builtin/commit.c:653
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -4900,38 +4945,38 @@ msgstr ""
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:701 builtin/shortlog.c:273
+#: builtin/commit.c:702 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:703
+#: builtin/commit.c:704
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:707
+#: builtin/commit.c:708
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:729
+#: builtin/commit.c:730
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:733
+#: builtin/commit.c:734
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:784
+#: builtin/commit.c:785
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:802
+#: builtin/commit.c:803
#, c-format
msgid ""
"\n"
@@ -4946,7 +4991,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:807
+#: builtin/commit.c:808
#, c-format
msgid ""
"\n"
@@ -4961,7 +5006,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4971,7 +5016,7 @@ msgstr ""
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:827
+#: builtin/commit.c:828
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4982,145 +5027,146 @@ msgstr ""
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
"Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/commit.c:847
+#: builtin/commit.c:848
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:855
+#: builtin/commit.c:856
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:862
+#: builtin/commit.c:863
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:937
+#: builtin/commit.c:938
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:952 builtin/tag.c:495
+#: builtin/commit.c:953 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
-#: builtin/commit.c:1054
+#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
-#: builtin/commit.c:1069 builtin/commit.c:1309
+#: builtin/commit.c:1070 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1106
+#: builtin/commit.c:1107
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1136
+#: builtin/commit.c:1137
msgid "Using both --reset-author and --author does not make sense"
msgstr "Kan inte använda både --reset-author och --author"
-#: builtin/commit.c:1145
+#: builtin/commit.c:1146
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
-#: builtin/commit.c:1150
+#: builtin/commit.c:1151
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
-#: builtin/commit.c:1153
+#: builtin/commit.c:1154
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1163
+#: builtin/commit.c:1164
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Endast en av -c/-C/-F/--fixup kan användas."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
-#: builtin/commit.c:1173
+#: builtin/commit.c:1174
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author kan endast användas med -C, -c eller --amend."
-#: builtin/commit.c:1190
+#: builtin/commit.c:1191
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Endast en av --include/--only/--all/--interactive/--patch kan användas."
-#: builtin/commit.c:1192
+#: builtin/commit.c:1193
msgid "No paths with --include/--only does not make sense."
msgstr "Du måste ange sökvägar tillsammans med --include/--only."
-#: builtin/commit.c:1194
+#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
msgstr "Smart... utöka den senaste med smutsigt index."
-#: builtin/commit.c:1196
+#: builtin/commit.c:1197
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
-#: builtin/commit.c:1208 builtin/tag.c:730
+#: builtin/commit.c:1209 builtin/tag.c:475
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
-#: builtin/commit.c:1213
+#: builtin/commit.c:1214
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
-#: builtin/commit.c:1323 builtin/commit.c:1602
+#: builtin/commit.c:1324 builtin/commit.c:1605
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1325 builtin/commit.c:1604
+#: builtin/commit.c:1326 builtin/commit.c:1607
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
+#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1330 builtin/commit.c:1608
+#: builtin/commit.c:1331 builtin/commit.c:1611
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1333 builtin/commit.c:1611
+#: builtin/commit.c:1334 builtin/commit.c:1614
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:604
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1336 builtin/commit.c:1614
+#: builtin/commit.c:1337 builtin/commit.c:1617
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"
-#: builtin/commit.c:1339
+#: builtin/commit.c:1340
msgid "show ignored files"
msgstr "visa ignorerade filer"
-#: builtin/commit.c:1340 parse-options.h:155
+#: builtin/commit.c:1341 parse-options.h:155
msgid "when"
msgstr "när"
-#: builtin/commit.c:1341
+#: builtin/commit.c:1342
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5128,196 +5174,201 @@ msgstr ""
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1344
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1429
+#: builtin/commit.c:1430
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1432
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1477
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1480
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: builtin/commit.c:1572
+#: builtin/commit.c:1575
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1576
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1578
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1576 builtin/tag.c:602
+#: builtin/commit.c:1579 builtin/tag.c:351
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1578 builtin/gc.c:268
+#: builtin/commit.c:1581 builtin/gc.c:326
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1581
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
-#: builtin/notes.c:555 builtin/tag.c:600
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
msgid "message"
msgstr "meddelande"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1582
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr "incheckning"
+
+#: builtin/commit.c:1583
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1584
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1585
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1586
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att slå ihop med angiven "
"incheckning"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1587
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
-#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1589
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1590
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1591
msgid "default"
msgstr "standard"
-#: builtin/commit.c:1588 builtin/tag.c:605
+#: builtin/commit.c:1591 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1592
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1597
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1598
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1599
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1600
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1601
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1602
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1603
msgid "bypass pre-commit hook"
msgstr "förbigå pre-commit-krok"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1604
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1615
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1616
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1621
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1623
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: builtin/commit.c:1695
+#: builtin/commit.c:1698
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1702
+#: builtin/commit.c:1705
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1721
+#: builtin/commit.c:1724
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1732
+#: builtin/commit.c:1735
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1737
+#: builtin/commit.c:1740
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1788
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5456,11 +5507,11 @@ msgstr "visa endast variabelnamn"
msgid "respect include directives on lookup"
msgstr "respektera inkluderingsdirektiv vid uppslag"
-#: builtin/config.c:311
+#: builtin/config.c:303
msgid "unable to parse default color value"
msgstr "kan inte tolka standardfärgvärde"
-#: builtin/config.c:449
+#: builtin/config.c:441
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5475,16 +5526,16 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:583
+#: builtin/config.c:575
#, c-format
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
-#: builtin/count-objects.c:55
+#: builtin/count-objects.c:77
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:65
+#: builtin/count-objects.c:87
msgid "print sizes in human readable format"
msgstr "skriv storlekar i människoläsbart format"
@@ -5604,7 +5655,7 @@ msgstr "överväg de <n> nyaste taggarna (standard: 10)"
msgid "only consider tags matching <pattern>"
msgstr "överväg endast taggar som motsvarar <mönster>"
-#: builtin/describe.c:410 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:314
msgid "show abbreviated commit object as fallback"
msgstr "visa förkortade incheckningsobjekt som standard"
@@ -5823,7 +5874,7 @@ msgstr "[àjour]"
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"
-#: builtin/fetch.c:478 builtin/fetch.c:564
+#: builtin/fetch.c:478 builtin/fetch.c:566
msgid "[rejected]"
msgstr "[refuserad]"
@@ -5847,39 +5898,39 @@ msgstr "[ny gren]"
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:566
+#: builtin/fetch.c:568
msgid "(non-fast-forward)"
msgstr "(ej snabbspolad)"
-#: builtin/fetch.c:600 builtin/fetch.c:842
+#: builtin/fetch.c:602 builtin/fetch.c:843
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:611
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s sände inte alla nödvändiga objekt\n"
-#: builtin/fetch.c:627
+#: builtin/fetch.c:629
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
-#: builtin/fetch.c:715 builtin/fetch.c:807
+#: builtin/fetch.c:716 builtin/fetch.c:808
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:726
+#: builtin/fetch.c:727
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -5888,55 +5939,55 @@ msgstr ""
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
-#: builtin/fetch.c:778
+#: builtin/fetch.c:779
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:811
+#: builtin/fetch.c:812
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:812 builtin/remote.c:1034
+#: builtin/fetch.c:813 builtin/remote.c:1040
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:832
+#: builtin/fetch.c:833
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:854
+#: builtin/fetch.c:855
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:910
+#: builtin/fetch.c:911
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Vet inte hur man hämtar från %s"
-#: builtin/fetch.c:1071
+#: builtin/fetch.c:1072
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1073 builtin/remote.c:90
+#: builtin/fetch.c:1074 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1091
+#: builtin/fetch.c:1092
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -5944,32 +5995,32 @@ msgstr ""
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
-#: builtin/fetch.c:1114
+#: builtin/fetch.c:1115
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1156
+#: builtin/fetch.c:1157
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1159
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1179
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:1183
+#: builtin/fetch.c:1181
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1192
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:1202
+#: builtin/fetch.c:1200
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
@@ -5979,23 +6030,23 @@ msgid ""
msgstr ""
"git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:667
msgid "populate log with at most <n> entries from shortlog"
msgstr "fyll i loggen med som mest <n> poster från shortlog"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:670
msgid "alias for --log (deprecated)"
msgstr "alias för --log (avråds)"
-#: builtin/fmt-merge-msg.c:676
+#: builtin/fmt-merge-msg.c:673
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:674
msgid "use <text> as start of message"
msgstr "inled meddelande med <text>"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:675
msgid "file to read from"
msgstr "fil att läsa från"
@@ -6003,99 +6054,119 @@ msgstr "fil att läsa från"
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<flaggor>] [<mönster>]"
-#: builtin/for-each-ref.c:24
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <objekt>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<objekt>]]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr "git for-each-ref [--contains [<objekt>]]"
+
+#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr "citera platshållare passande för skal"
-#: builtin/for-each-ref.c:26
+#: builtin/for-each-ref.c:29
msgid "quote placeholders suitably for perl"
msgstr "citera platshållare passande för perl"
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for python"
msgstr "citera platshållare passande för python"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for Tcl"
msgstr "citera platshållare passande för Tcl"
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:36
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
msgid "format to use for the output"
msgstr "format att använda för utdata"
-#: builtin/for-each-ref.c:35
-msgid "key"
-msgstr "nyckel"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
+msgstr "visa endast referenser som pekar på objektet"
-#: builtin/for-each-ref.c:36
-msgid "field name to sort on"
-msgstr "fältnamn att sortera på"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr "visa endast referenser som slagits samman"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr "visa endast referenser som ej slagits samman"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr "visa endast referenser som innehåller incheckningen"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:163 builtin/prune.c:137
+#: builtin/fsck.c:156 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:486
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:553
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<flaggor>] [<objekt>...]"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:559
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:560
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:561
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:640
+#: builtin/fsck.c:562
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:641
+#: builtin/fsck.c:563
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:642
+#: builtin/fsck.c:564
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:643
+#: builtin/fsck.c:565
msgid "also consider packs and alternate objects"
msgstr "ta även hänsyn till paket och alternativa objekt"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:644
+#: builtin/fsck.c:566
msgid "check only connectivity"
msgstr "kontrollera endast konnektivitet"
-#: builtin/fsck.c:645
+#: builtin/fsck.c:567
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:647
+#: builtin/fsck.c:569
msgid "write dangling objects in .git/lost-found"
msgstr "skriv dinglande objekt i .git/lost-found"
-#: builtin/fsck.c:648 builtin/prune.c:107
+#: builtin/fsck.c:570 builtin/prune.c:107
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:631
msgid "Checking objects"
msgstr "Kontrollerar objekt"
@@ -6103,48 +6174,63 @@ msgstr "Kontrollerar objekt"
msgid "git gc [<options>]"
msgstr "git gc [<flaggor>]"
-#: builtin/gc.c:55
+#: builtin/gc.c:72
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: builtin/gc.c:100
+#: builtin/gc.c:139
#, c-format
msgid "insanely long object directory %.*s"
msgstr "tokigt lång objektkatalog %.*s"
-#: builtin/gc.c:269
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"Senaste körningen av git gc rapporterade följande. Fixa grundproblemet\n"
+"och ta bort %s.\n"
+"Automatisk städning kommer inte utföras förrän filen tas bort.\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:327
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
-#: builtin/gc.c:271
+#: builtin/gc.c:329
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
-#: builtin/gc.c:272
+#: builtin/gc.c:330
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:273
+#: builtin/gc.c:331
msgid "force running gc even if there may be another gc running"
msgstr "tvinga gc-körning även om en annan gc kanske körs"
-#: builtin/gc.c:315
+#: builtin/gc.c:373
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
-#: builtin/gc.c:317
+#: builtin/gc.c:375
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
-#: builtin/gc.c:318
+#: builtin/gc.c:376
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Se \"git help gc\" för manuell hushållning.\n"
-#: builtin/gc.c:336
+#: builtin/gc.c:397
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -6152,7 +6238,7 @@ msgstr ""
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
"är fallet)"
-#: builtin/gc.c:364
+#: builtin/gc.c:441
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -6188,199 +6274,195 @@ msgstr "flaggan \"%c\" antar ett numeriskt värde"
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: builtin/grep.c:638
+#: builtin/grep.c:633
msgid "search in index instead of in the work tree"
msgstr "sök i indexet istället för i arbetskatalogen"
-#: builtin/grep.c:640
+#: builtin/grep.c:635
msgid "find in contents not managed by git"
msgstr "sök i innehåll som inte hanteras av git"
-#: builtin/grep.c:642
+#: builtin/grep.c:637
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
-#: builtin/grep.c:644
+#: builtin/grep.c:639
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:647
+#: builtin/grep.c:642
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:649
+#: builtin/grep.c:644
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:651
+#: builtin/grep.c:646
msgid "match patterns only at word boundaries"
msgstr "matcha endast mönster vid ordgränser"
-#: builtin/grep.c:653
+#: builtin/grep.c:648
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:655
+#: builtin/grep.c:650
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:658
+#: builtin/grep.c:653
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:660
+#: builtin/grep.c:655
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:664
+#: builtin/grep.c:659
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:667
+#: builtin/grep.c:662
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:670
+#: builtin/grep.c:665
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:673
+#: builtin/grep.c:668
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:676
+#: builtin/grep.c:671
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:677
+#: builtin/grep.c:672
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:678
+#: builtin/grep.c:673
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:680
+#: builtin/grep.c:675
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:682
+#: builtin/grep.c:677
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:684
+#: builtin/grep.c:679
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:687
+#: builtin/grep.c:682
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:689
+#: builtin/grep.c:684
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:691
+#: builtin/grep.c:686
msgid "show the number of matches instead of matching lines"
msgstr "visa antal träffar istället för träffade rader"
-#: builtin/grep.c:692
+#: builtin/grep.c:687
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:694
+#: builtin/grep.c:689
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:696
+#: builtin/grep.c:691
msgid "show filename only once above matches from same file"
msgstr "visa filnamn endast en gång ovanför träffar från samma fil"
-#: builtin/grep.c:699
+#: builtin/grep.c:694
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:702
+#: builtin/grep.c:697
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:704
+#: builtin/grep.c:699
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:705
+#: builtin/grep.c:700
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:708
+#: builtin/grep.c:703
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:710
+#: builtin/grep.c:705
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:713
+#: builtin/grep.c:708
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:715
+#: builtin/grep.c:710
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:717
+#: builtin/grep.c:712
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:729
+#: builtin/grep.c:724
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:731
+#: builtin/grep.c:726
msgid "show only matches from files that match all patterns"
msgstr "visa endast träffar från filer som träffar alla mönster"
-#: builtin/grep.c:733
+#: builtin/grep.c:728
msgid "show parse tree for grep expression"
msgstr "visa analysträd för grep-uttryck"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:740
+#: builtin/grep.c:735
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:741 builtin/show-ref.c:189
-msgid "show usage"
-msgstr "visa användning"
-
-#: builtin/grep.c:808
+#: builtin/grep.c:793
msgid "no pattern given."
msgstr "inget mönster angavs."
-#: builtin/grep.c:866
+#: builtin/grep.c:851
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:892
+#: builtin/grep.c:877
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached och --untracked kan inte användas med --no-index."
-#: builtin/grep.c:897
+#: builtin/grep.c:882
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index och --untracked kan inte användas med revisioner."
-#: builtin/grep.c:900
+#: builtin/grep.c:885
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."
-#: builtin/grep.c:908
+#: builtin/grep.c:893
msgid "both --cached and trees are given."
msgstr "både --cached och träd angavs."
@@ -6393,10 +6475,10 @@ msgstr ""
"<fil>..."
#: builtin/hash-object.c:81
-msgid "git hash-object --stdin-paths < <list-of-paths>"
-msgstr "git hash-object --stdin-paths < <sökvägslista>"
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:92 builtin/tag.c:614
+#: builtin/hash-object.c:92
msgid "type"
msgstr "typ"
@@ -6468,12 +6550,12 @@ msgstr "Kunde inte tolka emacsclient-version."
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient version \"%d\" för gammal (< 22)."
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
msgid "failed to exec '%s': %s"
msgstr "exec misslyckades för \"%s\": %s"
-#: builtin/help.c:215
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -6482,7 +6564,7 @@ msgstr ""
"\"%s\": sökväg för man-visare som ej stöds.\n"
"Använd \"man.<verktyg>.cmd\" istället."
-#: builtin/help.c:227
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -6491,61 +6573,61 @@ msgstr ""
"\"%s\": kommando för man-visare som stöds.\n"
"Använd \"man.<verktyg>.path\" istället."
-#: builtin/help.c:354
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr "\"%s\": okänd man-visare."
-#: builtin/help.c:371
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr "ingen man-visare hanterade förfrågan"
-#: builtin/help.c:379
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:428
+#: builtin/help.c:411
msgid "Defining attributes per path"
msgstr "Definierar attribut per sökväg"
-#: builtin/help.c:429
+#: builtin/help.c:412
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git för dagligt bruk i ungefär 20 kommandon"
-#: builtin/help.c:430
+#: builtin/help.c:413
msgid "A Git glossary"
msgstr "En Git-ordlista"
-#: builtin/help.c:431
+#: builtin/help.c:414
msgid "Specifies intentionally untracked files to ignore"
msgstr "Ange avsiktligen ospårade filer att ignorera"
-#: builtin/help.c:432
+#: builtin/help.c:415
msgid "Defining submodule properties"
msgstr "Ange egenskaper för undermoduler"
-#: builtin/help.c:433
+#: builtin/help.c:416
msgid "Specifying revisions and ranges for Git"
msgstr "Ange versioner och intervall i Git"
-#: builtin/help.c:434
+#: builtin/help.c:417
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Introduktion till Git (för version 1.5.1 och senare)"
-#: builtin/help.c:435
+#: builtin/help.c:418
msgid "An overview of recommended workflows with Git"
msgstr "Översikt över rekommenderade arbetsflöden med Git"
-#: builtin/help.c:447
+#: builtin/help.c:430
msgid "The common Git guides are:\n"
msgstr "De vanliga Git-vägledningarna är:\n"
-#: builtin/help.c:468 builtin/help.c:485
+#: builtin/help.c:451 builtin/help.c:468
#, c-format
msgid "usage: %s%s"
msgstr "användning: %s%s"
-#: builtin/help.c:501
+#: builtin/help.c:484
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "\"git %s\" är ett alias för \"%s\""
@@ -6838,87 +6920,62 @@ msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
-#: builtin/init-db.c:36
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Kunde inte göra %s skrivbar för gruppen"
-
-#: builtin/init-db.c:63
-#, c-format
-msgid "insanely long template name %s"
-msgstr "tokigt långt namn på mallen %s"
-
-#: builtin/init-db.c:68
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: builtin/init-db.c:74
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "kan inte ta status på mallen \"%s\""
-#: builtin/init-db.c:81
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "kan inte öppna katalogen (opendir) \"%s\""
-#: builtin/init-db.c:98
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr "kan inte läsa länk (readlink) \"%s\""
-#: builtin/init-db.c:100
-#, c-format
-msgid "insanely long symlink %s"
-msgstr "tokigt lång symbolisk länk %s"
-
-#: builtin/init-db.c:103
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""
-#: builtin/init-db.c:107
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "kan inte kopiera \"%s\" till \"%s\""
-#: builtin/init-db.c:111
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr "ignorerar mallen %s"
-#: builtin/init-db.c:137
-#, c-format
-msgid "insanely long template path %s"
-msgstr "tokigt lång mallsökväg %s"
-
-#: builtin/init-db.c:145
+#: builtin/init-db.c:118
#, c-format
msgid "templates not found %s"
msgstr "mallarna hittades inte %s"
-#: builtin/init-db.c:158
+#: builtin/init-db.c:131
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\""
-#: builtin/init-db.c:212
-#, c-format
-msgid "insane git directory %s"
-msgstr "tokig git-katalog %s"
-
-#: builtin/init-db.c:344 builtin/init-db.c:347
+#: builtin/init-db.c:309 builtin/init-db.c:312
#, c-format
msgid "%s already exists"
msgstr "%s finns redan"
-#: builtin/init-db.c:375
+#: builtin/init-db.c:340
#, c-format
msgid "unable to handle file type %d"
msgstr "kan inte hantera filtyp %d"
-#: builtin/init-db.c:378
+#: builtin/init-db.c:343
#, c-format
msgid "unable to move %s to %s"
msgstr "kan inte flytta %s till %s"
@@ -6926,24 +6983,24 @@ msgstr "kan inte flytta %s till %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:434
+#: builtin/init-db.c:399
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s Git-arkiv i %s%s\n"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Reinitialized existing"
msgstr "Ominitierade befintligt"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Initialized empty"
msgstr "Initierade tomt"
-#: builtin/init-db.c:436
+#: builtin/init-db.c:401
msgid " shared"
msgstr " delat"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:448
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -6951,25 +7008,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
"shared[=<behörigheter>]] [<katalog>]"
-#: builtin/init-db.c:506
+#: builtin/init-db.c:471
msgid "permissions"
msgstr "behörigheter"
-#: builtin/init-db.c:507
+#: builtin/init-db.c:472
msgid "specify that the git repository is to be shared amongst several users"
msgstr "ange att git-arkivet skall delas bland flera användare"
-#: builtin/init-db.c:541 builtin/init-db.c:546
+#: builtin/init-db.c:506 builtin/init-db.c:511
#, c-format
msgid "cannot mkdir %s"
msgstr "kan inte skapa katalogen (mkdir) %s"
-#: builtin/init-db.c:550
+#: builtin/init-db.c:515
#, c-format
msgid "cannot chdir to %s"
msgstr "kan inte byta katalog (chdir) till %s"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:536
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -6978,7 +7035,7 @@ msgstr ""
"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
"dir=<katalog>)"
-#: builtin/init-db.c:599
+#: builtin/init-db.c:564
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
@@ -7064,33 +7121,33 @@ msgstr "format.headers utan värde"
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:814
+#: builtin/log.c:813
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kan inte öppna patchfilen %s"
-#: builtin/log.c:828
+#: builtin/log.c:827
msgid "Need exactly one range."
msgstr "Behöver precis ett intervall."
-#: builtin/log.c:838
+#: builtin/log.c:837
msgid "Not a range."
msgstr "Inte ett intervall."
-#: builtin/log.c:944
+#: builtin/log.c:943
msgid "Cover letter needs email format"
msgstr "Omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1023
+#: builtin/log.c:1022
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1051
+#: builtin/log.c:1050
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1096
+#: builtin/log.c:1095
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
@@ -7147,134 +7204,138 @@ msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr "använd hashvärde med nollor i From-huvud"
+
+#: builtin/log.c:1243
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1243
+#: builtin/log.c:1245
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1245
+#: builtin/log.c:1247
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1246
+#: builtin/log.c:1248
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1247
+#: builtin/log.c:1249
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1248 builtin/log.c:1250
+#: builtin/log.c:1250 builtin/log.c:1252
msgid "email"
msgstr "epost"
-#: builtin/log.c:1248
+#: builtin/log.c:1250
msgid "add To: header"
msgstr "Lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1250
+#: builtin/log.c:1252
msgid "add Cc: header"
msgstr "Lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1252
+#: builtin/log.c:1254
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1253
+#: builtin/log.c:1255
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
-#: builtin/log.c:1255
+#: builtin/log.c:1257
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1256
+#: builtin/log.c:1258
msgid "make first mail a reply to <message-id>"
msgstr "Gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1257 builtin/log.c:1260
+#: builtin/log.c:1259 builtin/log.c:1262
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1258
+#: builtin/log.c:1260
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1261
+#: builtin/log.c:1263
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1265
+#: builtin/log.c:1267
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1267
+#: builtin/log.c:1269
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1268
+#: builtin/log.c:1270
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1270
+#: builtin/log.c:1272
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1271
+#: builtin/log.c:1273
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1360
+#: builtin/log.c:1362
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
-#: builtin/log.c:1362
+#: builtin/log.c:1364
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix och -k kan inte användas samtidigt."
-#: builtin/log.c:1370
+#: builtin/log.c:1372
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1372
+#: builtin/log.c:1374
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1374
+#: builtin/log.c:1376
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1397
+#: builtin/log.c:1401
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1399
+#: builtin/log.c:1403
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
-#: builtin/log.c:1496
+#: builtin/log.c:1500
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:1559
+#: builtin/log.c:1563
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
-#: builtin/log.c:1607
+#: builtin/log.c:1611
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:1661
+#: builtin/log.c:1665
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
-#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
+#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
@@ -7375,35 +7436,35 @@ msgstr "visa felsökningsutdata"
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "visa endast träd"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "rekursera ner i underträd"
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "visa träd medan rekursering"
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "terminera poster med NUL-byte"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "inkludera objektstorlek"
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "visa endast filnamn"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "använd fullständiga sökvägsnamn"
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
@@ -7638,16 +7699,16 @@ msgstr "Ingen standarduppström angiven för aktuell gren."
msgid "No remote-tracking branch for %s from %s"
msgstr "Ingen fjärrspårande gren för %s från %s"
-#: builtin/merge.c:1081
+#: builtin/merge.c:1079
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: builtin/merge.c:1208
+#: builtin/merge.c:1206
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1224
+#: builtin/merge.c:1222
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7655,7 +7716,7 @@ msgstr ""
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1231
+#: builtin/merge.c:1229
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7663,53 +7724,53 @@ msgstr ""
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1234
+#: builtin/merge.c:1232
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
-#: builtin/merge.c:1243
+#: builtin/merge.c:1241
msgid "You cannot combine --squash with --no-ff."
msgstr "Du kan inte kombinera --squash med --no-ff."
-#: builtin/merge.c:1251
+#: builtin/merge.c:1249
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1268
+#: builtin/merge.c:1266
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1268
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
-#: builtin/merge.c:1276
+#: builtin/merge.c:1274
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1278
+#: builtin/merge.c:1276
msgid "Can merge only exactly one commit into empty head"
msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."
-#: builtin/merge.c:1333
+#: builtin/merge.c:1331
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
-#: builtin/merge.c:1336
+#: builtin/merge.c:1334
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: builtin/merge.c:1342
+#: builtin/merge.c:1340
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
@@ -7719,46 +7780,46 @@ msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1462
+#: builtin/merge.c:1460
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1469
+#: builtin/merge.c:1467
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1501
+#: builtin/merge.c:1499
msgid "Not possible to fast-forward, aborting."
msgstr "Kan inte snabbspola, avbryter."
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1528
+#: builtin/merge.c:1526
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1592
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1596
+#: builtin/merge.c:1594
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1603
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Använder %s för att förbereda lösning för hand.\n"
-#: builtin/merge.c:1617
+#: builtin/merge.c:1615
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -7948,48 +8009,48 @@ msgstr "%s, källa=%s, mål=%s"
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
-#: builtin/name-rev.c:255
+#: builtin/name-rev.c:251
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<flaggor>] <incheckning>..."
-#: builtin/name-rev.c:256
+#: builtin/name-rev.c:252
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<flaggor>] --all"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:253
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<flaggor>] --stdin"
-#: builtin/name-rev.c:309
+#: builtin/name-rev.c:305
msgid "print only names (no SHA-1)"
msgstr "skriv endast namn (ingen SHA-1)"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:306
msgid "only use tags to name the commits"
msgstr "använd endast taggar för att namnge incheckningar"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:308
msgid "only use refs matching <pattern>"
msgstr "använd endast referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:310
msgid "list all commits reachable from all refs"
msgstr "lista alla incheckningar som kan nås alla referenser"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:311
msgid "read from stdin"
msgstr "läs från standard in"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:312
msgid "allow to print `undefined` names (default)"
msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
-#: builtin/name-rev.c:322
+#: builtin/name-rev.c:318
msgid "dereference tags in the input (internal use)"
msgstr "avreferera taggar i indata (används internt)"
@@ -8119,7 +8180,7 @@ msgstr "kunde inte läsa utdata från \"show\""
msgid "failed to finish 'show' for object '%s'"
msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
-#: builtin/notes.c:174 builtin/tag.c:477
+#: builtin/notes.c:174 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
@@ -8137,12 +8198,12 @@ msgstr "kunde inte skriva anteckningsobjekt"
msgid "The note contents have been left in %s"
msgstr "Anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:232 builtin/tag.c:695
+#: builtin/notes.c:232 builtin/tag.c:440
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/notes.c:234 builtin/tag.c:698
+#: builtin/notes.c:234 builtin/tag.c:443
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
@@ -8150,7 +8211,7 @@ msgstr "kunde inte öppna eller läsa \"%s\""
#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
-#: builtin/notes.c:877 builtin/tag.c:711
+#: builtin/notes.c:877 builtin/tag.c:456
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
@@ -8184,11 +8245,6 @@ msgstr "anteckningsinnehåll som sträng"
msgid "note contents in a file"
msgstr "anteckningsinnehåll i en fil"
-#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
-#: builtin/notes.c:564 builtin/tag.c:630
-msgid "object"
-msgstr "objekt"
-
#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr "återanvänd och redigera angivet anteckningsobjekt"
@@ -8319,7 +8375,7 @@ msgstr "anteckningar-ref"
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1012 builtin/remote.c:1588
+#: builtin/notes.c:1012 builtin/remote.c:1647
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Okänt underkommando: %s"
@@ -8527,30 +8583,30 @@ msgstr "Tar bort duplicerade objekt"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]"
-#: builtin/prune.c:105 builtin/worktree.c:121
+#: builtin/prune.c:105 builtin/worktree.c:124
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
-#: builtin/prune.c:106 builtin/worktree.c:122
+#: builtin/prune.c:106 builtin/worktree.c:125
msgid "report pruned objects"
msgstr "rapportera borttagna objekt"
-#: builtin/prune.c:109 builtin/worktree.c:124
+#: builtin/prune.c:109 builtin/worktree.c:127
msgid "expire objects older than <time>"
msgstr "låt tid gå ut för objekt äldre än <tid>"
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
+
#: builtin/pull.c:69
-msgid "git pull [options] [<repository> [<refspec>...]]"
-msgstr "git pull [flaggor] [<arkiv> [<refspec>...]]"
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
#: builtin/pull.c:113
msgid "Options related to merging"
msgstr "Alternativ gällande sammanslagning"
-#: builtin/pull.c:115
-msgid "false|true|preserve"
-msgstr "false|true|preserve"
-
#: builtin/pull.c:116
msgid "incorporate changes by rebasing rather than merging"
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
@@ -8699,19 +8755,19 @@ msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/push.c:15
+#: builtin/push.c:16
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/push.c:86
+#: builtin/push.c:88
msgid "tag shorthand without <tag>"
msgstr "taggförkortning utan <tagg>"
-#: builtin/push.c:96
+#: builtin/push.c:98
msgid "--delete only accepts plain target ref names"
msgstr "--delete godtar endast enkla målreferensnamn"
-#: builtin/push.c:140
+#: builtin/push.c:142
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -8720,7 +8776,7 @@ msgstr ""
"För att välja ett av alternativen permanent, se push.default i \"git help "
"config\"."
-#: builtin/push.c:143
+#: builtin/push.c:145
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -8745,7 +8801,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:158
+#: builtin/push.c:160
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -8760,7 +8816,7 @@ msgstr ""
"\n"
" git push %s HEAD:<namn-på-fjärrgren>\n"
-#: builtin/push.c:172
+#: builtin/push.c:174
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -8773,12 +8829,12 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:180
+#: builtin/push.c:182
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -8789,7 +8845,7 @@ msgstr ""
"aktuella grenen \"%s\", utan att tala om för mig vad som\n"
"skall sändas för att uppdatera fjärrgrenen."
-#: builtin/push.c:206
+#: builtin/push.c:208
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -8837,14 +8893,14 @@ msgstr ""
"liknande läget \"current\" istället för \"simple\" om du ibland använder\n"
"äldre versioner av Git.)"
-#: builtin/push.c:273
+#: builtin/push.c:275
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Du angav inga referensspecifikationer att sända, och push.default är "
"\"nothing\"."
-#: builtin/push.c:280
+#: builtin/push.c:282
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -8856,7 +8912,7 @@ msgstr ""
"\"git pull ....\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:286
+#: builtin/push.c:288
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -8868,7 +8924,7 @@ msgstr ""
"\"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:292
+#: builtin/push.c:294
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -8882,11 +8938,11 @@ msgstr ""
"(t.ex. \"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."
-#: builtin/push.c:299
+#: builtin/push.c:301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren."
-#: builtin/push.c:302
+#: builtin/push.c:304
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -8897,22 +8953,22 @@ msgstr ""
"pekar på något som inte är en incheckning, utan att använda flaggan\n"
"\"--force\".\n"
-#: builtin/push.c:361
+#: builtin/push.c:363
#, c-format
msgid "Pushing to %s\n"
msgstr "Sänder till %s\n"
-#: builtin/push.c:365
+#: builtin/push.c:367
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:395
+#: builtin/push.c:397
#, c-format
msgid "bad repository '%s'"
msgstr "felaktigt arkiv \"%s\""
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -8933,100 +8989,104 @@ msgstr ""
"\n"
" git push <namn>\n"
-#: builtin/push.c:411
+#: builtin/push.c:413
msgid "--all and --tags are incompatible"
msgstr "--all och --tags är inkompatibla"
-#: builtin/push.c:412
+#: builtin/push.c:414
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:417
+#: builtin/push.c:419
msgid "--mirror and --tags are incompatible"
msgstr "--mirror och --tags är inkompatibla"
-#: builtin/push.c:418
+#: builtin/push.c:420
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:423
+#: builtin/push.c:425
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
-#: builtin/push.c:539
+#: builtin/push.c:537
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:540 builtin/send-pack.c:161
+#: builtin/push.c:538 builtin/send-pack.c:161
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:541 builtin/send-pack.c:163
+#: builtin/push.c:539 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "spegla alla referenser"
-#: builtin/push.c:543
+#: builtin/push.c:541
msgid "delete refs"
msgstr "ta bort referenser"
-#: builtin/push.c:544
+#: builtin/push.c:542
msgid "push tags (can't be used with --all or --mirror)"
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
-#: builtin/push.c:547 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:164
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:549 builtin/send-pack.c:175
+#: builtin/push.c:547 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "refnamn>:<förvänta"
-#: builtin/push.c:550 builtin/send-pack.c:176
+#: builtin/push.c:548 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "kräv att ref:s tidigare värde är detta"
-#: builtin/push.c:553
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr "check|on-demand|no"
+
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:555 builtin/send-pack.c:169
+#: builtin/push.c:553 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
+#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "program för att ta emot paket"
-#: builtin/push.c:558
+#: builtin/push.c:556
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
-#: builtin/push.c:563
+#: builtin/push.c:561
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:567 builtin/send-pack.c:166
+#: builtin/push.c:565 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:569 builtin/send-pack.c:170
+#: builtin/push.c:567 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
-#: builtin/push.c:579
+#: builtin/push.c:577
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-#: builtin/push.c:581
+#: builtin/push.c:579
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
@@ -9104,12 +9164,12 @@ msgstr "hoppa över att applicera filter för gles utcheckning"
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
-#: builtin/reflog.c:432
+#: builtin/reflog.c:428
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: builtin/reflog.c:549 builtin/reflog.c:554
+#: builtin/reflog.c:545 builtin/reflog.c:550
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "\"%s\" är inte en giltig tidsstämpel"
@@ -9126,15 +9186,15 @@ msgstr ""
"git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <namn> <url>"
-#: builtin/remote.c:14 builtin/remote.c:33
+#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
msgstr "git remote rename <gammal> <ny>"
-#: builtin/remote.c:15 builtin/remote.c:38
+#: builtin/remote.c:15 builtin/remote.c:39
msgid "git remote remove <name>"
msgstr "git remote remove <namn>"
-#: builtin/remote.c:16 builtin/remote.c:43
+#: builtin/remote.c:16 builtin/remote.c:44
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
@@ -9156,48 +9216,52 @@ msgstr ""
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <namn> <gren>..."
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <namn>"
+
+#: builtin/remote.c:22 builtin/remote.c:75
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]"
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <namn> <nyurl>"
-#: builtin/remote.c:23 builtin/remote.c:71
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <namn> <url>"
-#: builtin/remote.c:28
+#: builtin/remote.c:29
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<flaggor>] <namn> <url>"
-#: builtin/remote.c:48
+#: builtin/remote.c:49
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <namn> <gren>..."
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <namn> <gren>..."
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<flaggor>] <namn>"
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<flaggor>] <namn>"
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..."
-#: builtin/remote.c:88
+#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
msgstr "Uppdaterar %s"
-#: builtin/remote.c:120
+#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -9205,96 +9269,96 @@ msgstr ""
"--mirror är farlig och föråldrad; använd\n"
"\t --mirror=fetch eller --mirror=push istället"
-#: builtin/remote.c:137
+#: builtin/remote.c:143
#, c-format
msgid "unknown mirror argument: %s"
msgstr "okänt argument till mirror: %s"
-#: builtin/remote.c:153
+#: builtin/remote.c:159
msgid "fetch the remote branches"
msgstr "hämta fjärrgrenarna"
-#: builtin/remote.c:155
+#: builtin/remote.c:161
msgid "import all tags and associated objects when fetching"
msgstr "importera alla taggar och associerade objekt vid hämtning"
-#: builtin/remote.c:158
+#: builtin/remote.c:164
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "eller hämta inte några taggar alls (--no-tags)"
-#: builtin/remote.c:160
+#: builtin/remote.c:166
msgid "branch(es) to track"
msgstr "gren(ar) att spåra"
-#: builtin/remote.c:161
+#: builtin/remote.c:167
msgid "master branch"
msgstr "huvudgren"
-#: builtin/remote.c:162
+#: builtin/remote.c:168
msgid "push|fetch"
msgstr "push|fetch"
-#: builtin/remote.c:163
+#: builtin/remote.c:169
msgid "set up remote as a mirror to push to or fetch from"
msgstr "ställ in arkiv som spegel att sända eller ta emot från"
-#: builtin/remote.c:175
+#: builtin/remote.c:181
msgid "specifying a master branch makes no sense with --mirror"
msgstr "att ange en master-gren ger ingen mening med --mirror"
-#: builtin/remote.c:177
+#: builtin/remote.c:183
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar"
-#: builtin/remote.c:187 builtin/remote.c:637
+#: builtin/remote.c:193 builtin/remote.c:643
#, c-format
msgid "remote %s already exists."
msgstr "fjärrarkivet %s finns redan."
-#: builtin/remote.c:191 builtin/remote.c:641
+#: builtin/remote.c:197 builtin/remote.c:647
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
-#: builtin/remote.c:235
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "Kunde inte skapa master \"%s\""
-#: builtin/remote.c:335
+#: builtin/remote.c:341
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Kunde inte hämta mappning för referensspecifikation %s"
-#: builtin/remote.c:436 builtin/remote.c:444
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr "(matchande)"
-#: builtin/remote.c:448
+#: builtin/remote.c:454
msgid "(delete)"
msgstr "(ta bort)"
-#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "Kunde inte tillämpa \"%s\" på \"%s\""
-#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
#, c-format
msgid "No such remote: %s"
msgstr "Inget sådant fjärrarkiv: %s"
-#: builtin/remote.c:647
+#: builtin/remote.c:653
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
-#: builtin/remote.c:653 builtin/remote.c:821
+#: builtin/remote.c:659 builtin/remote.c:827
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
-#: builtin/remote.c:668
+#: builtin/remote.c:674
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9305,27 +9369,27 @@ msgstr ""
"\t%s\n"
"\tUppdatera konfigurationen manuellt om nödvändigt."
-#: builtin/remote.c:674
+#: builtin/remote.c:680
#, c-format
msgid "Could not append '%s'"
msgstr "Kunde inte lägga till på \"%s\""
-#: builtin/remote.c:685
+#: builtin/remote.c:691
#, c-format
msgid "Could not set '%s'"
msgstr "Kunde inte sätta \"%s\""
-#: builtin/remote.c:707
+#: builtin/remote.c:713
#, c-format
msgid "deleting '%s' failed"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/remote.c:741
+#: builtin/remote.c:747
#, c-format
msgid "creating '%s' failed"
msgstr "misslyckades skapa \"%s\""
-#: builtin/remote.c:807
+#: builtin/remote.c:813
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9339,262 +9403,275 @@ msgstr[1] ""
"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
"för att ta bort dem, använd:"
-#: builtin/remote.c:922
+#: builtin/remote.c:928
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " ny (nästa hämtning sparar i remotes/%s)"
-#: builtin/remote.c:925
+#: builtin/remote.c:931
msgid " tracked"
msgstr " spårad"
-#: builtin/remote.c:927
+#: builtin/remote.c:933
msgid " stale (use 'git remote prune' to remove)"
msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
-#: builtin/remote.c:929
+#: builtin/remote.c:935
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:970
+#: builtin/remote.c:976
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"
-#: builtin/remote.c:977
+#: builtin/remote.c:983
#, c-format
msgid "rebases onto remote %s"
msgstr "ombaseras på fjärren %s"
-#: builtin/remote.c:980
+#: builtin/remote.c:986
#, c-format
msgid " merges with remote %s"
msgstr " sammanslås med fjärren %s"
-#: builtin/remote.c:981
+#: builtin/remote.c:987
msgid " and with remote"
msgstr " och med fjärren"
-#: builtin/remote.c:983
+#: builtin/remote.c:989
#, c-format
msgid "merges with remote %s"
msgstr "sammanslås med fjärren %s"
-#: builtin/remote.c:984
+#: builtin/remote.c:990
msgid " and with remote"
msgstr " och med fjärren"
-#: builtin/remote.c:1030
+#: builtin/remote.c:1036
msgid "create"
msgstr "skapa"
-#: builtin/remote.c:1033
+#: builtin/remote.c:1039
msgid "delete"
msgstr "ta bort"
-#: builtin/remote.c:1037
+#: builtin/remote.c:1043
msgid "up to date"
msgstr "àjour"
-#: builtin/remote.c:1040
+#: builtin/remote.c:1046
msgid "fast-forwardable"
msgstr "kan snabbspolas"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1049
msgid "local out of date"
msgstr "lokal föråldrad"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s tvingar till %-*s (%s)"
-#: builtin/remote.c:1053
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s sänder till %-*s (%s)"
-#: builtin/remote.c:1057
+#: builtin/remote.c:1063
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s tvingar till %s"
-#: builtin/remote.c:1060
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s sänder till %s"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
msgid "do not query remotes"
msgstr "fråga inte fjärrar"
-#: builtin/remote.c:1155
+#: builtin/remote.c:1161
#, c-format
msgid "* remote %s"
msgstr "* fjärr %s"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1162
#, c-format
msgid " Fetch URL: %s"
msgstr " Hämt-URL: %s"
-#: builtin/remote.c:1157 builtin/remote.c:1308
+#: builtin/remote.c:1163 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(ingen URL)"
-#: builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr " Sänd-URL: %s"
-#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD-gren: %s"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1182
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Fjärrgren:%s"
msgstr[1] " Fjärrgrenar:%s"
-#: builtin/remote.c:1191 builtin/remote.c:1218
+#: builtin/remote.c:1197 builtin/remote.c:1224
msgid " (status not queried)"
msgstr " (status inte förfrågad)"
-#: builtin/remote.c:1200
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokal gren konfigurerad för \"git pull\":"
msgstr[1] " Lokala grenar konfigurerade för \"git pull\":"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokala referenser speglas av \"git push\""
-#: builtin/remote.c:1215
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:"
msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:"
-#: builtin/remote.c:1236
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
-#: builtin/remote.c:1238
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ta bort refs/remotes/<namn>/HEAD"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "Kan inte bestämma HEAD på fjärren"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "Kunde inte ta bort %s"
-#: builtin/remote.c:1273
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "Inte en giltig referens: %s"
-#: builtin/remote.c:1275
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "Kunde inte ställa in %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s kommer bli dinglande!"
-#: builtin/remote.c:1294
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s har blivit dinglande!"
-#: builtin/remote.c:1304
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
-#: builtin/remote.c:1305
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1321
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [skulle rensa] %s"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [rensad] %s"
-#: builtin/remote.c:1369
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "rensa fjärrar efter hämtning"
-#: builtin/remote.c:1435 builtin/remote.c:1509
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
#, c-format
msgid "No such remote '%s'"
msgstr "Ingen sådan fjärr \"%s\""
-#: builtin/remote.c:1455
+#: builtin/remote.c:1461
msgid "add branch"
msgstr "lägg till gren"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1468
msgid "no remote specified"
msgstr "ingen fjärr angavs"
-#: builtin/remote.c:1484
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr "fråga sänd-URL:er istället för hämta-URL:er"
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr "returnera alla URL:er"
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "ingen URL:er angivna för fjärren \"%s\""
+
+#: builtin/remote.c:1541
msgid "manipulate push URLs"
msgstr "manipulera URL:ar för sändning"
-#: builtin/remote.c:1486
+#: builtin/remote.c:1543
msgid "add URL"
msgstr "lägg till URL"
-#: builtin/remote.c:1488
+#: builtin/remote.c:1545
msgid "delete URLs"
msgstr "ta bort URL:ar"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1552
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ger ingen mening"
-#: builtin/remote.c:1535
+#: builtin/remote.c:1592
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Felaktig gammalt URL-mönster: %s"
-#: builtin/remote.c:1543
+#: builtin/remote.c:1600
#, c-format
msgid "No such URL found: %s"
msgstr "Ingen sådan URL hittades: %s"
-#: builtin/remote.c:1545
+#: builtin/remote.c:1602
msgid "Will not delete all non-push URLs"
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
-#: builtin/remote.c:1559
+#: builtin/remote.c:1616
msgid "be verbose; must be placed before a subcommand"
msgstr "var pratsam; måste skrivas före ett underkommando"
@@ -9666,7 +9743,11 @@ msgstr "maximal storlek på varje paketfil"
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
-#: builtin/repack.c:378
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
+
+#: builtin/repack.c:381
#, c-format
msgid "removing '%s' failed"
msgstr "misslyckades ta bort \"%s\""
@@ -9761,7 +9842,7 @@ msgstr "använd detta format"
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:57
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "registrera rena lösningar i indexet"
@@ -9896,23 +9977,23 @@ msgstr "Kunde inte skriva ny indexfil."
msgid "rev-list does not support display of notes"
msgstr "rev-list stöder inte visning av anteckningar"
-#: builtin/rev-parse.c:361
+#: builtin/rev-parse.c:358
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
msgstr "behåll \"--\" sänt som argument"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
msgstr "sluta tolka efter första argument som inte är flagga"
-#: builtin/rev-parse.c:371
+#: builtin/rev-parse.c:368
msgid "output in stuck long form"
msgstr "utdata fast i lång form"
-#: builtin/rev-parse.c:502
+#: builtin/rev-parse.c:499
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -10170,7 +10251,7 @@ msgstr "w[,i1[,i2]]"
msgid "Linewrap output"
msgstr "Radbryt utdata"
-#: builtin/show-branch.c:9
+#: builtin/show-branch.c:10
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -10182,71 +10263,71 @@ msgstr ""
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
msgstr "visa fjärrspårande och lokala grenar"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
msgstr "visa fjärrspårande grenar"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
msgstr "färga \"*!+-\" enligt grenen"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:646
msgid "show <n> more commits after the common ancestor"
msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:648
msgid "synonym to more=-1"
msgstr "synonym till more=-1"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:649
msgid "suppress naming strings"
msgstr "undertyck namnsträngar"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:651
msgid "include the current branch"
msgstr "inkludera aktuell gren"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:653
msgid "name commits with their object names"
msgstr "namnge incheckningar med deras objektnamn"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:655
msgid "show possible merge bases"
msgstr "visa möjliga sammanslagningsbaser"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
msgstr "visa referenser som inte kan nås från någon annan referens"
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:659
msgid "show commits in topological order"
msgstr "visa incheckningar i topologisk ordning"
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:662
msgid "show only commits not on the first branch"
msgstr "visa endast incheckningar inte på den första grenen"
-#: builtin/show-branch.c:683
+#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
msgstr "visa sammanslagningar som endast kan nås från en spets"
-#: builtin/show-branch.c:685
+#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
msgstr "sortera topologiskt, behåll datumordning när möjligt"
-#: builtin/show-branch.c:688
+#: builtin/show-branch.c:669
msgid "<n>[,<base>]"
msgstr "<n>[,<bas>]"
-#: builtin/show-branch.c:689
+#: builtin/show-branch.c:670
msgid "show <n> most recent ref-log entries starting at base"
msgstr "visa <n> nyaste refloggposter med början på bas"
@@ -10259,41 +10340,136 @@ msgstr ""
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]"
#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=pattern] < ref-list"
-msgstr "git show-ref --exclude-existing[=mönster] < reflista"
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<mönster>]"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
msgstr "visa endast taggar (kan kombineras med huvuden)"
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
msgstr "visa endast huvuden (kan kombineras med taggar)"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
msgstr "striktare referenskontroll, kräver exakt referenssökväg"
-#: builtin/show-ref.c:175 builtin/show-ref.c:177
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "visa HEAD-refrens, även när den skulle filtreras ut"
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:174
msgid "dereference tags into object IDs"
msgstr "avreferera taggar till objekt-id"
-#: builtin/show-ref.c:181
+#: builtin/show-ref.c:176
msgid "only show SHA1 hash using <n> digits"
msgstr "visa SHA1-hash endast med <n> siffror"
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:180
msgid "do not print results to stdout (useful with --verify)"
msgstr "visa inte resultat på standard ut (användbart med --verify)"
-#: builtin/show-ref.c:187
+#: builtin/show-ref.c:182
msgid "show refs from stdin that aren't in local repository"
msgstr "visa referenser från standard in som inte finns i lokalt arkiv"
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken"
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr "alternativa ankare för relativa sökvägar"
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <sökväg>"
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr "var den nya undermodulen skall klonas till"
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr "namn på den nya undermodulen"
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr "URL att klona undermodulen från"
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr "djup för grunda kloner"
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+msgstr ""
+"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
+"<arkvi>] [--name <namn>] [--url <url>][--depth <djup>] [--] [<sökväg>...]"
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "kunde inte skapa katalogen \"%s\""
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr "kan inte öppna filen \"%s\""
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr "kunde inte stänga filen %s"
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr ""
+"ödesdigert: underkommandot submodule--helper måste anropas med ett "
+"underkommando"
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr ""
+"ödesdigert: \"%s\" är inte ett giltigt underkommando till submodule--helper"
+
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]"
@@ -10323,7 +10499,7 @@ msgstr "skäl"
msgid "reason of the update"
msgstr "skäl till uppdateringen"
-#: builtin/tag.c:22
+#: builtin/tag.c:23
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
@@ -10331,48 +10507,43 @@ msgstr ""
"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] <taggnamn> "
"[<huvud>]"
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid "git tag -d <tagname>..."
msgstr "git tag -d <taggnamn>..."
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[<pattern>...]"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>]\n"
-"\t\t[<mönster>...]"
+"\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -v <tagname>..."
msgstr "git tag -v <taggnamn>..."
-#: builtin/tag.c:69
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "felformat objekt vid \"%s\""
-
-#: builtin/tag.c:301
+#: builtin/tag.c:80
#, c-format
msgid "tag name too long: %.*s..."
msgstr "taggnamnet för långt: %.*s..."
-#: builtin/tag.c:306
+#: builtin/tag.c:85
#, c-format
msgid "tag '%s' not found."
msgstr "taggen \"%s\" hittades inte."
-#: builtin/tag.c:321
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tog bort tagg \"%s\" (var %s)\n"
-#: builtin/tag.c:333
+#: builtin/tag.c:112
#, c-format
msgid "could not verify the tag '%s'"
msgstr "kunde inte bekräfta taggen \"%s\""
-#: builtin/tag.c:343
+#: builtin/tag.c:122
#, c-format
msgid ""
"\n"
@@ -10385,7 +10556,7 @@ msgstr ""
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/tag.c:347
+#: builtin/tag.c:126
#, c-format
msgid ""
"\n"
@@ -10400,153 +10571,138 @@ msgstr ""
"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
"du vill.\n"
-#: builtin/tag.c:371
-#, c-format
-msgid "unsupported sort specification '%s'"
-msgstr "sorteringsangivelsen \"%s\" stöds ej"
-
-#: builtin/tag.c:373
-#, c-format
-msgid "unsupported sort specification '%s' in variable '%s'"
-msgstr "sorteringsangivelsen \"%s\" i variabeln \"%s\" stöds ej"
-
-#: builtin/tag.c:428
+#: builtin/tag.c:199
msgid "unable to sign the tag"
msgstr "kunde inte signera taggen"
-#: builtin/tag.c:430
+#: builtin/tag.c:201
msgid "unable to write tag file"
msgstr "kunde inte skriva tagg-filen"
-#: builtin/tag.c:455
+#: builtin/tag.c:226
msgid "bad object type."
msgstr "felaktig objekttyp"
-#: builtin/tag.c:468
+#: builtin/tag.c:239
msgid "tag header too big."
msgstr "tagghuvud för stort."
-#: builtin/tag.c:504
+#: builtin/tag.c:275
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:510
+#: builtin/tag.c:281
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
-#: builtin/tag.c:559
-msgid "switch 'points-at' requires an object"
-msgstr "flaggan \"points-at\" behöver ett objekt"
-
-#: builtin/tag.c:561
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "felformat objektnamn \"%s\""
-
-#: builtin/tag.c:590
+#: builtin/tag.c:339
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:592
+#: builtin/tag.c:341
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:594
+#: builtin/tag.c:343
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:595
+#: builtin/tag.c:344
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:597
+#: builtin/tag.c:346
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:599
+#: builtin/tag.c:348
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:601
+#: builtin/tag.c:350
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:603
+#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:607
+#: builtin/tag.c:356
msgid "use another key to sign the tag"
msgstr "använd annan nyckel för att signera taggen"
-#: builtin/tag.c:608
+#: builtin/tag.c:357
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
-#: builtin/tag.c:609 builtin/update-ref.c:368
-msgid "create_reflog"
-msgstr "create_reflog"
+#: builtin/tag.c:358 builtin/update-ref.c:368
+msgid "create a reflog"
+msgstr "skapa en reflog"
-#: builtin/tag.c:611
+#: builtin/tag.c:360
msgid "Tag listing options"
msgstr "Alternativ för listning av taggar"
-#: builtin/tag.c:612
+#: builtin/tag.c:361
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:614
-msgid "sort tags"
-msgstr "sortera taggar"
-
-#: builtin/tag.c:619 builtin/tag.c:625
+#: builtin/tag.c:362 builtin/tag.c:363
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
-#: builtin/tag.c:631
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
+msgstr "visa endast taggar som slagits samman"
+
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
+msgstr "visa endast taggar som ej slagits samman"
+
+#: builtin/tag.c:370
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:657
+#: builtin/tag.c:399
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:669
-msgid "--sort and -n are incompatible"
-msgstr "--sort och -n är inkompatibla"
-
-#: builtin/tag.c:676
+#: builtin/tag.c:419
msgid "-n option is only allowed with -l."
msgstr "Flaggan -n är endast tillåten tillsammans med -l."
-#: builtin/tag.c:678
+#: builtin/tag.c:421
msgid "--contains option is only allowed with -l."
msgstr "Flaggan --contains är endast tillåten tillsammans med -l"
-#: builtin/tag.c:680
+#: builtin/tag.c:423
msgid "--points-at option is only allowed with -l."
msgstr "Flaggan --points-at är endast tillåten tillsammans med -l."
-#: builtin/tag.c:688
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr "flaggorna --merged och --no-merged tillåts endast tillsammans med -l"
+
+#: builtin/tag.c:433
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:708
+#: builtin/tag.c:453
msgid "too many params"
msgstr "för många parametrar"
-#: builtin/tag.c:714
+#: builtin/tag.c:459
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:719
+#: builtin/tag.c:464
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:744
+#: builtin/tag.c:489
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
@@ -10808,77 +10964,81 @@ msgstr "git verify-tag [-v | --verbose] <tagg>..."
msgid "print tag contents"
msgstr "visa innehåll för tag"
-#: builtin/worktree.c:13
-msgid "git worktree add [<options>] <path> <branch>"
-msgstr "git worktree add [<flaggor>] <sökväg> <gren>"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<flaggor>] <sökväg> [<gren>]"
-#: builtin/worktree.c:14
+#: builtin/worktree.c:16
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<flaggor>]"
-#: builtin/worktree.c:36
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<flaggor>]"
+
+#: builtin/worktree.c:39
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:45
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
-#: builtin/worktree.c:47
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
-#: builtin/worktree.c:74
+#: builtin/worktree.c:77
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:112
#, c-format
msgid "failed to remove: %s"
msgstr "misslyckades ta bort: %s"
-#: builtin/worktree.c:198
+#: builtin/worktree.c:201
#, c-format
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: builtin/worktree.c:232
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:268
+#: builtin/worktree.c:271
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Förbereder %s (identifieraren %s)"
-#: builtin/worktree.c:316
+#: builtin/worktree.c:319
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
-#: builtin/worktree.c:318
+#: builtin/worktree.c:321
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:320
+#: builtin/worktree.c:323
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:324
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/worktree.c:328
+#: builtin/worktree.c:331
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
@@ -11024,48 +11184,48 @@ msgstr "giltig-till"
msgid "no-op (backward compatibility)"
msgstr "ingen funktion (bakåtkompatibilitet)"
-#: parse-options.h:236
+#: parse-options.h:237
msgid "be more verbose"
msgstr "var mer pratsam"
-#: parse-options.h:238
+#: parse-options.h:239
msgid "be more quiet"
msgstr "var mer tyst"
-#: parse-options.h:244
+#: parse-options.h:245
msgid "use <n> digits to display SHA-1s"
msgstr "använd <n> siffror för att visa SHA-1:or"
-#: rerere.h:28
+#: rerere.h:38
msgid "update the index with reused conflict resolution if possible"
msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
-#: git-bisect.sh:50
+#: git-bisect.sh:55
msgid "You need to start by \"git bisect start\""
msgstr "Du måste starta med \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:56
+#: git-bisect.sh:61
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]?"
-#: git-bisect.sh:99
+#: git-bisect.sh:122
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "flaggan känns inte igen: \"$arg\""
-#: git-bisect.sh:103
+#: git-bisect.sh:126
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "\"$arg\" verkar inte vara en giltig revision"
-#: git-bisect.sh:132
+#: git-bisect.sh:155
msgid "Bad HEAD - I need a HEAD"
msgstr "Felaktigt HEAD - Jag behöver ett HEAD"
-#: git-bisect.sh:145
+#: git-bisect.sh:168
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
@@ -11074,39 +11234,39 @@ msgstr ""
"<giltig_gren>\""
# cogito-relaterat
-#: git-bisect.sh:155
+#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts"
-#: git-bisect.sh:159
+#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
msgstr "Felaktigt HEAD - konstig symbolisk referens"
-#: git-bisect.sh:211
+#: git-bisect.sh:234
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Felaktigt argument till bisect_write: $state"
-#: git-bisect.sh:240
+#: git-bisect.sh:263
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Felaktig rev-indata: $arg"
-#: git-bisect.sh:255
+#: git-bisect.sh:278
msgid "Please call 'bisect_state' with at least one argument."
msgstr "Anropa \"bisect_state\" med minst ett argument."
-#: git-bisect.sh:267
+#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Felaktig rev-indata: $rev"
-#: git-bisect.sh:276
+#: git-bisect.sh:299
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument."
-#: git-bisect.sh:299
+#: git-bisect.sh:322
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr ""
@@ -11115,11 +11275,11 @@ msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:305
+#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
msgstr "Är du säker [Y=ja/N=nej]? "
-#: git-bisect.sh:317
+#: git-bisect.sh:340
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -11130,7 +11290,7 @@ msgstr ""
"(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för "
"detta.)"
-#: git-bisect.sh:320
+#: git-bisect.sh:343
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11143,16 +11303,16 @@ msgstr ""
"(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för "
"detta.)"
-#: git-bisect.sh:391 git-bisect.sh:521
+#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
msgstr "Vi utför ingen bisect för tillfället."
-#: git-bisect.sh:398
+#: git-bisect.sh:421
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "\"$invalid\" är inte en giltig incheckning"
-#: git-bisect.sh:407
+#: git-bisect.sh:430
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -11161,25 +11321,25 @@ msgstr ""
"Kunde inte checka ut original-HEAD \"$branch\".\n"
"Försök \"git bisect reset <incheckning>\"."
-#: git-bisect.sh:435
+#: git-bisect.sh:458
msgid "No logfile given"
msgstr "Ingen loggfil angiven"
-#: git-bisect.sh:436
+#: git-bisect.sh:459
#, sh-format
msgid "cannot read $file for replaying"
msgstr "kan inte läsa $file för uppspelning"
-#: git-bisect.sh:455
+#: git-bisect.sh:480
msgid "?? what are you talking about?"
msgstr "?? vad menar du?"
-#: git-bisect.sh:467
+#: git-bisect.sh:492
#, sh-format
msgid "running $command"
msgstr "kör $command"
-#: git-bisect.sh:474
+#: git-bisect.sh:499
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11188,11 +11348,11 @@ msgstr ""
"\"bisect\"-körningen misslyckades:\n"
"felkod $res från \"$command\" är < 0 eller >= 128"
-#: git-bisect.sh:500
+#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
msgstr "\"bisect\"-körningen kan inte fortsätta längre"
-#: git-bisect.sh:506
+#: git-bisect.sh:531
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11201,16 +11361,48 @@ msgstr ""
"\"bisect\"-körningen misslyckades:\n"
"\"bisect_state $state\" avslutades med felkoden $res"
-#: git-bisect.sh:513
+#: git-bisect.sh:538
msgid "bisect run success"
msgstr "\"bisect\"-körningen lyckades"
-#: git-bisect.sh:548
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "termerna måste vara olika"
+
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "\"$term\" är inte en giltig term"
+
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr "kan inte använda det inbyggda kommandot \"$term\" som term"
+
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "kan inte ändra betydelsen av termen \"$term\""
+
+#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
"Ogiltigt kommando: du utför just nu en \"bisect\" med $TERM_BAD/$TERM_GOOD."
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "inga termer angivna"
+
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"ogiltigt argument $arg för \"git bisect terms\".\n"
+"Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new."
+
#: git-rebase.sh:57
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
@@ -11249,23 +11441,23 @@ msgstr "Kroken pre-rebase vägrade ombaseringen."
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Det verkar som en git-am körs. Kan inte ombasera."
-#: git-rebase.sh:351
+#: git-rebase.sh:354
msgid "The --exec option must be used with the --interactive option"
msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive"
-#: git-rebase.sh:356
+#: git-rebase.sh:359
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: git-rebase.sh:367
+#: git-rebase.sh:370
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: git-rebase.sh:374
+#: git-rebase.sh:377
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: git-rebase.sh:377
+#: git-rebase.sh:380
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11273,12 +11465,12 @@ msgstr ""
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: git-rebase.sh:395
+#: git-rebase.sh:398
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Kunde inte flytta tillbaka till $head_name"
-#: git-rebase.sh:414
+#: git-rebase.sh:417
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11299,65 +11491,65 @@ msgstr ""
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där."
-#: git-rebase.sh:465
+#: git-rebase.sh:468
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ogiltig uppström $upstream_name"
-#: git-rebase.sh:489
+#: git-rebase.sh:492
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: mer än en sammanslagningsbas finns"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:495 git-rebase.sh:499
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ingen sammanslagningsbas finns"
-#: git-rebase.sh:501
+#: git-rebase.sh:504
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Peka på en giltig incheckning: $onto_name"
-#: git-rebase.sh:524
+#: git-rebase.sh:527
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ödesdigert: ingen sådan gren: $branch_name"
-#: git-rebase.sh:557
+#: git-rebase.sh:560
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: git-rebase.sh:562
+#: git-rebase.sh:565
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Skapade autostash: $stash_abbrev"
-#: git-rebase.sh:566
+#: git-rebase.sh:569
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: git-rebase.sh:586
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktuell gren $branch_name är à jour."
-#: git-rebase.sh:590
+#: git-rebase.sh:593
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
-#: git-rebase.sh:601
+#: git-rebase.sh:604
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ändringar från $mb till $onto:"
-#: git-rebase.sh:610
+#: git-rebase.sh:613
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
-#: git-rebase.sh:620
+#: git-rebase.sh:623
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Snabbspolade $branch_name till $onto_name."
@@ -11430,113 +11622,97 @@ msgstr "Kan inte spara aktuell status"
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: git-stash.sh:387
+#: git-stash.sh:405
#, sh-format
msgid "unknown option: $opt"
msgstr "okänd flagga: $opt"
-#: git-stash.sh:397
+#: git-stash.sh:415
msgid "No stash found."
msgstr "Ingen \"stash\" hittades."
-#: git-stash.sh:404
+#: git-stash.sh:422
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "För många revisioner angivna: $REV"
-#: git-stash.sh:410
+#: git-stash.sh:428
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference är inte en giltig referens"
-#: git-stash.sh:438
+#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
-#: git-stash.sh:449
+#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "\"$args\" är inte en \"stash\"-referens"
-#: git-stash.sh:457
+#: git-stash.sh:475
msgid "unable to refresh index"
msgstr "kan inte uppdatera indexet"
-#: git-stash.sh:461
+#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-#: git-stash.sh:469
+#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
msgstr "Konflikter i indexet. Testa utan --index."
-#: git-stash.sh:471
+#: git-stash.sh:489
msgid "Could not save index tree"
msgstr "Kunde inte spara indexträd"
-#: git-stash.sh:505
+#: git-stash.sh:523
msgid "Cannot unstage modified files"
msgstr "Kan inte ta bort ändrade filer ur kön"
-#: git-stash.sh:520
+#: git-stash.sh:538
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits ur kön."
-#: git-stash.sh:543
+#: git-stash.sh:561
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Kastade ${REV} ($s)"
-#: git-stash.sh:544
+#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-#: git-stash.sh:552
+#: git-stash.sh:570
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: git-stash.sh:624
+#: git-stash.sh:642
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
-#: git-submodule.sh:95
+#: git-submodule.sh:104
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\""
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr ""
-"Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$sm_path\""
-
-#: git-submodule.sh:287
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\""
-
-#: git-submodule.sh:296
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr "Gitkatalog \"$a\" ingår i undermodulsökvägen \"$b\" eller omvänt"
-
-#: git-submodule.sh:406
+#: git-submodule.sh:281
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå"
-#: git-submodule.sh:416
+#: git-submodule.sh:291
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
-#: git-submodule.sh:433
+#: git-submodule.sh:308
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "\"$sm_path\" finns redan i indexet"
-#: git-submodule.sh:437
+#: git-submodule.sh:312
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11547,22 +11723,22 @@ msgstr ""
"$sm_path\n"
"Använd -f om du verkligen vill lägga till den"
-#: git-submodule.sh:455
+#: git-submodule.sh:330
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
-#: git-submodule.sh:457
+#: git-submodule.sh:332
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
-#: git-submodule.sh:465
+#: git-submodule.sh:340
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
-#: git-submodule.sh:467
+#: git-submodule.sh:342
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
@@ -11570,14 +11746,14 @@ msgstr ""
"För att återanvända den lokala git-katalogen istället för att på nytt klona "
"från"
-#: git-submodule.sh:469
+#: git-submodule.sh:344
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr ""
"använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt arkiv"
-#: git-submodule.sh:470
+#: git-submodule.sh:345
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
@@ -11586,81 +11762,81 @@ msgstr ""
"eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name"
"\"."
-#: git-submodule.sh:472
+#: git-submodule.sh:347
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
-#: git-submodule.sh:484
+#: git-submodule.sh:359
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
-#: git-submodule.sh:489
+#: git-submodule.sh:364
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-#: git-submodule.sh:498
+#: git-submodule.sh:373
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-#: git-submodule.sh:542
+#: git-submodule.sh:417
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr "GÃ¥r in i \"$prefix$displaypath\""
-#: git-submodule.sh:562
+#: git-submodule.sh:437
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr ""
"Stoppar på \"$prefix$displaypath\"; skriptet returnerade en status skild "
"från noll."
-#: git-submodule.sh:608
+#: git-submodule.sh:483
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr ""
"Hittade ingen url för undermodulsökvägen \"$displaypath\" i .gitmodules"
-#: git-submodule.sh:617
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
msgstr "Misslyckades registrera url för undermodulsökväg \"$displaypath\""
-#: git-submodule.sh:619
+#: git-submodule.sh:494
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr ""
"Undermodulen \"$name\" ($url) registrerad för sökvägen \"$displaypath\""
-#: git-submodule.sh:636
+#: git-submodule.sh:511
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr ""
"Misslyckades registrera uppdateringsläge för undermodulsökväg \"$displaypath"
"\""
-#: git-submodule.sh:674
+#: git-submodule.sh:549
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr "Använd \".\" om du verkligen vill avinitiera alla undermoduler"
-#: git-submodule.sh:691
+#: git-submodule.sh:566
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
"Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\""
-#: git-submodule.sh:692
+#: git-submodule.sh:567
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-#: git-submodule.sh:698
+#: git-submodule.sh:573
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -11669,28 +11845,28 @@ msgstr ""
"Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" "
"kastar bort dem"
-#: git-submodule.sh:701
+#: git-submodule.sh:576
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Rensade katalogen \"$displaypath\""
-#: git-submodule.sh:702
+#: git-submodule.sh:577
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\""
-#: git-submodule.sh:705
+#: git-submodule.sh:580
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\""
-#: git-submodule.sh:714
+#: git-submodule.sh:589
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
-#: git-submodule.sh:830
+#: git-submodule.sh:705
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
@@ -11699,108 +11875,165 @@ msgstr ""
"Undermodulen \"$displaypath\" har inte initierats\n"
"Kanske du vill köra \"update --init\"?"
-#: git-submodule.sh:843
+#: git-submodule.sh:718
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:852
+#: git-submodule.sh:727
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
-#: git-submodule.sh:876
+#: git-submodule.sh:751
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""
-#: git-submodule.sh:890
+#: git-submodule.sh:765
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:891
+#: git-submodule.sh:766
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-#: git-submodule.sh:895
+#: git-submodule.sh:770
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:896
+#: git-submodule.sh:771
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-#: git-submodule.sh:901
+#: git-submodule.sh:776
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:902
+#: git-submodule.sh:777
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:907
+#: git-submodule.sh:782
#, sh-format
msgid ""
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
msgstr ""
"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$prefix$sm_path\""
-#: git-submodule.sh:908
+#: git-submodule.sh:783
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr "Undermodulsökvägen \"$prefix$sm_path\": \"$command $sha1\""
-#: git-submodule.sh:938
+#: git-submodule.sh:813
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:1046
+#: git-submodule.sh:921
msgid "The --cached option cannot be used with the --files option"
msgstr "Flaggan --cached kan inte användas med flaggan --files"
-#: git-submodule.sh:1098
+#: git-submodule.sh:973
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:1118
+#: git-submodule.sh:993
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src"
-#: git-submodule.sh:1121
+#: git-submodule.sh:996
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst"
-#: git-submodule.sh:1124
+#: git-submodule.sh:999
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Varning: $display_name innehåller inte incheckningarna $sha1_src och "
"$sha1_dst"
-#: git-submodule.sh:1149
+#: git-submodule.sh:1024
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1267
+#: git-submodule.sh:1142
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:1331
+#: git-submodule.sh:1206
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
+#~ msgid "unable to look up current user in the passwd file: %s"
+#~ msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
+
+#~ msgid "no such user"
+#~ msgstr "okänd användare"
+
+#~ msgid "branch '%s' does not point at a commit"
+#~ msgstr "grenen \"%s\" pekar inte på en incheckning"
+
+#~ msgid "object '%s' does not point to a commit"
+#~ msgstr "objektet \"%s\" pekar på en incheckning"
+
+#~ msgid "some refs could not be read"
+#~ msgstr "vissa referenser kunde inte läsas"
+
+#~ msgid "print only merged branches"
+#~ msgstr "visa endast sammanslagna grenar"
+
+#~ msgid "--dissociate given, but there is no --reference"
+#~ msgstr "--dissociate angavs, men --reference har inte angivits"
+
+#~ msgid "show usage"
+#~ msgstr "visa användning"
+
+#~ msgid "insanely long template name %s"
+#~ msgstr "tokigt långt namn på mallen %s"
+
+#~ msgid "insanely long symlink %s"
+#~ msgstr "tokigt lång symbolisk länk %s"
+
+#~ msgid "insanely long template path %s"
+#~ msgstr "tokigt lång mallsökväg %s"
+
+#~ msgid "insane git directory %s"
+#~ msgstr "tokig git-katalog %s"
+
+#~ msgid "false|true|preserve"
+#~ msgstr "false|true|preserve"
+
+#~ msgid "unsupported sort specification '%s'"
+#~ msgstr "sorteringsangivelsen \"%s\" stöds ej"
+
+#~ msgid "unsupported sort specification '%s' in variable '%s'"
+#~ msgstr "sorteringsangivelsen \"%s\" i variabeln \"%s\" stöds ej"
+
+#~ msgid "switch 'points-at' requires an object"
+#~ msgstr "flaggan \"points-at\" behöver ett objekt"
+
+#~ msgid "sort tags"
+#~ msgstr "sortera taggar"
+
+#~ msgid "--sort and -n are incompatible"
+#~ msgstr "--sort och -n är inkompatibla"
+
+#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
+#~ msgstr "Gitkatalog \"$a\" ingår i undermodulsökvägen \"$b\" eller omvänt"
+
#~ msgid "BUG: reopen a lockfile that is still open"
#~ msgstr "FEL: återöppna en låsfil som fortfarande är öppen"
diff --git a/po/vi.po b/po/vi.po
index 3231595..f3fee99 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git v2.6.0-rc2\n"
+"Project-Id-Version: git v2.7.0-rc0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-09-15 06:45+0800\n"
-"PO-Revision-Date: 2015-09-15 07:15+0700\n"
+"POT-Creation-Date: 2015-12-11 23:36+0800\n"
+"PO-Revision-Date: 2015-12-12 14:31+0700\n"
"Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -36,13 +36,13 @@ msgstr ""
"và sau đó dùng lệnh “git add/rm <tập-tin>â€\n"
"dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao."
-#: advice.c:101 builtin/merge.c:1227
+#: advice.c:101 builtin/merge.c:1225
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)."
#: advice.c:103
-msgid "Please, commit your changes before you can merge."
-msgstr "Vui lòng chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
+msgid "Please, commit your changes before merging."
+msgstr "Vui lòng chuyển giao các thay đổi trước khi hòa trộn."
#: advice.c:104
msgid "Exiting because of unfinished merge."
@@ -67,76 +67,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
-#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "đặc tả Ä‘Æ°á»ng dẫn “%s†không khá»›p vá»›i bất kỳ tập tin nào"
-#: archive.c:428
+#: archive.c:429
msgid "fmt"
msgstr "định_dạng"
-#: archive.c:428
+#: archive.c:429
msgid "archive format"
msgstr "định dạng lưu trữ"
-#: archive.c:429 builtin/log.c:1229
+#: archive.c:430 builtin/log.c:1228
msgid "prefix"
msgstr "tiá»n_tố"
-#: archive.c:430
+#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
msgstr "nối thêm tiá»n tố vào từng Ä‘Æ°á»ng dẫn tập tin trong kho lÆ°u"
-#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516 builtin/blame.c:2517
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 builtin/blame.c:2536
#: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:712 builtin/hash-object.c:99 builtin/ls-files.c:446
+#: builtin/grep.c:707 builtin/hash-object.c:99 builtin/ls-files.c:446
#: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "tập_tin"
-#: archive.c:432 builtin/archive.c:89
+#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "ghi kho lưu vào tập tin này"
-#: archive.c:434
+#: archive.c:435
msgid "read .gitattributes in working directory"
msgstr "Ä‘á»c .gitattributes trong thÆ° mục làm việc"
-#: archive.c:435
+#: archive.c:436
msgid "report archived files on stderr"
msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi tiêu chuẩn)"
-#: archive.c:436
+#: archive.c:437
msgid "store only"
msgstr "chỉ lưu (không nén)"
-#: archive.c:437
+#: archive.c:438
msgid "compress faster"
msgstr "nén nhanh hơn"
-#: archive.c:445
+#: archive.c:446
msgid "compress better"
msgstr "nén nhỠhơn"
-#: archive.c:448
+#: archive.c:449
msgid "list supported archive formats"
msgstr "liệt kê các kiểu nén được hỗ trợ"
-#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr "kho"
-#: archive.c:451 builtin/archive.c:91
+#: archive.c:452 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ"
-#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr "lệnh"
-#: archive.c:453 builtin/archive.c:93
+#: archive.c:454 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "Ä‘Æ°á»ng dẫn đến lệnh git-upload-pack trên máy chủ"
@@ -148,84 +148,84 @@ msgstr ""
"Các mẫu dạng phủ định bị cấm dùng cho các thuộc tính của git\n"
"Dùng “\\!†cho các chuỗi văn bản có dấu chấm than dẫn đầu."
-#: branch.c:60
+#: branch.c:61
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "Chưa cài đặt nhánh %s như là thượng nguồn của nó."
-#: branch.c:83
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s bằng cách rebase."
-#: branch.c:84
+#: branch.c:85
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s."
-#: branch.c:88
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr "Nhánh %s cài đặt để theo dõi nhánh nội bộ %s bằng cách rebase."
-#: branch.c:89
+#: branch.c:90
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "Nhánh %s cài đặt để theo dõi nhánh nội bộ %s."
-#: branch.c:94
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s bằng cách rebase."
-#: branch.c:95
+#: branch.c:96
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "Nhánh %s cài đặt để theo dõi tham chiếu máy chủ %s."
-#: branch.c:99
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
"Nhánh %s cài đặt để theo dõi vết tham chiếu nội bộ %s bằng cách rebase."
-#: branch.c:100
+#: branch.c:101
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "Nhánh %s cài đặt để theo dõi tham chiếu nội bộ %s."
-#: branch.c:133
+#: branch.c:134
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Không theo dõi: thông tin chưa rõ ràng cho tham chiếu %s"
-#: branch.c:162
+#: branch.c:163
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "“%s†không phải là một tên nhánh hợp lệ."
-#: branch.c:167
+#: branch.c:168
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Äã có nhánh mang tên “%sâ€."
-#: branch.c:175
+#: branch.c:176
msgid "Cannot force update the current branch."
msgstr "Không thể ép buộc cập nhật nhánh hiện hành."
-#: branch.c:195
+#: branch.c:196
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"Không thể cài đặt thông tin theo dõi; điểm bắt đầu “%s†không phải là một "
"nhánh."
-#: branch.c:197
+#: branch.c:198
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "nhánh thượng nguồn đã yêu cầu “%s†không tồn tại"
-#: branch.c:199
+#: branch.c:200
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -245,22 +245,22 @@ msgstr ""
"sẽ theo dõi bản đối chiếu máy chủ của nó, bạn cần dùng lệnh\n"
"\"git push -u\" để đặt cấu hình thượng nguồn bạn muốn push."
-#: branch.c:243
+#: branch.c:244
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Không phải tên đối tượng hợp lệ: “%sâ€."
-#: branch.c:263
+#: branch.c:264
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Tên đối tượng chÆ°a rõ ràng: “%sâ€."
-#: branch.c:268
+#: branch.c:269
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Nhánh không hợp lệ: “%sâ€."
-#: branch.c:399
+#: branch.c:322
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "“%s†đã sẵn được lấy ra tại “%sâ€"
@@ -275,7 +275,7 @@ msgstr "“%s†không giống nhÆ° tập tin v2 bundle (định dạng dump cá
msgid "unrecognized header: %s%s (%d)"
msgstr "phần đầu không được thừa nhận: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:765
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr "không thể mở “%sâ€"
@@ -284,9 +284,9 @@ msgstr "không thể mở “%sâ€"
msgid "Repository lacks these prerequisite commits:"
msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:"
-#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708
-#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
-#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi"
@@ -295,7 +295,7 @@ msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Bundle chứa %d tham chiếu:"
+msgstr[0] "Bó dữ liệu chứa %d tham chiếu:"
#: bundle.c:192
msgid "The bundle records a complete history."
@@ -324,14 +324,14 @@ msgstr "rev-list đã chết"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "th.chiếu “%s†bị loại trừ bởi các tùy chá»n rev-list"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
#: bundle.c:449
msgid "Refusing to create empty bundle."
-msgstr "Từ chối tạo một bundle trống rỗng."
+msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
#: bundle.c:459
#, c-format
@@ -342,13 +342,13 @@ msgstr "không thể tạo “%sâ€"
msgid "index-pack died"
msgstr "mục lục gói đã chết"
-#: color.c:260
+#: color.c:275
#, c-format
msgid "invalid color value: %.*s"
msgstr "giá trị màu không hợp lệ: %.*s"
-#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
-#: builtin/am.c:2128
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
#, c-format
msgid "could not parse %s"
msgstr "không thể phân tích cú pháp %s"
@@ -497,22 +497,22 @@ msgstr "gặp lá»—i khi Ä‘á»c tập-tin-thứ-tá»± “%sâ€"
msgid "Performing inexact rename detection"
msgstr "Äang thá»±c hiện dò tìm đổi tên không chính xác"
-#: diff.c:116
+#: diff.c:115
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Gặp lá»—i khi phân tích dirstat cắt bá» phần trăm “%sâ€\n"
-#: diff.c:121
+#: diff.c:120
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Không hiểu đối số dirstat “%sâ€\n"
-#: diff.c:216
+#: diff.c:215
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Không hiểu giá trị cho biến cấu hình “diff.submoduleâ€: “%sâ€"
-#: diff.c:268
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -521,16 +521,16 @@ msgstr ""
"Tìm thấy các lá»—i trong biến cấu hình “diff.dirstatâ€:\n"
"%s"
-#: diff.c:2998
+#: diff.c:3000
#, c-format
msgid "external diff died, stopping at %s"
msgstr "phần má»m diff ở bên ngoài đã chết, dừng tại %s"
-#: diff.c:3394
+#: diff.c:3396
msgid "--follow requires exactly one pathspec"
msgstr "--follow cần chính xác má»™t đặc tả Ä‘Æ°á»ng dẫn"
-#: diff.c:3557
+#: diff.c:3559
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -539,16 +539,16 @@ msgstr ""
"Gặp lá»—i khi phân tích đối số tùy chá»n --dirstat/-X:\n"
"%s"
-#: diff.c:3571
+#: diff.c:3573
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Gặp lá»—i khi phân tích đối số tùy chá»n --submodule: “%sâ€"
-#: dir.c:1853
+#: dir.c:1915
msgid "failed to get kernel name and information"
msgstr "gặp lỗi khi lấy tên và thông tin của nhân"
-#: dir.c:1936
+#: dir.c:1998
msgid "Untracked cache is disabled on this system."
msgstr "Bộ nhớ tạm không theo vết bị tắt trên hệ thống này."
@@ -654,8 +654,8 @@ msgstr "%s: %s - %s"
msgid "failed to read the cache"
msgstr "gặp lá»—i khi Ä‘á»c bá»™ nhá»› đệm"
-#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:715
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
msgid "unable to write new index file"
msgstr "không thể ghi tập tin lưu bảng mục lục mới"
@@ -673,64 +673,64 @@ msgstr "addinfo_cache gặp lá»—i đối vá»›i Ä‘Æ°á»ng dẫn “%sâ€"
msgid "error building trees"
msgstr "gặp lỗi khi xây dựng cây"
-#: merge-recursive.c:687
+#: merge-recursive.c:686
#, c-format
msgid "failed to create path '%s'%s"
msgstr "gặp lá»—i khi tạo Ä‘Æ°á»ng dẫn “%sâ€%s"
-#: merge-recursive.c:698
+#: merge-recursive.c:697
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Gỡ bỠ%s để tạo chỗ (room) cho thư mục con\n"
-#: merge-recursive.c:712 merge-recursive.c:733
+#: merge-recursive.c:711 merge-recursive.c:732
msgid ": perhaps a D/F conflict?"
msgstr ": có lẽ là một xung đột D/F?"
-#: merge-recursive.c:723
+#: merge-recursive.c:722
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "từ chối đóng tập tin không được theo dõi tại “%sâ€"
-#: merge-recursive.c:763
+#: merge-recursive.c:762
#, c-format
msgid "cannot read object %s '%s'"
msgstr "không thể Ä‘á»c đối tượng %s “%sâ€"
-#: merge-recursive.c:765
+#: merge-recursive.c:764
#, c-format
msgid "blob expected for %s '%s'"
msgstr "đối tượng blob được mong đợi cho %s “%sâ€"
-#: merge-recursive.c:788 builtin/clone.c:364
+#: merge-recursive.c:787 builtin/clone.c:369
#, c-format
msgid "failed to open '%s'"
msgstr "gặp lá»—i khi mở “%sâ€"
-#: merge-recursive.c:796
+#: merge-recursive.c:795
#, c-format
msgid "failed to symlink '%s'"
msgstr "gặp lá»—i khi tạo liên kết má»m (symlink) “%sâ€"
-#: merge-recursive.c:799
+#: merge-recursive.c:798
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "không hiểu phải làm gì vá»›i %06o %s “%sâ€"
-#: merge-recursive.c:937
+#: merge-recursive.c:936
msgid "Failed to execute internal merge"
msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
-#: merge-recursive.c:941
+#: merge-recursive.c:940
#, c-format
msgid "Unable to add %s to database"
msgstr "Không thể thêm %s vào cơ sở dữ liệu"
-#: merge-recursive.c:957
+#: merge-recursive.c:956
msgid "unsupported object type in the tree"
msgstr "kiểu đối tượng không được hỗ trợ trong cây (tree)"
-#: merge-recursive.c:1032 merge-recursive.c:1046
+#: merge-recursive.c:1031 merge-recursive.c:1045
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -739,7 +739,7 @@ msgstr ""
"XUNG ÄỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree)."
-#: merge-recursive.c:1038 merge-recursive.c:1051
+#: merge-recursive.c:1037 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -748,20 +748,20 @@ msgstr ""
"XUNG ÄỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree) tại %s."
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "rename"
msgstr "đổi tên"
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "renamed"
msgstr "đã đổi tên"
-#: merge-recursive.c:1148
+#: merge-recursive.c:1147
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s"
-#: merge-recursive.c:1170
+#: merge-recursive.c:1169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -770,145 +770,145 @@ msgstr ""
"XUNG ÄỘT (đổi-tên/đổi-tên): Äổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi "
"tên \"%s\"->\"%s\" trong \"%s\"%s"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1174
msgid " (left unresolved)"
msgstr " (cần giải quyết)"
-#: merge-recursive.c:1229
+#: merge-recursive.c:1228
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"XUNG ÄỘT (đổi-tên/đổi-tên): Äổi tên %s->%s trong %s. Äổi tên %s->%s trong %s"
-#: merge-recursive.c:1259
+#: merge-recursive.c:1258
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Äang đổi tên %s thành %s thay vì %s thành %s"
-#: merge-recursive.c:1458
+#: merge-recursive.c:1457
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"XUNG ÄỘT (đổi-tên/thêm): Äổi tên %s->%s trong %s. %s được thêm vào trong %s"
-#: merge-recursive.c:1468
+#: merge-recursive.c:1467
#, c-format
msgid "Adding merged %s"
msgstr "Thêm hòa trộn %s"
-#: merge-recursive.c:1473 merge-recursive.c:1671
+#: merge-recursive.c:1472 merge-recursive.c:1674
#, c-format
msgid "Adding as %s instead"
msgstr "Thay vào đó thêm vào %s"
-#: merge-recursive.c:1524
+#: merge-recursive.c:1523
#, c-format
msgid "cannot read object %s"
msgstr "không thể Ä‘á»c đối tượng %s"
-#: merge-recursive.c:1527
+#: merge-recursive.c:1526
#, c-format
msgid "object %s is not a blob"
msgstr "đối tượng %s không phải là một blob"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modify"
msgstr "sửa đổi"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modified"
msgstr "đã sửa"
-#: merge-recursive.c:1585
+#: merge-recursive.c:1588
msgid "content"
msgstr "ná»™i dung"
-#: merge-recursive.c:1592
+#: merge-recursive.c:1595
msgid "add/add"
msgstr "thêm/thêm"
-#: merge-recursive.c:1626
+#: merge-recursive.c:1629
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Äã bá» qua %s (đã có sẵn lần hòa trá»™n này)"
-#: merge-recursive.c:1640
+#: merge-recursive.c:1643
#, c-format
msgid "Auto-merging %s"
msgstr "Tự-động-hòa-trộn %s"
-#: merge-recursive.c:1644 git-submodule.sh:1150
+#: merge-recursive.c:1647 git-submodule.sh:1025
msgid "submodule"
msgstr "mô-đun-con"
-#: merge-recursive.c:1645
+#: merge-recursive.c:1648
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "XUNG ÄỘT (%s): Xung Ä‘á»™t hòa trá»™n trong %s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1734
#, c-format
msgid "Removing %s"
msgstr "Äang xóa %s"
-#: merge-recursive.c:1756
+#: merge-recursive.c:1759
msgid "file/directory"
msgstr "tập-tin/thư-mục"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1765
msgid "directory/file"
msgstr "thư-mục/tập-tin"
-#: merge-recursive.c:1767
+#: merge-recursive.c:1770
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"XUNG ÄỘT (%s): Ở đây không có thÆ° mục nào có tên %s trong %s. Thêm %s nhÆ° là "
"%s"
-#: merge-recursive.c:1777
+#: merge-recursive.c:1780
#, c-format
msgid "Adding %s"
msgstr "Thêm \"%s\""
-#: merge-recursive.c:1794
+#: merge-recursive.c:1797
msgid "Fatal merge failure, shouldn't happen."
msgstr "Việc hòa trá»™n há»ng nghiêm trá»ng, không nên để xảy ra."
-#: merge-recursive.c:1813
+#: merge-recursive.c:1816
msgid "Already up-to-date!"
msgstr "Äã cập nhật rồi!"
-#: merge-recursive.c:1822
+#: merge-recursive.c:1825
#, c-format
msgid "merging of trees %s and %s failed"
-msgstr "hòa trộn cây (tree) %s và %s gặp lỗi"
+msgstr "hòa trộn các cây %s và %s gặp lỗi"
-#: merge-recursive.c:1852
+#: merge-recursive.c:1855
#, c-format
msgid "Unprocessed path??? %s"
msgstr "ÄÆ°á»ng dẫn chÆ°a được xá»­ lý??? %s"
-#: merge-recursive.c:1900
+#: merge-recursive.c:1903
msgid "Merging:"
msgstr "Äang trá»™n:"
-#: merge-recursive.c:1913
+#: merge-recursive.c:1916
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "tìm thấy %u tổ tiên chung:"
-#: merge-recursive.c:1950
+#: merge-recursive.c:1953
msgid "merge returned no commit"
msgstr "hòa trộn không trả vỠlần chuyển giao nào"
-#: merge-recursive.c:2007
+#: merge-recursive.c:2010
#, c-format
msgid "Could not parse object '%s'"
msgstr "Không thể phân tích đối tượng “%sâ€"
-#: merge-recursive.c:2018 builtin/merge.c:645
+#: merge-recursive.c:2021 builtin/merge.c:645
msgid "Unable to write index."
msgstr "Không thể ghi bảng mục lục"
@@ -940,31 +940,41 @@ msgstr "Giá trị %s sai: “%sâ€"
msgid "unable to parse object: %s"
msgstr "không thể phân tích đối tượng: “%sâ€"
-#: parse-options.c:563
+#: parse-options.c:570
msgid "..."
msgstr "…"
-#: parse-options.c:581
+#: parse-options.c:588
#, c-format
msgid "usage: %s"
msgstr "cách dùng: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:585
+#: parse-options.c:592
#, c-format
msgid " or: %s"
msgstr " hoặc: %s"
-#: parse-options.c:588
+#: parse-options.c:595
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:622
+#: parse-options.c:629
msgid "-NUM"
msgstr "-Sá»"
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "tên đối tượng dị hình “%sâ€"
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Không thể làm %s được ghi bởi nhóm"
+
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
@@ -1034,11 +1044,11 @@ msgstr ""
msgid "unable to parse --pretty format"
msgstr "không thể phân tích định dạng --pretty"
-#: progress.c:236
+#: progress.c:235
msgid "done"
msgstr "xong"
-#: read-cache.c:1296
+#: read-cache.c:1281
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -1047,7 +1057,7 @@ msgstr ""
"index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
"Dùng phiên bản %i"
-#: read-cache.c:1306
+#: read-cache.c:1291
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1056,119 +1066,164 @@ msgstr ""
"GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
"Dùng phiên bản %i"
-#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
#: builtin/merge.c:983
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Không thể mở “%s†để ghi"
-#: refs.c:3001
+#: refs/files-backend.c:2359
#, c-format
msgid "could not delete reference %s: %s"
msgstr "không thể xóa bỠtham chiếu %s: %s"
-#: refs.c:3004
+#: refs/files-backend.c:2362
#, c-format
msgid "could not delete references: %s"
msgstr "không thể xóa bỠtham chiếu: %s"
-#: refs.c:3013
+#: refs/files-backend.c:2371
#, c-format
msgid "could not remove reference %s"
msgstr "không thể gỡ bỠtham chiếu: %s"
-#: ref-filter.c:660
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "định dạng: nguyên tử %%(end) được dùng mà không có nguyên tử tương ứng"
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "cần nội dung mang giá trị dương:lines=%s"
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "cần định dạng: %%(color:<color>)"
+
+#: ref-filter.c:835
msgid "unable to parse format"
msgstr "không thể phân tích định dạng"
-#: remote.c:792
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "cần định dạng: %%(align:<width>,<position>)"
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr "định dạng không đúng chỗ căn chỉnh:%s"
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "cần giá trị độ rộng dương với nguyên tử %%(align)"
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "đối tượng dị hình tại “%sâ€"
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "định dạng: thiếu nguyên tử %%(end)"
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr "tên đối tượng dị hình %s"
+
+#: remote.c:756
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Không thể lấy vỠcả %s và %s cho %s"
-#: remote.c:796
+#: remote.c:760
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s thÆ°á»ng theo dõi %s, không phải %s"
-#: remote.c:800
+#: remote.c:764
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s theo dõi cả %s và %s"
-#: remote.c:808
+#: remote.c:772
msgid "Internal error"
msgstr "Lá»—i ná»™i bá»™"
-#: remote.c:1723 remote.c:1766
+#: remote.c:1687 remote.c:1730
msgid "HEAD does not point to a branch"
msgstr "HEAD không chỉ đến một nhánh nào cả"
-#: remote.c:1732
+#: remote.c:1696
#, c-format
msgid "no such branch: '%s'"
msgstr "không có nhánh nào nhÆ° thế: “%sâ€"
-#: remote.c:1735
+#: remote.c:1699
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "không có thượng nguồn được cấu hình cho nhánh “%sâ€"
-#: remote.c:1741
+#: remote.c:1705
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
"nhánh thượng nguồn “%s†không được lưu lại như là một nhánh theo dõi máy chủ"
-#: remote.c:1756
+#: remote.c:1720
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "đẩy lên đích “%s†trên máy chủ “%s†không có nhánh theo dõi nội bộ"
-#: remote.c:1771
+#: remote.c:1735
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "nhánh “%s†không có máy chủ để đẩy lên"
-#: remote.c:1782
+#: remote.c:1746
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "đẩy refspecs cho “%s†không bao gồm “%sâ€"
-#: remote.c:1795
+#: remote.c:1759
msgid "push has no destination (push.default is 'nothing')"
msgstr "đẩy lên mà không có đích (push.default là “nothingâ€)"
-#: remote.c:1817
+#: remote.c:1781
msgid "cannot resolve 'simple' push to a single destination"
msgstr "không thể phân giải đẩy “đơn giản†đến một đích đơn"
-#: remote.c:2124
+#: remote.c:2083
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
"Nhánh của bạn dá»±a trên cÆ¡ sở là “%sâ€, nhÆ°ng trên thượng nguồn không còn.\n"
-#: remote.c:2128
+#: remote.c:2087
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n"
-#: remote.c:2131
+#: remote.c:2090
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Nhánh của bạn đã cập nhật vá»›i “%sâ€.\n"
-#: remote.c:2135
+#: remote.c:2094
#, 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] "Nhánh của bạn đứng trước “%s†%d lần chuyển giao.\n"
-#: remote.c:2141
+#: remote.c:2100
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n"
-#: remote.c:2144
+#: remote.c:2103
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1177,11 +1232,11 @@ msgstr[0] ""
"Nhánh của bạn đứng đằng sau “%s†%d lần chuyển giao, và có thể được chuyển-"
"tiếp-nhanh.\n"
-#: remote.c:2152
+#: remote.c:2111
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n"
-#: remote.c:2155
+#: remote.c:2114
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1194,30 +1249,30 @@ msgstr[0] ""
"và có %d và %d lần chuyển giao khác nhau cho từng cái,\n"
"tương ứng với mỗi lần.\n"
-#: remote.c:2165
+#: remote.c:2124
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của "
"bạn)\n"
-#: revision.c:2198
+#: revision.c:2191
msgid "your current branch appears to be broken"
msgstr "nhánh hiện tại của bạn có vẻ nhÆ° bị há»ng"
-#: revision.c:2201
+#: revision.c:2194
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "nhánh hiện tại của bạn “%s†không có một lần chuyển giao nào cả"
-#: revision.c:2395
+#: revision.c:2388
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent xung khắc với --bisect"
-#: run-command.c:83
+#: run-command.c:90
msgid "open /dev/null failed"
msgstr "gặp lá»—i khi mở “/dev/nullâ€"
-#: run-command.c:85
+#: run-command.c:92
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) gặp lỗi"
@@ -1290,7 +1345,7 @@ msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới"
#: sequencer.c:327
msgid "Could not resolve HEAD commit\n"
-msgstr "Không thể phân giải commit (lần chuyển giao) HEAD\n"
+msgstr "Không thể phân giải lần chuyển giao HEAD\n"
#: sequencer.c:347
msgid "Unable to update cache tree\n"
@@ -1437,7 +1492,7 @@ msgstr "không thể phân giải HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "không thể hủy bỠtừ một nhánh mà nó còn chưa được tạo ra"
-#: sequencer.c:887 builtin/apply.c:4291
+#: sequencer.c:887 builtin/apply.c:4287
#, c-format
msgid "cannot open %s: %s"
msgstr "không thể mở %s: %s"
@@ -1479,12 +1534,12 @@ msgstr "Không thể hoàn nguyên một lần chuyển giao khởi tạo"
msgid "Can't cherry-pick into empty head"
msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng"
-#: setup.c:243
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "gặp lá»—i khi Ä‘á»c %s"
-#: sha1_name.c:453
+#: sha1_name.c:463
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1533,7 +1588,7 @@ msgstr "Không thể gỡ bỠmục .gitmodules dành cho %s"
msgid "staging updated .gitmodules failed"
msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
-#: submodule.c:1045
+#: submodule.c:1040
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "Không thể đặt “core.worktree†trong “%sâ€."
@@ -1544,7 +1599,7 @@ msgstr "Không thể đặt “core.worktree†trong “%sâ€."
msgid "unknown value '%s' for key '%s'"
msgstr "không hiểu giá trị “%s†cho khóa “%sâ€"
-#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
#, c-format
msgid "more than one %s"
msgstr "nhiá»u hÆ¡n má»™t %s"
@@ -1611,8 +1666,8 @@ msgstr "không thể mở “%s†để Ä‘á»c và ghi"
msgid "could not open '%s' for writing"
msgstr "không thể mở “%s†để ghi"
-#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
-#: builtin/merge.c:1076 builtin/pull.c:380
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
#, c-format
msgid "could not open '%s' for reading"
msgstr "không thể mở “%s†để Ä‘á»c"
@@ -1640,17 +1695,17 @@ msgstr "không có ngÆ°á»i dùng nhÆ° vậy"
msgid "unable to get current working directory"
msgstr "Không thể lấy thư mục làm việc hiện hành"
-#: wrapper.c:631
+#: wrapper.c:647
#, c-format
msgid "could not open %s for writing"
msgstr "không thể mở %s để ghi"
-#: wrapper.c:642 builtin/am.c:424
+#: wrapper.c:658 builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "không thể ghi vào %s"
-#: wrapper.c:648
+#: wrapper.c:664
#, c-format
msgid "could not close %s"
msgstr "không thể đóng %s"
@@ -2005,27 +2060,27 @@ msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
-#: wt-status.c:1437
+#: wt-status.c:1438
msgid "On branch "
msgstr "Trên nhánh "
-#: wt-status.c:1445
+#: wt-status.c:1444
msgid "interactive rebase in progress; onto "
msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
-#: wt-status.c:1447
+#: wt-status.c:1446
msgid "rebase in progress; onto "
msgstr "rebase đang được thực hiện: lên trên "
-#: wt-status.c:1452
+#: wt-status.c:1451
msgid "HEAD detached at "
msgstr "HEAD được tách rá»i tại "
-#: wt-status.c:1454
+#: wt-status.c:1453
msgid "HEAD detached from "
msgstr "HEAD được tách rá»i từ "
-#: wt-status.c:1457
+#: wt-status.c:1456
msgid "Not currently on any branch."
msgstr "Hiện tại chẳng ở nhánh nào cả."
@@ -2117,23 +2172,23 @@ msgstr ""
msgid "nothing to commit, working directory clean\n"
msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
-#: wt-status.c:1644
-msgid "HEAD (no branch)"
-msgstr "HEAD (không nhánh)"
-
-#: wt-status.c:1650
+#: wt-status.c:1642
msgid "Initial commit on "
msgstr "Lần chuyển giao khởi tạo trên "
-#: wt-status.c:1677
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
+msgstr "HEAD (không nhánh)"
+
+#: wt-status.c:1675
msgid "gone"
msgstr "đã ra đi"
-#: wt-status.c:1679 wt-status.c:1687
+#: wt-status.c:1677 wt-status.c:1685
msgid "behind "
msgstr "đằng sau "
-#: compat/precompose_utf8.c:55 builtin/clone.c:403
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
#, c-format
msgid "failed to unlink '%s'"
msgstr "gặp lá»—i khi bá» liên kết (unlink) “%sâ€"
@@ -2147,7 +2202,7 @@ msgstr "git add [<các-tùy-chá»n>] [--] <pathspec>…"
msgid "unexpected diff status %c"
msgstr "trạng thái lệnh diff không như mong đợi %c"
-#: builtin/add.c:70 builtin/commit.c:277
+#: builtin/add.c:70 builtin/commit.c:278
msgid "updating files failed"
msgstr "Cập nhật tập tin gặp lỗi"
@@ -2161,7 +2216,7 @@ msgid "Unstaged changes after refreshing the index:"
msgstr ""
"ÄÆ°a ra khá»i bệ phóng các thay đổi sau khi làm tÆ°Æ¡i má»›i lại bảng mục lục:"
-#: builtin/add.c:194 builtin/rev-parse.c:799
+#: builtin/add.c:194 builtin/rev-parse.c:796
msgid "Could not read the index"
msgstr "Không thể Ä‘á»c bảng mục lục"
@@ -2198,15 +2253,15 @@ msgstr ""
"Các Ä‘Æ°á»ng dẫn theo sau đây sẽ bị lá» Ä‘i bởi má»™t trong các tập tin .gitignore "
"của bạn:\n"
-#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
-#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "chạy thử"
-#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
-#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
-#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "chi tiết"
@@ -2214,7 +2269,7 @@ msgstr "chi tiết"
msgid "interactive picking"
msgstr "sửa bằng cách tương tác"
-#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "chá»n “hunks†theo kiểu tÆ°Æ¡ng tác"
@@ -2275,146 +2330,147 @@ msgstr "-A và -u xung khắc nhau"
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Tùy chá»n --ignore-missing chỉ có thể được dùng cùng vá»›i --dry-run"
-#: builtin/add.c:358
+#: builtin/add.c:352
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n"
-#: builtin/add.c:359
+#: builtin/add.c:353
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Có lẽ ý bạn là “git add .†phải không?\n"
-#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
-#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
msgid "index file corrupt"
msgstr "tập tin ghi bảng mục lục bị há»ng"
-#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Không thể ghi tập tin lưu bảng mục lục mới"
-#: builtin/am.c:41
+#: builtin/am.c:42
#, c-format
msgid "could not stat %s"
msgstr "không thể lấy thông tin thống kê vỠ%s"
-#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737 builtin/merge.c:1079
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
#, c-format
msgid "could not read '%s'"
msgstr "Không thể Ä‘á»c “%sâ€."
-#: builtin/am.c:444
+#: builtin/am.c:445
msgid "could not parse author script"
msgstr "không thể phân tích cú pháp văn lệnh tác giả"
-#: builtin/am.c:521
+#: builtin/am.c:522
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "“%s†bị xóa bởi móc applypatch-msg"
-#: builtin/am.c:562 builtin/notes.c:300
+#: builtin/am.c:563 builtin/notes.c:300
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Dòng đầu vào dị hình: “%sâ€."
-#: builtin/am.c:599 builtin/notes.c:315
+#: builtin/am.c:600 builtin/notes.c:315
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Gặp lá»—i khi sao chép ghi chú (note) từ “%s†tá»›i “%sâ€"
-#: builtin/am.c:625
+#: builtin/am.c:626
msgid "fseek failed"
msgstr "fseek gặp lỗi"
-#: builtin/am.c:786 builtin/am.c:874
+#: builtin/am.c:787 builtin/am.c:875
#, c-format
msgid "could not open '%s' for reading: %s"
msgstr "không thể mở “%s†để Ä‘á»c: %s"
-#: builtin/am.c:793
+#: builtin/am.c:794
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "Không thể mở “%s†để ghi: %s"
-#: builtin/am.c:802
+#: builtin/am.c:803
#, c-format
msgid "could not parse patch '%s'"
msgstr "không thể phân tích cú pháp “%sâ€"
-#: builtin/am.c:867
+#: builtin/am.c:868
msgid "Only one StGIT patch series can be applied at once"
msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc"
-#: builtin/am.c:915
+#: builtin/am.c:916
msgid "invalid timestamp"
msgstr "dấu thá»i gian không hợp lệ"
-#: builtin/am.c:918 builtin/am.c:926
+#: builtin/am.c:919 builtin/am.c:927
msgid "invalid Date line"
msgstr "dòng Ngày tháng không hợp lệ"
-#: builtin/am.c:923
+#: builtin/am.c:924
msgid "invalid timezone offset"
msgstr "độ lệch múi giỠkhông hợp lệ"
-#: builtin/am.c:1010
+#: builtin/am.c:1011
msgid "Patch format detection failed."
msgstr "Dò tìm định dạng miếng vá gặp lỗi."
-#: builtin/am.c:1015 builtin/clone.c:368
+#: builtin/am.c:1016 builtin/clone.c:373
#, c-format
msgid "failed to create directory '%s'"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/am.c:1019
+#: builtin/am.c:1020
msgid "Failed to split patches."
msgstr "Gặp lỗi khi chia nhỠcác miếng vá."
-#: builtin/am.c:1151 builtin/commit.c:362
+#: builtin/am.c:1152 builtin/commit.c:363
msgid "unable to write index file"
msgstr "không thể ghi tập tin lưu mục lục"
-#: builtin/am.c:1202
+#: builtin/am.c:1203
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"."
-#: builtin/am.c:1203
+#: builtin/am.c:1204
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Nếu bạn muốn bỠqua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế."
-#: builtin/am.c:1204
+#: builtin/am.c:1205
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "Äể phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"."
-#: builtin/am.c:1339
+#: builtin/am.c:1343
msgid "Patch is empty. Was it split wrong?"
msgstr "Miếng vá trống rỗng. Quá trình chia nhỠmiếng vá có lỗi?"
-#: builtin/am.c:1413 builtin/log.c:1345
+#: builtin/am.c:1417 builtin/log.c:1344
#, c-format
msgid "invalid ident line: %s"
msgstr "dòng thụt lỠkhông hợp lệ: %s"
-#: builtin/am.c:1440
+#: builtin/am.c:1444
#, c-format
msgid "unable to parse commit %s"
msgstr "không thể phân tích lần chuyển giao “%sâ€"
-#: builtin/am.c:1614
+#: builtin/am.c:1646
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Kho thiếu đối tượng blob cần thiết để trở vá» trên “3-way mergeâ€."
-#: builtin/am.c:1616
+#: builtin/am.c:1648
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…"
-#: builtin/am.c:1635
+#: builtin/am.c:1667
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2422,38 +2478,38 @@ msgstr ""
"Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n"
"Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó."
-#: builtin/am.c:1641
+#: builtin/am.c:1673
msgid "Falling back to patching base and 3-way merge..."
msgstr "Äang trở lại để vá cÆ¡ sở và “hòa trá»™n 3-Ä‘Æ°á»ngâ€â€¦"
-#: builtin/am.c:1666
+#: builtin/am.c:1688
msgid "Failed to merge in the changes."
msgstr "Gặp lỗi khi trộn vào các thay đổi."
-#: builtin/am.c:1691 builtin/merge.c:632
+#: builtin/am.c:1712 builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr "lệnh git write-tree gặp lỗi khi ghi một cây"
-#: builtin/am.c:1698
+#: builtin/am.c:1719
msgid "applying to an empty history"
msgstr "áp dụng vào một lịch sử trống rỗng"
-#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
#: builtin/merge.c:854
msgid "failed to write commit object"
msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
-#: builtin/am.c:1743 builtin/am.c:1747
+#: builtin/am.c:1764 builtin/am.c:1768
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "không thể phục hồi: %s không tồn tại."
-#: builtin/am.c:1763
+#: builtin/am.c:1784
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"không thể được tương tác mà không có stdin kết nối với một thiết bị cuối"
-#: builtin/am.c:1768
+#: builtin/am.c:1789
msgid "Commit Body is:"
msgstr "Thân của lần chuyển giao là:"
@@ -2461,37 +2517,37 @@ msgstr "Thân của lần chuyển giao là:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1778
+#: builtin/am.c:1799
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-"Ãp dụng? đồng ý [y]/khô[n]g/chỉnh sá»­a [e]/hiển thị miếng [v]á/đồng ý tất cả "
-"[a]: "
+"Ãp dụng? đồng ý [y]/khô[n]g/chỉnh sá»­a [e]/hiển thị miếng [v]á/chấp nhận tất "
+"cả [a]: "
-#: builtin/am.c:1828
+#: builtin/am.c:1849
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)"
-#: builtin/am.c:1863 builtin/am.c:1934
+#: builtin/am.c:1884 builtin/am.c:1955
#, c-format
msgid "Applying: %.*s"
msgstr "Ãp dụng: %.*s"
-#: builtin/am.c:1879
+#: builtin/am.c:1900
msgid "No changes -- Patch already applied."
msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi."
-#: builtin/am.c:1887
+#: builtin/am.c:1908
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Gặp lỗi khi vá tại %s %.*s"
-#: builtin/am.c:1893
+#: builtin/am.c:1914
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s"
-#: builtin/am.c:1937
+#: builtin/am.c:1958
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2502,7 +2558,7 @@ msgstr ""
"đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỠqua miếng "
"vá này."
-#: builtin/am.c:1944
+#: builtin/am.c:1965
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2510,17 +2566,17 @@ msgstr ""
"Bạn vẫn có những Ä‘Æ°á»ng dẫn chÆ°a được hòa trá»™n trong bảng mục lục của mình.\n"
"Bạn đã quên sử dụng lệnh “git add†à?"
-#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "không thể phân tích đối tượng “%sâ€."
-#: builtin/am.c:2104
+#: builtin/am.c:2125
msgid "failed to clean index"
msgstr "gặp lá»—i khi dá»n bảng mục lục"
-#: builtin/am.c:2138
+#: builtin/am.c:2159
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2528,151 +2584,153 @@ msgstr ""
"Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am†thất bại cuối cùng.\n"
"Không thể chuyển tới ORIG_HEAD"
-#: builtin/am.c:2199
+#: builtin/am.c:2220
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Giá trị không hợp lệ cho --patch-format: %s"
-#: builtin/am.c:2221
-msgid "git am [options] [(<mbox>|<Maildir>)...]"
-msgstr "git am [các-tùy-chá»n] [(<mbox>|<Maildir>)…]"
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+msgstr "git am [<các-tùy-chá»n>] [(<mbox>|<Maildir>)…]"
-#: builtin/am.c:2222
-msgid "git am [options] (--continue | --skip | --abort)"
-msgstr "git am [các-tùy-chá»n] (--continue | --skip | --abort)"
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<các-tùy-chá»n>] (--continue | --skip | --abort)"
-#: builtin/am.c:2228
+#: builtin/am.c:2260
msgid "run interactively"
msgstr "chạy kiểu tương tác"
-#: builtin/am.c:2230
+#: builtin/am.c:2262
msgid "historical option -- no-op"
msgstr "tùy chá»n lịch sá»­ -- không-toán-tá»­"
-#: builtin/am.c:2232
+#: builtin/am.c:2264
msgid "allow fall back on 3way merging if needed"
msgstr "cho phép quay trở lại để hòa trộn kiểu “3way†nếu cần"
-#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "im lặng"
-#: builtin/am.c:2235
+#: builtin/am.c:2267
msgid "add a Signed-off-by line to the commit message"
msgstr "Thêm dòng Signed-off-by cho ghi chú của lần chuyển giao"
-#: builtin/am.c:2238
+#: builtin/am.c:2270
msgid "recode into utf8 (default)"
msgstr "chuyển mã thành utf8 (mặc định)"
-#: builtin/am.c:2240
+#: builtin/am.c:2272
msgid "pass -k flag to git-mailinfo"
msgstr "chuyển cỠ-k cho git-mailinfo"
-#: builtin/am.c:2242
+#: builtin/am.c:2274
msgid "pass -b flag to git-mailinfo"
msgstr "chuyển cỠ-b cho git-mailinfo"
-#: builtin/am.c:2244
+#: builtin/am.c:2276
msgid "pass -m flag to git-mailinfo"
-msgstr "chuyển cỠ-b cho git-mailinfo"
+msgstr "chuyển cỠ-m cho git-mailinfo"
-#: builtin/am.c:2246
+#: builtin/am.c:2278
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "chuyển cỠ--keep-cr cho git-mailsplit với định dạng mbox"
-#: builtin/am.c:2249
+#: builtin/am.c:2281
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"đừng chuyển cỠ--keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr"
-#: builtin/am.c:2252
+#: builtin/am.c:2284
msgid "strip everything before a scissors line"
msgstr "cắt má»i thứ trÆ°á»›c dòng scissors"
-#: builtin/am.c:2253 builtin/apply.c:4563
+#: builtin/am.c:2285 builtin/apply.c:4554
msgid "action"
msgstr "hành động"
-#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2281
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
msgid "pass it through git-apply"
msgstr "chuyển nó qua git-apply"
-#: builtin/am.c:2262 builtin/apply.c:4587
+#: builtin/am.c:2294 builtin/apply.c:4578
msgid "root"
-msgstr "root"
+msgstr "gốc"
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525
-#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
-#: builtin/pull.c:167
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
msgid "path"
msgstr "Ä‘Æ°á»ng-dẫn"
-#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
-#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
-#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
-#: parse-options.h:134 parse-options.h:243
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2274 builtin/apply.c:4531
+#: builtin/am.c:2306 builtin/apply.c:4522
msgid "num"
msgstr "số"
-#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
msgid "format"
msgstr "định dạng"
-#: builtin/am.c:2278
+#: builtin/am.c:2310
msgid "format the patch(es) are in"
msgstr "định dạng (các) miếng vá theo"
-#: builtin/am.c:2284
+#: builtin/am.c:2316
msgid "override error message when patch failure occurs"
msgstr "đè lên các lá»i nhắn lá»—i khi xảy ra lá»—i vá nghiêm trá»ng"
-#: builtin/am.c:2286
+#: builtin/am.c:2318
msgid "continue applying patches after resolving a conflict"
msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột"
-#: builtin/am.c:2289
+#: builtin/am.c:2321
msgid "synonyms for --continue"
msgstr "đồng nghĩa với --continue"
-#: builtin/am.c:2292
+#: builtin/am.c:2324
msgid "skip the current patch"
msgstr "bỠqua miếng vá hiện hành"
-#: builtin/am.c:2295
+#: builtin/am.c:2327
msgid "restore the original branch and abort the patching operation."
msgstr "phục hồi lại nhánh gốc và loại bỠthao tác vá."
-#: builtin/am.c:2299
+#: builtin/am.c:2331
msgid "lie about committer date"
msgstr "nói dối vỠngày chuyển giao"
-#: builtin/am.c:2301
+#: builtin/am.c:2333
msgid "use current timestamp for author date"
msgstr "dùng dấu thá»i gian hiện tại cho ngày tác giả"
-#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225
-#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "mã-số-khóa"
-#: builtin/am.c:2304
+#: builtin/am.c:2336
msgid "GPG-sign commits"
msgstr "lần chuyển giao ký-GPG"
-#: builtin/am.c:2307
+#: builtin/am.c:2339
msgid "(internal use for git-rebase)"
msgstr "(dùng nội bộ cho git-rebase)"
-#: builtin/am.c:2322
+#: builtin/am.c:2354
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -2680,16 +2738,16 @@ msgstr ""
"Tùy chá»n -b/--binary đã không dùng từ lâu rồi, và\n"
"nó sẽ được bỠđi. Xin đừng sử dụng nó thêm nữa."
-#: builtin/am.c:2329
+#: builtin/am.c:2361
msgid "failed to read the index"
msgstr "gặp lá»—i Ä‘á»c bảng mục lục"
-#: builtin/am.c:2344
+#: builtin/am.c:2376
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra."
-#: builtin/am.c:2368
+#: builtin/am.c:2400
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2698,7 +2756,7 @@ msgstr ""
"Tìm thấy thư mục lạc %s.\n"
"Dùng \"git am --abort\" để loại bỠnó đi."
-#: builtin/am.c:2374
+#: builtin/am.c:2406
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại."
@@ -2706,65 +2764,65 @@ msgstr "Thao tác phân giải không được tiến hành, chúng ta không ph
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<các-tùy-chá»n>] [<miếng-vá>…]"
-#: builtin/apply.c:112
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "không nhận ra tùy chá»n vá» khoảng trắng “%sâ€"
-#: builtin/apply.c:127
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "không nhận ra tùy chá»n bá» qua khoảng trắng “%sâ€"
-#: builtin/apply.c:822
+#: builtin/apply.c:818
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
"Không thể chuẩn bị biểu thức chính qui dấu vết thá»i gian (timestamp regexp) "
"%s"
-#: builtin/apply.c:831
+#: builtin/apply.c:827
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "thi hành biểu thức chính quy trả vỠ%d cho đầu vào: %s"
-#: builtin/apply.c:912
+#: builtin/apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d"
-#: builtin/apply.c:944
+#: builtin/apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d"
-#: builtin/apply.c:948
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d"
-#: builtin/apply.c:949
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d"
-#: builtin/apply.c:956
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff sai - cần “/dev/null†trên dòng %d"
-#: builtin/apply.c:1419
+#: builtin/apply.c:1415
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "chi tiết: dòng không cần: %.*s"
-#: builtin/apply.c:1476
+#: builtin/apply.c:1472
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s"
-#: builtin/apply.c:1493
+#: builtin/apply.c:1489
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2776,76 +2834,76 @@ msgstr[0] ""
"phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỠđi %d trong "
"thành phần dẫn đầu tên của Ä‘Æ°á»ng dẫn (dòng %d)"
-#: builtin/apply.c:1659
+#: builtin/apply.c:1655
msgid "new file depends on old contents"
msgstr "tập tin mới phụ thuộc vào nội dung cũ"
-#: builtin/apply.c:1661
+#: builtin/apply.c:1657
msgid "deleted file still has contents"
msgstr "tập tin đã xóa vẫn còn nội dung"
-#: builtin/apply.c:1687
+#: builtin/apply.c:1683
#, c-format
msgid "corrupt patch at line %d"
msgstr "miếng vá há»ng tại dòng %d"
-#: builtin/apply.c:1723
+#: builtin/apply.c:1719
#, c-format
msgid "new file %s depends on old contents"
msgstr "tập tin mới %s phụ thuộc vào nội dung cũ"
-#: builtin/apply.c:1725
+#: builtin/apply.c:1721
#, c-format
msgid "deleted file %s still has contents"
msgstr "tập tin đã xóa %s vẫn còn nội dung"
-#: builtin/apply.c:1728
+#: builtin/apply.c:1724
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa"
-#: builtin/apply.c:1874
+#: builtin/apply.c:1870
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "miếng vá định dạng nhị phân sai há»ng tại dòng %d: %.*s"
-#: builtin/apply.c:1903
+#: builtin/apply.c:1899
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d"
-#: builtin/apply.c:2054
+#: builtin/apply.c:2050
#, c-format
msgid "patch with only garbage at line %d"
msgstr "vá chỉ với “rác†tại dòng %d"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2140
#, c-format
msgid "unable to read symlink %s"
msgstr "không thể Ä‘á»c liên kết má»m %s"
-#: builtin/apply.c:2148
+#: builtin/apply.c:2144
#, c-format
msgid "unable to open or read %s"
msgstr "không thể mở hay Ä‘á»c %s"
-#: builtin/apply.c:2781
+#: builtin/apply.c:2777
#, c-format
msgid "invalid start of line: '%c'"
msgstr "sai khởi đầu dòng: “%câ€"
-#: builtin/apply.c:2900
+#: builtin/apply.c:2896
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)."
-#: builtin/apply.c:2912
+#: builtin/apply.c:2908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
-#: builtin/apply.c:2918
+#: builtin/apply.c:2914
#, c-format
msgid ""
"while searching for:\n"
@@ -2854,324 +2912,324 @@ msgstr ""
"trong khi đang tìm kiếm cho:\n"
"%.*s"
-#: builtin/apply.c:2938
+#: builtin/apply.c:2934
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%sâ€"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3035
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%sâ€"
-#: builtin/apply.c:3045
+#: builtin/apply.c:3041
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"vá nhị phân cho “%s†tạo ra kết quả không chính xác (mong chỠ%s, lại nhận "
"%s)"
-#: builtin/apply.c:3066
+#: builtin/apply.c:3062
#, c-format
msgid "patch failed: %s:%ld"
msgstr "gặp lỗi khi vá: %s:%ld"
-#: builtin/apply.c:3190
+#: builtin/apply.c:3186
#, c-format
msgid "cannot checkout %s"
msgstr "không thể lấy ra %s"
-#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
#, c-format
msgid "read of %s failed"
msgstr "Ä‘á»c %s gặp lá»—i"
-#: builtin/apply.c:3243
+#: builtin/apply.c:3239
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "Ä‘á»c từ “%s†vượt ra ngoài liên kết má»m"
-#: builtin/apply.c:3271 builtin/apply.c:3493
+#: builtin/apply.c:3267 builtin/apply.c:3489
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "Ä‘Æ°á»ng dẫn %s đã bị xóa hoặc đổi tên"
-#: builtin/apply.c:3352 builtin/apply.c:3507
+#: builtin/apply.c:3348 builtin/apply.c:3503
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: không tồn tại trong bảng mục lục"
-#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3361 builtin/apply.c:3515
+#: builtin/apply.c:3357 builtin/apply.c:3511
#, c-format
msgid "%s: does not match index"
msgstr "%s: không khớp trong mục lục"
-#: builtin/apply.c:3463
+#: builtin/apply.c:3459
msgid "removal patch leaves file contents"
msgstr "loại bỠmiếng vá để lại nội dung tập tin"
-#: builtin/apply.c:3532
+#: builtin/apply.c:3528
#, c-format
msgid "%s: wrong type"
msgstr "%s: sai kiểu"
-#: builtin/apply.c:3534
+#: builtin/apply.c:3530
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s có kiểu %o, cần %o"
-#: builtin/apply.c:3693 builtin/apply.c:3695
+#: builtin/apply.c:3689 builtin/apply.c:3691
#, c-format
msgid "invalid path '%s'"
msgstr "Ä‘Æ°á»ng dẫn không hợp lệ “%sâ€"
-#: builtin/apply.c:3750
+#: builtin/apply.c:3746
#, c-format
msgid "%s: already exists in index"
msgstr "%s: đã có từ trước trong bảng mục lục"
-#: builtin/apply.c:3753
+#: builtin/apply.c:3749
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: đã sẵn có trong thư mục đang làm việc"
-#: builtin/apply.c:3773
+#: builtin/apply.c:3769
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)"
-#: builtin/apply.c:3778
+#: builtin/apply.c:3774
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3794
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "tập tin chịu tác Ä‘á»™ng “%s†vượt ra ngoài liên kết má»m"
-#: builtin/apply.c:3802
+#: builtin/apply.c:3798
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: miếng vá không được áp dụng"
-#: builtin/apply.c:3816
+#: builtin/apply.c:3812
#, c-format
msgid "Checking patch %s..."
msgstr "Äang kiểm tra miếng vá %s…"
-#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry gặp lá»—i đối vá»›i Ä‘Æ°á»ng dẫn “%sâ€"
-#: builtin/apply.c:4052
+#: builtin/apply.c:4048
#, c-format
msgid "unable to remove %s from index"
msgstr "không thể gỡ bỠ%s từ mục lục"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4077
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "miếng vá sai há»ng cho mô-Ä‘un-con %s"
-#: builtin/apply.c:4085
+#: builtin/apply.c:4081
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "không thể lấy thống kỠvỠtập tin %s mới hơn đã được tạo"
-#: builtin/apply.c:4090
+#: builtin/apply.c:4086
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "không thể tạo “kho lưu đằng sau†cho tập tin được tạo mới hơn %s"
-#: builtin/apply.c:4093 builtin/apply.c:4201
+#: builtin/apply.c:4089 builtin/apply.c:4197
#, c-format
msgid "unable to add cache entry for %s"
msgstr "không thể thêm mục nhớ đệm cho %s"
-#: builtin/apply.c:4126
+#: builtin/apply.c:4122
#, c-format
msgid "closing file '%s'"
msgstr "Ä‘ang đóng tập tin “%sâ€"
-#: builtin/apply.c:4175
+#: builtin/apply.c:4171
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "không thể ghi vào tập tin “%s†chế độ %o"
-#: builtin/apply.c:4262
+#: builtin/apply.c:4258
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Äã áp dụng miếng vá %s má»™t cách sạch sẽ."
-#: builtin/apply.c:4270
+#: builtin/apply.c:4266
msgid "internal error"
msgstr "lá»—i ná»™i bá»™"
-#: builtin/apply.c:4273
+#: builtin/apply.c:4269
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Äang áp dụng miếng vá %%s vá»›i %d lần từ chối…"
-#: builtin/apply.c:4283
+#: builtin/apply.c:4279
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej"
-#: builtin/apply.c:4304
+#: builtin/apply.c:4300
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Khối nhá»› #%d được áp dụng gá»n gàng."
-#: builtin/apply.c:4307
+#: builtin/apply.c:4303
#, c-format
msgid "Rejected hunk #%d."
msgstr "đoạn dữ liệu #%d bị từ chối."
-#: builtin/apply.c:4397
+#: builtin/apply.c:4393
msgid "unrecognized input"
msgstr "không thừa nhận đầu vào"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4404
msgid "unable to read index file"
msgstr "không thể Ä‘á»c tập tin lÆ°u bảng mục lục"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4517
msgid "don't apply changes matching the given path"
msgstr "không áp dụng các thay đổi khá»›p vá»›i Ä‘Æ°á»ng dẫn đã cho"
-#: builtin/apply.c:4529
+#: builtin/apply.c:4520
msgid "apply changes matching the given path"
msgstr "áp dụng các thay đổi khá»›p vá»›i Ä‘Æ°á»ng dẫn đã cho"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4523
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "gỡ bá» <số> dấu gạch chéo dẫn đầu từ Ä‘Æ°á»ng dẫn diff cổ Ä‘iển"
-#: builtin/apply.c:4535
+#: builtin/apply.c:4526
msgid "ignore additions made by the patch"
msgstr "lỠđi phần bổ xung được tạo ra bởi miếng vá"
-#: builtin/apply.c:4537
+#: builtin/apply.c:4528
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra"
-#: builtin/apply.c:4541
+#: builtin/apply.c:4532
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4534
msgid "instead of applying the patch, output a summary for the input"
msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4536
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4538
msgid "make sure the patch is applicable to the current index"
msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành"
-#: builtin/apply.c:4549
+#: builtin/apply.c:4540
msgid "apply a patch without touching the working tree"
msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc"
-#: builtin/apply.c:4551
+#: builtin/apply.c:4542
msgid "accept a patch that touches outside the working area"
msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc"
-#: builtin/apply.c:4553
+#: builtin/apply.c:4544
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"đồng thá»i áp dụng miếng vá (dùng vá»›i tùy chá»n --stat/--summary/--check)"
-#: builtin/apply.c:4555
+#: builtin/apply.c:4546
msgid "attempt three-way merge if a patch does not apply"
msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được"
-#: builtin/apply.c:4557
+#: builtin/apply.c:4548
msgid "build a temporary index based on embedded index information"
msgstr ""
"xây dá»±ng bảng mục lục tạm thá»i trên cÆ¡ sở thông tin bảng mục lục được nhúng"
-#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr "các Ä‘Æ°á»ng dẫn bị ngăn cách bởi ký tá»± NULL"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4553
msgid "ensure at least <n> lines of context match"
msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp"
-#: builtin/apply.c:4564
+#: builtin/apply.c:4555
msgid "detect new or modified lines that have whitespace errors"
msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng"
-#: builtin/apply.c:4567 builtin/apply.c:4570
+#: builtin/apply.c:4558 builtin/apply.c:4561
msgid "ignore changes in whitespace when finding context"
msgstr "lỠđi sự thay đổi do khoảng trắng gây ra khi quét nội dung"
-#: builtin/apply.c:4573
+#: builtin/apply.c:4564
msgid "apply the patch in reverse"
msgstr "áp dụng miếng vá theo chiá»u ngược"
-#: builtin/apply.c:4575
+#: builtin/apply.c:4566
msgid "don't expect at least one line of context"
msgstr "đừng hy vá»ng có ít nhất má»™t dòng ná»™i dung"
-#: builtin/apply.c:4577
+#: builtin/apply.c:4568
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng"
-#: builtin/apply.c:4579
+#: builtin/apply.c:4570
msgid "allow overlapping hunks"
msgstr "cho phép chồng khối nhớ"
-#: builtin/apply.c:4582
+#: builtin/apply.c:4573
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin"
-#: builtin/apply.c:4585
+#: builtin/apply.c:4576
msgid "do not trust the line counts in the hunk headers"
msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu"
-#: builtin/apply.c:4588
+#: builtin/apply.c:4579
msgid "prepend <root> to all filenames"
msgstr "treo thêm <root> vào tất cả các tên tập tin"
-#: builtin/apply.c:4610
+#: builtin/apply.c:4601
msgid "--3way outside a repository"
msgstr "--3way ở ngoài một kho chứa"
-#: builtin/apply.c:4618
+#: builtin/apply.c:4609
msgid "--index outside a repository"
msgstr "--index ở ngoài một kho chứa"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4612
msgid "--cached outside a repository"
msgstr "--cached ở ngoài một kho chứa"
-#: builtin/apply.c:4640
+#: builtin/apply.c:4631
#, c-format
msgid "can't open patch '%s'"
msgstr "không thể mở miếng vá “%sâ€"
-#: builtin/apply.c:4654
+#: builtin/apply.c:4645
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "đã chấm dứt %d lỗi khoảng trắng"
-#: builtin/apply.c:4660 builtin/apply.c:4670
+#: builtin/apply.c:4651 builtin/apply.c:4661
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3233,97 +3291,97 @@ msgstr "git blame [<các-tùy-chá»n>] [<rev-opts>] [<rev>] [--] <tập-tin>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)"
-#: builtin/blame.c:2500
+#: builtin/blame.c:2519
msgid "Show blame entries as we find them, incrementally"
msgstr "Hiển thị các mục “blame†như là chúng ta thấy chúng, tăng dần"
-#: builtin/blame.c:2501
+#: builtin/blame.c:2520
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)"
-#: builtin/blame.c:2502
+#: builtin/blame.c:2521
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)"
-#: builtin/blame.c:2503
+#: builtin/blame.c:2522
msgid "Show work cost statistics"
msgstr "Hiển thị thống kê công sức làm việc"
-#: builtin/blame.c:2504
+#: builtin/blame.c:2523
msgid "Show output score for blame entries"
msgstr "Hiển thị kết xuất Ä‘iểm số có các mục tin “blameâ€"
-#: builtin/blame.c:2505
+#: builtin/blame.c:2524
msgid "Show original filename (Default: auto)"
msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)"
-#: builtin/blame.c:2506
+#: builtin/blame.c:2525
msgid "Show original linenumber (Default: off)"
msgstr "Hiển thị số dòng gốc (Mặc định: off)"
-#: builtin/blame.c:2507
+#: builtin/blame.c:2526
msgid "Show in a format designed for machine consumption"
msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy"
-#: builtin/blame.c:2508
+#: builtin/blame.c:2527
msgid "Show porcelain format with per-line commit information"
msgstr "Hiển thị định dạng “porcelain†với thông tin chuyển giao mỗi dòng"
-#: builtin/blame.c:2509
+#: builtin/blame.c:2528
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Dùng cùng chế độ xuất ra với git-annotate (Mặc định: off)"
-#: builtin/blame.c:2510
+#: builtin/blame.c:2529
msgid "Show raw timestamp (Default: off)"
msgstr "Hiển thị dấu vết thá»i gian dạng thô (Mặc định: off)"
-#: builtin/blame.c:2511
+#: builtin/blame.c:2530
msgid "Show long commit SHA1 (Default: off)"
msgstr "Hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)"
-#: builtin/blame.c:2512
+#: builtin/blame.c:2531
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Không hiển thị tên tác giả và dấu vết thá»i gian (Mặc định: off)"
-#: builtin/blame.c:2513
+#: builtin/blame.c:2532
msgid "Show author email instead of name (Default: off)"
msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)"
-#: builtin/blame.c:2514
+#: builtin/blame.c:2533
msgid "Ignore whitespace differences"
msgstr "BỠqua các khác biệt do khoảng trắng gây ra"
-#: builtin/blame.c:2515
+#: builtin/blame.c:2534
msgid "Spend extra cycles to find better match"
msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa"
-#: builtin/blame.c:2516
+#: builtin/blame.c:2535
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
"Sá»­ dụng Ä‘iểm xét duyệt (revision) từ <tập tin> thay vì gá»i “git-rev-listâ€"
-#: builtin/blame.c:2517
+#: builtin/blame.c:2536
msgid "Use <file>'s contents as the final image"
msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng"
-#: builtin/blame.c:2518 builtin/blame.c:2519
+#: builtin/blame.c:2537 builtin/blame.c:2538
msgid "score"
msgstr "điểm số"
-#: builtin/blame.c:2518
+#: builtin/blame.c:2537
msgid "Find line copies within and across files"
msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin"
-#: builtin/blame.c:2519
+#: builtin/blame.c:2538
msgid "Find line movements within and across files"
msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "Process only line range n,m, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
@@ -3333,27 +3391,31 @@ msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2601
+#: builtin/blame.c:2620
msgid "4 years, 11 months ago"
msgstr "4 năm, 11 tháng trước"
-#: builtin/branch.c:24
+#: builtin/branch.c:25
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<các-tùy-chá»n>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<các-tùy-chá»n>] [-l] [-f] <tên-nhánh> [<Ä‘iểm-đầu>]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<các-tùy-chá»n>] [-r] (-d | -D) <tên-nhánh> …"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<các-tùy-chá»n>] (-m | -M) [<nhánh-cÅ©>] <nhánh-má»›i>"
-#: builtin/branch.c:150
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<các-tùy-chá»n>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:142
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3362,7 +3424,7 @@ msgstr ""
"đang xóa nhánh “%s†mà nó lại đã được hòa trộn vào\n"
" “%sâ€, nhÆ°ng vẫn chÆ°a được hòa trá»™n vào HEAD."
-#: builtin/branch.c:154
+#: builtin/branch.c:146
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3371,12 +3433,12 @@ msgstr ""
"không xóa nhánh “%s†cái mà chưa được hòa trộn vào\n"
" “%sâ€, cho dù là nó đã được hòa trá»™n vào HEAD."
-#: builtin/branch.c:168
+#: builtin/branch.c:160
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho “%sâ€"
-#: builtin/branch.c:172
+#: builtin/branch.c:164
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3385,306 +3447,298 @@ msgstr ""
"Nhánh “%s†không được trộn một cách đầy đủ.\n"
"Nếu bạn thá»±c sá»± muốn xóa nó, thì chạy lệnh “git branch -D %sâ€."
-#: builtin/branch.c:185
+#: builtin/branch.c:177
msgid "Update of config-file failed"
msgstr "Cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:213
+#: builtin/branch.c:205
msgid "cannot use -a with -d"
msgstr "không thể dùng tùy chá»n -a vá»›i -d"
-#: builtin/branch.c:219
+#: builtin/branch.c:211
msgid "Couldn't look up commit object for HEAD"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD"
-#: builtin/branch.c:227
+#: builtin/branch.c:219
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "Không thể xóa nhánh “%s†cái mà bạn hiện nay đang ở."
-#: builtin/branch.c:243
+#: builtin/branch.c:235
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "không tìm thấy nhánh theo dõi máy chủ “%sâ€."
-#: builtin/branch.c:244
+#: builtin/branch.c:236
#, c-format
msgid "branch '%s' not found."
msgstr "không tìm thấy nhánh “%sâ€."
-#: builtin/branch.c:259
+#: builtin/branch.c:251
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Gặp lá»—i khi Ä‘ang xóa nhánh theo dõi máy chủ “%sâ€"
-#: builtin/branch.c:260
+#: builtin/branch.c:252
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Gặp lá»—i khi xóa bá» nhánh “%sâ€"
-#: builtin/branch.c:267
+#: builtin/branch.c:259
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Äã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n"
-#: builtin/branch.c:268
+#: builtin/branch.c:260
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Nhánh “%s†đã bị xóa (từng là %s)\n"
-#: builtin/branch.c:369
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr "nhánh “%s†không chỉ đến một lần chuyển giao nào cả"
-
-#: builtin/branch.c:452
+#: builtin/branch.c:303
#, c-format
msgid "[%s: gone]"
msgstr "[%s: đã ra đi]"
-#: builtin/branch.c:457
+#: builtin/branch.c:308
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:462
+#: builtin/branch.c:313
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: đứng sau %d]"
-#: builtin/branch.c:464
+#: builtin/branch.c:315
#, c-format
msgid "[behind %d]"
msgstr "[đằng sau %d]"
-#: builtin/branch.c:468
+#: builtin/branch.c:319
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: phía trước %d]"
-#: builtin/branch.c:470
+#: builtin/branch.c:321
#, c-format
msgid "[ahead %d]"
msgstr "[phía trước %d]"
-#: builtin/branch.c:473
+#: builtin/branch.c:324
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: trÆ°á»›c %d, sau %d]"
-#: builtin/branch.c:476
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[trÆ°á»›c %d, sau %d]"
-#: builtin/branch.c:489
+#: builtin/branch.c:340
msgid " **** invalid ref ****"
msgstr " **** tham chiếu không hợp lệ ****"
-#: builtin/branch.c:580
+#: builtin/branch.c:366
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(không nhánh, đang cải tổ %s)"
-#: builtin/branch.c:583
+#: builtin/branch.c:369
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)"
-#: builtin/branch.c:589
+#: builtin/branch.c:375
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD được tách rá»i tại %s)"
-#: builtin/branch.c:592
+#: builtin/branch.c:378
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD được tách rá»i từ %s)"
-#: builtin/branch.c:596
+#: builtin/branch.c:382
msgid "(no branch)"
msgstr "(không nhánh)"
-#: builtin/branch.c:643
-#, c-format
-msgid "object '%s' does not point to a commit"
-msgstr "đối tượng “%s†không chỉ đến một lần chuyển giao nào cả"
-
-#: builtin/branch.c:691
-msgid "some refs could not be read"
-msgstr "má»™t số tham chiếu đã không thể Ä‘á»c được"
-
-#: builtin/branch.c:704
+#: builtin/branch.c:524
msgid "cannot rename the current branch while not on any."
msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:714
+#: builtin/branch.c:534
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Tên nhánh không hợp lệ: “%sâ€"
-#: builtin/branch.c:729
+#: builtin/branch.c:549
msgid "Branch rename failed"
msgstr "Gặp lỗi khi đổi tên nhánh"
-#: builtin/branch.c:733
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Äã đổi tên nhánh khuyết danh “%s†đi"
-#: builtin/branch.c:737
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!"
-#: builtin/branch.c:744
+#: builtin/branch.c:564
msgid "Branch is renamed, but update of config-file failed"
msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:759
-#, c-format
-msgid "malformed object name %s"
-msgstr "tên đối tượng dị hình %s"
-
-#: builtin/branch.c:781
+#: builtin/branch.c:587
#, c-format
msgid "could not write branch description template: %s"
msgstr "không thể ghi vào mẫu mô tả nhánh: %s"
-#: builtin/branch.c:811
+#: builtin/branch.c:616
msgid "Generic options"
msgstr "Tùy chá»n chung"
-#: builtin/branch.c:813
+#: builtin/branch.c:618
msgid "show hash and subject, give twice for upstream branch"
msgstr "hiển thị mã băm và chủ Ä‘á», Ä‘Æ°a ra hai lần cho nhánh thượng nguồn"
-#: builtin/branch.c:814
+#: builtin/branch.c:619
msgid "suppress informational messages"
msgstr "không xuất các thông tin"
-#: builtin/branch.c:815
+#: builtin/branch.c:620
msgid "set up tracking mode (see git-pull(1))"
msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
-#: builtin/branch.c:817
+#: builtin/branch.c:622
msgid "change upstream info"
msgstr "thay đổi thông tin thượng nguồn"
-#: builtin/branch.c:821
+#: builtin/branch.c:626
msgid "use colored output"
msgstr "tô màu kết xuất"
-#: builtin/branch.c:822
+#: builtin/branch.c:627
msgid "act on remote-tracking branches"
msgstr "thao tác trên nhánh “remote-trackingâ€"
-#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
-#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
-#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
-#: builtin/tag.c:624
-msgid "commit"
-msgstr "lần_chuyển_giao"
-
-#: builtin/branch.c:826 builtin/branch.c:832
+#: builtin/branch.c:629 builtin/branch.c:630
msgid "print only branches that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/branch.c:838
+#: builtin/branch.c:633
msgid "Specific git-branch actions:"
msgstr "Hành động git-branch:"
-#: builtin/branch.c:839
+#: builtin/branch.c:634
msgid "list both remote-tracking and local branches"
msgstr "liệt kê cả nhánh “remote-tracking†và nội bộ"
-#: builtin/branch.c:841
+#: builtin/branch.c:636
msgid "delete fully merged branch"
msgstr "xóa một toàn bộ nhánh đã hòa trộn"
-#: builtin/branch.c:842
+#: builtin/branch.c:637
msgid "delete branch (even if not merged)"
msgstr "xóa nhánh (cho dù là chưa được hòa trộn)"
-#: builtin/branch.c:843
+#: builtin/branch.c:638
msgid "move/rename a branch and its reflog"
msgstr "di chuyển hay đổi tên một nhánh và reflog của nó"
-#: builtin/branch.c:844
+#: builtin/branch.c:639
msgid "move/rename a branch, even if target exists"
msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn"
-#: builtin/branch.c:845
+#: builtin/branch.c:640
msgid "list branch names"
msgstr "liệt kê các tên nhánh"
-#: builtin/branch.c:846
+#: builtin/branch.c:641
msgid "create the branch's reflog"
msgstr "tạo reflog của nhánh"
-#: builtin/branch.c:848
+#: builtin/branch.c:643
msgid "edit the description for the branch"
msgstr "sửa mô tả cho nhánh"
-#: builtin/branch.c:849
+#: builtin/branch.c:644
msgid "force creation, move/rename, deletion"
msgstr "buộc tạo, di chuyển/đổi tên, xóa"
-#: builtin/branch.c:852
-msgid "print only not merged branches"
-msgstr "chỉ hiển thị các nhánh chưa được hòa trộn"
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
+msgstr "chỉ hiển thị những nhánh mà nó được hòa trộn"
-#: builtin/branch.c:858
-msgid "print only merged branches"
-msgstr "chỉ hiển thị các nhánh đã hòa trộn"
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
+msgstr "chỉ hiển thị những nhánh mà nó không được hòa trộn"
-#: builtin/branch.c:862
+#: builtin/branch.c:647
msgid "list branches in columns"
msgstr "liệt kê các nhánh trong các cột"
-#: builtin/branch.c:875
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr "khóa"
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr "tên trÆ°á»ng cần sắp xếp"
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr "đối tượng"
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr "chỉ hiển thị các nhánh của đối tượng"
+
+#: builtin/branch.c:670
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ."
-#: builtin/branch.c:879 builtin/clone.c:690
+#: builtin/branch.c:674 builtin/clone.c:697
msgid "HEAD not found below refs/heads!"
msgstr "không tìm thấy HEAD ở dưới refs/heads!"
-#: builtin/branch.c:901
+#: builtin/branch.c:694
msgid "--column and --verbose are incompatible"
msgstr "tùy chá»n --column và --verbose xung khắc nhau"
-#: builtin/branch.c:912 builtin/branch.c:951
+#: builtin/branch.c:705 builtin/branch.c:747
msgid "branch name required"
msgstr "cần chỉ ra tên nhánh"
-#: builtin/branch.c:927
+#: builtin/branch.c:723
msgid "Cannot give description to detached HEAD"
msgstr "Không thể Ä‘Æ°a ra mô tả HEAD đã tách rá»i"
-#: builtin/branch.c:932
+#: builtin/branch.c:728
msgid "cannot edit description of more than one branch"
msgstr "không thể sá»­a mô tả cho nhiá»u hÆ¡n má»™t nhánh"
-#: builtin/branch.c:939
+#: builtin/branch.c:735
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Vẫn chÆ°a chuyển giao trên nhánh “%sâ€."
-#: builtin/branch.c:942
+#: builtin/branch.c:738
#, c-format
msgid "No branch named '%s'."
msgstr "Không có nhánh nào có tên “%sâ€."
-#: builtin/branch.c:957
+#: builtin/branch.c:753
msgid "too many branches for a rename operation"
msgstr "quá nhiá»u nhánh dành cho thao tác đổi tên"
-#: builtin/branch.c:962
+#: builtin/branch.c:758
msgid "too many branches to set new upstream"
msgstr "quá nhiá»u nhánh được đặt cho thượng nguồn má»›i"
-#: builtin/branch.c:966
+#: builtin/branch.c:762
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3692,40 +3746,40 @@ msgstr ""
"không thể đặt thượng nguồn của HEAD thành %s khi mà nó chẳng chỉ đến nhánh "
"nào cả."
-#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
#, c-format
msgid "no such branch '%s'"
msgstr "không có nhánh nào nhÆ° thế “%sâ€"
-#: builtin/branch.c:973
+#: builtin/branch.c:769
#, c-format
msgid "branch '%s' does not exist"
msgstr "chÆ°a có nhánh “%sâ€"
-#: builtin/branch.c:985
+#: builtin/branch.c:781
msgid "too many branches to unset upstream"
msgstr "quá nhiá»u nhánh để bỠđặt thượng nguồn"
-#: builtin/branch.c:989
+#: builtin/branch.c:785
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "không thể bỠđặt thượng nguồn của HEAD không chỉ đến một nhánh nào cả."
-#: builtin/branch.c:995
+#: builtin/branch.c:791
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Nhánh “%s†không có thông tin thượng nguồn"
-#: builtin/branch.c:1009
+#: builtin/branch.c:805
msgid "it does not make sense to create 'HEAD' manually"
msgstr "không hợp lý khi tạo “HEAD†thủ công"
-#: builtin/branch.c:1015
+#: builtin/branch.c:811
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"hai tùy chá»n -a và -r áp dụng cho lệnh “git branch†không hợp lý đối vá»›i tên "
"nhánh"
-#: builtin/branch.c:1018
+#: builtin/branch.c:814
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3734,7 +3788,7 @@ msgstr ""
"Cá» --set-upstream đã lạc hậu và sẽ bị xóa bá». Nên dùng --track hoặc --set-"
"upstream-to\n"
-#: builtin/branch.c:1035
+#: builtin/branch.c:831
#, c-format
msgid ""
"\n"
@@ -3745,12 +3799,12 @@ msgstr ""
"Nếu bạn muốn “%s†theo dõi “%sâ€, thá»±c hiện lệnh sau:\n"
"\n"
-#: builtin/branch.c:1036
+#: builtin/branch.c:832
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1037
+#: builtin/branch.c:833
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3777,12 +3831,8 @@ msgstr ""
"<kiểu>|--textconv) <đối_tượng>"
#: builtin/cat-file.c:429
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
-"objects>"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <danh-sách-đối-"
-"tượng>"
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
#: builtin/cat-file.c:466
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -3838,9 +3888,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <attr>…] [--] tên-Ä‘Æ°á»ng-dẫn…"
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
-msgstr ""
-"git check-attr --stdin [-z] [-a | --all | <attr>…] < <danh-sách-Ä‘Æ°á»ng-dẫn>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <attr>…]"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@ -3858,7 +3907,7 @@ msgstr "Ä‘á»c tên tập tin từ đầu vào tiêu chuẩn"
msgid "terminate input and output records by a NUL character"
msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "chặn các báo cáo tiến trình hoạt động"
@@ -3945,6 +3994,8 @@ msgid "write the content to temporary files"
msgstr "ghi nội dung vào tập tin tạm"
#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
msgid "string"
msgstr "chuá»—i"
@@ -3964,106 +4015,106 @@ msgstr "git checkout [<các-tùy-chá»n>] <nhánh>"
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<các-tùy-chá»n>] [<nhánh>] -- <tập-tin>…"
-#: builtin/checkout.c:133 builtin/checkout.c:166
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
msgid "path '%s' does not have our version"
msgstr "Ä‘Æ°á»ng dẫn “%s†không có các phiên bản của chúng ta"
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have their version"
msgstr "Ä‘Æ°á»ng dẫn “%s†không có các phiên bản của chúng"
-#: builtin/checkout.c:151
+#: builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "Ä‘Æ°á»ng dẫn “%s†không có tất cả các phiên bản cần thiết"
-#: builtin/checkout.c:195
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "Ä‘Æ°á»ng dẫn “%s†không có các phiên bản cần thiết"
-#: builtin/checkout.c:212
+#: builtin/checkout.c:213
#, c-format
msgid "path '%s': cannot merge"
msgstr "Ä‘Æ°á»ng dẫn “%sâ€: không thể hòa trá»™n"
-#: builtin/checkout.c:229
+#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Không thể thêm kết quả hòa trá»™n cho “%sâ€"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "không được dùng “%s†vá»›i các Ä‘Æ°á»ng dẫn cập nhật"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:263 builtin/checkout.c:266
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "không được dùng “%s†với %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:269
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Không thể cập nhật các Ä‘Æ°á»ng dẫn và chuyển đến nhánh “%s†cùng má»™t lúc."
-#: builtin/checkout.c:279 builtin/checkout.c:473
+#: builtin/checkout.c:280 builtin/checkout.c:474
msgid "corrupt index file"
msgstr "tập tin ghi bảng mục lục bị há»ng"
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr "Ä‘Æ°á»ng dẫn “%s†không được hòa trá»™n"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:496
msgid "you need to resolve your current index first"
msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:623
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Không thể thá»±c hiện reflog cho “%sâ€: %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:661
msgid "HEAD is now at"
msgstr "HEAD hiện giỠtại"
-#: builtin/checkout.c:667
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Äặt lại nhánh “%sâ€\n"
-#: builtin/checkout.c:670
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Äã sẵn sàng trên “%sâ€\n"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Äã chuyển tá»›i và đặt lại nhánh “%sâ€\n"
-#: builtin/checkout.c:676 builtin/checkout.c:1065
+#: builtin/checkout.c:677 builtin/checkout.c:1066
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Äã chuyển đến nhánh má»›i “%sâ€\n"
-#: builtin/checkout.c:678
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Äã chuyển đến nhánh “%sâ€\n"
-#: builtin/checkout.c:730
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " … và nhiá»u hÆ¡n %d.\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4082,7 +4133,7 @@ msgstr[0] ""
"\n"
"%s\n"
-#: builtin/checkout.c:755
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4103,146 +4154,152 @@ msgstr[0] ""
" git branch <tên_nhánh_mới> %s\n"
"\n"
-#: builtin/checkout.c:791
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "Vị trí trước kia của HEAD là"
-#: builtin/checkout.c:822 builtin/checkout.c:1060
+#: builtin/checkout.c:823 builtin/checkout.c:1061
msgid "You are on a branch yet to be born"
msgstr "Bạn tại nhánh mà nó chưa hỠđược sinh ra"
-#: builtin/checkout.c:967
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d."
-#: builtin/checkout.c:1006 builtin/worktree.c:210
+#: builtin/checkout.c:1007 builtin/worktree.c:213
#, c-format
msgid "invalid reference: %s"
msgstr "tham chiếu không hợp lệ: %s"
-#: builtin/checkout.c:1035
+#: builtin/checkout.c:1036
#, c-format
msgid "reference is not a tree: %s"
msgstr "tham chiếu không phải là một cây:%s"
-#: builtin/checkout.c:1074
+#: builtin/checkout.c:1075
msgid "paths cannot be used with switching branches"
msgstr "các Ä‘Æ°á»ng dẫn không thể dùng cùng vá»›i các nhánh chuyển"
-#: builtin/checkout.c:1077 builtin/checkout.c:1081
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "“%s†không thể được sử dụng với các nhánh chuyển"
-#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s†không thể được dùng vá»›i “%sâ€"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1102
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Không thể chuyển nhánh đến má»™t thứ không phải là lần chuyển giao “%sâ€"
-#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
-#: builtin/worktree.c:319
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
msgid "branch"
msgstr "nhánh"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1136
msgid "create and checkout a new branch"
msgstr "tạo và checkout một nhánh mới"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1138
msgid "create/reset and checkout a branch"
msgstr "tạo/đặt_lại và checkout một nhánh"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1139
msgid "create reflog for new branch"
msgstr "tạo reflog cho nhánh mới"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1140
msgid "detach the HEAD at named commit"
msgstr "rá»i bá» HEAD tại lần chuyển giao danh nghÄ©a"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1141
msgid "set upstream info for new branch"
msgstr "đặt thông tin thượng nguồn cho nhánh mới"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new-branch"
msgstr "nhánh-mới"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new unparented branch"
msgstr "nhánh không cha mới"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
msgid "checkout our version for unmerged files"
msgstr ""
"lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1146
msgid "checkout their version for unmerged files"
msgstr ""
"lấy ra (checkout) phiên bản của chúng hỠcho các tập tin chưa được hòa trộn"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1148
msgid "force checkout (throw away local modifications)"
msgstr "ép buộc lấy ra (bỠđi những thay đổi nội bộ)"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1149
msgid "perform a 3-way merge with the new branch"
msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới"
-#: builtin/checkout.c:1149 builtin/merge.c:227
+#: builtin/checkout.c:1150 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr "cập nhật các tập tin bị bỠqua (mặc định)"
-#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
+#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250
msgid "style"
msgstr "kiểu"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1152
msgid "conflict style (merge or diff3)"
msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1155
msgid "do not limit pathspecs to sparse entries only"
msgstr "không giá»›i hạn đặc tả Ä‘Æ°á»ng dẫn thành chỉ các mục thÆ°a thá»›t"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1157
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1159
msgid "do not check if another worktree is holding the given ref"
msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho"
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr "ép buộc báo cáo tiến triển công việc"
+
+#: builtin/checkout.c:1191
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Các tùy chá»n -b, -B và --orphan loại từ lẫn nhau"
-#: builtin/checkout.c:1198
+#: builtin/checkout.c:1208
msgid "--track needs a branch name"
msgstr "--track cần tên một nhánh"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1213
msgid "Missing branch name; try -b"
msgstr "Thiếu tên nhánh; hãy thử -b"
-#: builtin/checkout.c:1239
+#: builtin/checkout.c:1249
msgid "invalid path specification"
msgstr "Ä‘Æ°á»ng dẫn đã cho không hợp lệ"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1256
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4252,12 +4309,12 @@ msgstr ""
"Bạn đã có ý định checkout “%s†cái mà không thể được phân giải như là lần "
"chuyển giao?"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1261
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach không nhận má»™t đối số Ä‘Æ°á»ng dẫn “%sâ€"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1265
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4296,7 +4353,7 @@ msgstr "Nên bỠqua kho chứa %s\n"
msgid "failed to remove %s"
msgstr "gặp lỗi khi gỡ bỠ%s"
-#: builtin/clean.c:317
+#: builtin/clean.c:315
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -4308,7 +4365,7 @@ msgstr ""
"foo - chá»n mục trên cÆ¡ sở tiá»n tố duy nhất\n"
" - (để trống) không chá»n gì cả"
-#: builtin/clean.c:321
+#: builtin/clean.c:319
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -4328,36 +4385,36 @@ msgstr ""
"* - chá»n tất\n"
" - (để trống) kết thúc việc chá»n"
-#: builtin/clean.c:537
+#: builtin/clean.c:535
#, c-format
msgid "Huh (%s)?"
msgstr "Hả (%s)?"
-#: builtin/clean.c:679
+#: builtin/clean.c:677
#, c-format
msgid "Input ignore patterns>> "
msgstr "Mẫu để lá»c các tập tin đầu vào cần lá» Ä‘i>> "
-#: builtin/clean.c:716
+#: builtin/clean.c:714
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "CẢNH BÃO: Không tìm thấy các mục được khá»›p bởi: %s"
-#: builtin/clean.c:737
+#: builtin/clean.c:735
msgid "Select items to delete"
msgstr "Chá»n mục muốn xóa"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:778
+#: builtin/clean.c:776
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Xóa bỠ“%s†[y/N]? "
-#: builtin/clean.c:803
+#: builtin/clean.c:801
msgid "Bye."
msgstr "Tạm biệt."
-#: builtin/clean.c:811
+#: builtin/clean.c:809
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -4375,61 +4432,61 @@ msgstr ""
"help - hiển thị chính trợ giúp này\n"
"? - trợ giúp dành cho chá»n bằng cách nhắc"
-#: builtin/clean.c:838
+#: builtin/clean.c:836
msgid "*** Commands ***"
msgstr "*** Lệnh ***"
-#: builtin/clean.c:839
+#: builtin/clean.c:837
msgid "What now"
msgstr "GiỠthì sao"
-#: builtin/clean.c:847
+#: builtin/clean.c:845
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Có muốn gỡ bỠ(các) mục sau đây không:"
-#: builtin/clean.c:864
+#: builtin/clean.c:862
msgid "No more files to clean, exiting."
msgstr "Không còn tập-tin nào để dá»n dẹp, Ä‘ang thoát ra."
-#: builtin/clean.c:895
+#: builtin/clean.c:893
msgid "do not print names of files removed"
msgstr "không hiển thị tên của các tập tin đã gỡ bá»"
-#: builtin/clean.c:897
+#: builtin/clean.c:895
msgid "force"
msgstr "ép buộc"
-#: builtin/clean.c:898
+#: builtin/clean.c:896
msgid "interactive cleaning"
msgstr "dá»n bằng kiểu tÆ°Æ¡ng tác"
-#: builtin/clean.c:900
+#: builtin/clean.c:898
msgid "remove whole directories"
msgstr "gỡ bỠtoàn bộ thư mục"
-#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
msgid "pattern"
msgstr "mẫu"
-#: builtin/clean.c:902
+#: builtin/clean.c:900
msgid "add <pattern> to ignore rules"
msgstr "thêm <mẫu> vào trong qui tắc bỠqua"
-#: builtin/clean.c:903
+#: builtin/clean.c:901
msgid "remove ignored files, too"
msgstr "đồng thá»i gỡ bá» cả các tập tin bị bá» qua"
-#: builtin/clean.c:905
+#: builtin/clean.c:903
msgid "remove only ignored files"
msgstr "chỉ gỡ bỠnhững tập tin bị bỠqua"
-#: builtin/clean.c:923
+#: builtin/clean.c:921
msgid "-x and -X cannot be used together"
msgstr "-x và -X không thể dùng cùng nhau"
-#: builtin/clean.c:927
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -4437,7 +4494,7 @@ msgstr ""
"clean.requireForce được đặt thành true và không Ä‘Æ°a ra tùy chá»n -i, -n mà "
"cÅ©ng không -f; từ chối lệnh dá»n dẹp (clean)"
-#: builtin/clean.c:930
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -4449,16 +4506,11 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<các-tùy-chá»n>] [--] <kho> [<t.mục>]"
-#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
-#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
-msgid "force progress reporting"
-msgstr "ép buộc báo cáo tiến triển công việc"
-
#: builtin/clone.c:59
msgid "don't create a checkout"
msgstr "không tạo một checkout"
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
msgid "create a bare repository"
msgstr "tạo kho thuần"
@@ -4482,15 +4534,15 @@ msgstr "cài đặt đây là kho chia sẻ"
msgid "initialize submodules in the clone"
msgstr "khởi tạo mô-đun-con trong bản sao"
-#: builtin/clone.c:75 builtin/init-db.c:501
+#: builtin/clone.c:75 builtin/init-db.c:466
msgid "template-directory"
msgstr "thư-mục-mẫu"
-#: builtin/clone.c:76 builtin/init-db.c:502
+#: builtin/clone.c:76 builtin/init-db.c:467
msgid "directory from which templates will be used"
msgstr "thư mục mà tại đó các mẫu sẽ được dùng"
-#: builtin/clone.c:78
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
msgid "reference repository"
msgstr "kho tham chiếu"
@@ -4514,7 +4566,7 @@ msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
msgid "path to git-upload-pack on the remote"
msgstr "Ä‘Æ°á»ng dẫn đến git-upload-pack trên máy chủ"
-#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659 builtin/pull.c:186
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186
msgid "depth"
msgstr "độ-sâu"
@@ -4526,11 +4578,11 @@ msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho"
msgid "clone only one branch, HEAD or --branch"
msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
-#: builtin/clone.c:91 builtin/init-db.c:510
+#: builtin/clone.c:91 builtin/init-db.c:475
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:92 builtin/init-db.c:511
+#: builtin/clone.c:92 builtin/init-db.c:476
msgid "separate git dir from working tree"
msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc"
@@ -4542,52 +4594,57 @@ msgstr "khóa=giá_trị"
msgid "set config inside the new repository"
msgstr "đặt cấu hình bên trong một kho chứa mới"
-#: builtin/clone.c:298
+#: builtin/clone.c:300
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "kho tham chiếu “%s†như là lấy ra liên kết vẫn chưa được hỗ trợ."
+
+#: builtin/clone.c:302
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "kho tham chiếu “%s†không phải là một kho nội bộ."
-#: builtin/clone.c:302
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "kho tham chiếu “%s†là nông"
-#: builtin/clone.c:305
+#: builtin/clone.c:310
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "kho tham chiếu “%s†bị cấy ghép"
-#: builtin/clone.c:370 builtin/diff.c:84
+#: builtin/clone.c:375 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "gặp lá»—i khi lấy thống kê vỠ“%sâ€"
-#: builtin/clone.c:372
+#: builtin/clone.c:377
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s có tồn tại nhưng lại không phải là một thư mục"
-#: builtin/clone.c:386
+#: builtin/clone.c:391
#, c-format
msgid "failed to stat %s\n"
msgstr "gặp lỗi khi lấy thông tin thống kê vỠ%s\n"
-#: builtin/clone.c:408
+#: builtin/clone.c:413
#, c-format
msgid "failed to create link '%s'"
msgstr "gặp lá»—i khi tạo được liên kết má»m %s"
-#: builtin/clone.c:412
+#: builtin/clone.c:417
#, c-format
msgid "failed to copy file to '%s'"
msgstr "gặp lá»—i khi sao chép tập tin và “%sâ€"
-#: builtin/clone.c:435 builtin/clone.c:619
+#: builtin/clone.c:442 builtin/clone.c:626
#, c-format
msgid "done.\n"
msgstr "hoàn tất.\n"
-#: builtin/clone.c:447
+#: builtin/clone.c:454
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4597,121 +4654,117 @@ msgstr ""
"Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git statusâ€\n"
"và thá»­ lấy ra vá»›i lệnh “git checkout -f HEADâ€\n"
-#: builtin/clone.c:524
+#: builtin/clone.c:531
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)."
-#: builtin/clone.c:614
+#: builtin/clone.c:621
#, c-format
msgid "Checking connectivity... "
msgstr "Äang kiểm tra kết nối… "
-#: builtin/clone.c:617
+#: builtin/clone.c:624
msgid "remote did not send all necessary objects"
msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết"
-#: builtin/clone.c:681
+#: builtin/clone.c:688
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể lấy ra.\n"
-#: builtin/clone.c:712
+#: builtin/clone.c:719
msgid "unable to checkout working tree"
msgstr "không thể lấy ra (checkout) cây làm việc"
-#: builtin/clone.c:799
+#: builtin/clone.c:808
msgid "cannot repack to clean up"
msgstr "không thể đóng gói để dá»n dẹp"
-#: builtin/clone.c:801
+#: builtin/clone.c:810
msgid "cannot unlink temporary alternates file"
msgstr "không thể bá» liên kết tập tin thay thế tạm thá»i"
-#: builtin/clone.c:831
+#: builtin/clone.c:842
msgid "Too many arguments."
msgstr "Có quá nhiá»u đối số."
-#: builtin/clone.c:835
+#: builtin/clone.c:846
msgid "You must specify a repository to clone."
msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)."
-#: builtin/clone.c:846
+#: builtin/clone.c:857
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "tùy chá»n --bare và --origin %s xung khắc nhau."
-#: builtin/clone.c:849
+#: builtin/clone.c:860
msgid "--bare and --separate-git-dir are incompatible."
msgstr "tùy chá»n --bare và --separate-git-dir xung khắc nhau."
-#: builtin/clone.c:862
+#: builtin/clone.c:873
#, c-format
msgid "repository '%s' does not exist"
msgstr "kho chứa “%s†chưa tồn tại"
-#: builtin/clone.c:868 builtin/fetch.c:1168
+#: builtin/clone.c:879 builtin/fetch.c:1166
#, c-format
msgid "depth %s is not a positive number"
msgstr "độ sâu %s không phải là một số nguyên dương"
-#: builtin/clone.c:878
+#: builtin/clone.c:889
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "Ä‘Æ°á»ng dẫn đích “%s†đã có từ trÆ°á»›c và không phải là má»™t thÆ° mục rá»—ng."
-#: builtin/clone.c:888
+#: builtin/clone.c:899
#, c-format
msgid "working tree '%s' already exists."
msgstr "cây làm việc “%s†đã sẵn tồn tại rồi."
-#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
-#: builtin/worktree.c:245
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "không thể tạo các thÆ° mục dẫn đầu của “%sâ€"
-#: builtin/clone.c:906
+#: builtin/clone.c:917
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "không thể tạo cây thÆ° mục làm việc dir “%sâ€"
-#: builtin/clone.c:924
+#: builtin/clone.c:935
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Äang nhân bản thành kho chứa bare “%sâ€â€¦\n"
-#: builtin/clone.c:926
+#: builtin/clone.c:937
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Äang nhân bản thành “%sâ€â€¦\n"
-#: builtin/clone.c:951
-msgid "--dissociate given, but there is no --reference"
-msgstr "đã đưa ra --dissociate, nhưng ở đây lại không có --reference"
-
-#: builtin/clone.c:968
+#: builtin/clone.c:975
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth bị lỠđi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
-#: builtin/clone.c:971
+#: builtin/clone.c:978
msgid "source repository is shallow, ignoring --local"
msgstr "kho nguồn là nông, nên bỠqua --local"
-#: builtin/clone.c:976
+#: builtin/clone.c:983
msgid "--local is ignored"
msgstr "--local bị lỠđi"
-#: builtin/clone.c:980
+#: builtin/clone.c:987
#, c-format
msgid "Don't know how to clone %s"
msgstr "Không biết làm cách nào để nhân bản (clone) %s"
-#: builtin/clone.c:1029 builtin/clone.c:1037
+#: builtin/clone.c:1036 builtin/clone.c:1044
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s"
-#: builtin/clone.c:1040
+#: builtin/clone.c:1047
msgid "You appear to have cloned an empty repository."
msgstr "Bạn hình như là đã nhân bản một kho trống rỗng."
@@ -4747,15 +4800,15 @@ msgstr "Chèn thêm khoảng trắng giữa các cột"
msgid "--command must be the first argument"
msgstr "--command phải là đối số đầu tiên"
-#: builtin/commit.c:37
+#: builtin/commit.c:38
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<các-tùy-chá»n>] [--] <pathspec>…"
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<các-tùy-chá»n>] [--] <pathspec>…"
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4786,7 +4839,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:60
+#: builtin/commit.c:61
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4814,7 +4867,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
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"
@@ -4827,7 +4880,7 @@ msgstr ""
"hoặc là bạn gỡ bỠcác lần chuyển giao một cách hoàn toàn bằng lệnh:\n"
"\"git reset HEAD^\".\n"
-#: builtin/commit.c:77
+#: builtin/commit.c:78
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4842,11 +4895,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:84
+#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
msgstr "Nếu không được thì dùng lệnh \"git reset\"\n"
-#: builtin/commit.c:87
+#: builtin/commit.c:88
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4862,68 +4915,68 @@ msgstr ""
"Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n"
"những lần chuyển giao còn lại.\n"
-#: builtin/commit.c:304
+#: builtin/commit.c:305
msgid "failed to unpack HEAD tree object"
msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây"
-#: builtin/commit.c:345
+#: builtin/commit.c:346
msgid "unable to create temporary index"
msgstr "không thể tạo bảng mục lục tạm thá»i"
-#: builtin/commit.c:351
+#: builtin/commit.c:352
msgid "interactive add failed"
msgstr "gặp lỗi khi thêm bằng cách tương"
-#: builtin/commit.c:364
+#: builtin/commit.c:365
msgid "unable to update temporary index"
msgstr "không thể cập nhật bảng mục lục tạm thá»i"
-#: builtin/commit.c:366
+#: builtin/commit.c:367
msgid "Failed to update main cache tree"
msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm"
-#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)"
-#: builtin/commit.c:444
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr ""
"không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn."
-#: builtin/commit.c:446
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
"không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick."
-#: builtin/commit.c:455
+#: builtin/commit.c:456
msgid "cannot read the index"
msgstr "không Ä‘á»c được bảng mục lục"
-#: builtin/commit.c:474
+#: builtin/commit.c:475
msgid "unable to write temporary index file"
msgstr "không thể ghi tập tin lÆ°u bảng mục lục tạm thá»i"
-#: builtin/commit.c:579
+#: builtin/commit.c:580
#, c-format
msgid "commit '%s' lacks author header"
msgstr "lần chuyển giao “%s†thiếu phần tác giả ở đầu"
-#: builtin/commit.c:581
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "lần chuyển giao “%s†có phần tác giả ở đầu dị dạng"
-#: builtin/commit.c:600
+#: builtin/commit.c:601
msgid "malformed --author parameter"
msgstr "đối số cho --author bị dị hình"
-#: builtin/commit.c:608
+#: builtin/commit.c:609
#, c-format
msgid "invalid date format: %s"
msgstr "ngày tháng không hợp lệ: %s"
-#: builtin/commit.c:652
+#: builtin/commit.c:653
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -4931,38 +4984,38 @@ msgstr ""
"không thể chá»n má»™t ký tá»± ghi chú cái mà không được dùng\n"
"trong phần ghi chú hiện tại"
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr "không thể tìm kiếm commit (lần chuyển giao) %s"
-#: builtin/commit.c:701 builtin/shortlog.c:273
+#: builtin/commit.c:702 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(Ä‘ang Ä‘á»c thông Ä‘iệp nhật ký từ đầu vào tiêu chuẩn)\n"
-#: builtin/commit.c:703
+#: builtin/commit.c:704
msgid "could not read log from standard input"
msgstr "không thể Ä‘á»c nhật ký từ đầu vào tiêu chuẩn"
-#: builtin/commit.c:707
+#: builtin/commit.c:708
#, c-format
msgid "could not read log file '%s'"
msgstr "không Ä‘á»c được tệp nhật ký “%sâ€"
-#: builtin/commit.c:729
+#: builtin/commit.c:730
msgid "could not read MERGE_MSG"
msgstr "không thể Ä‘á»c MERGE_MSG"
-#: builtin/commit.c:733
+#: builtin/commit.c:734
msgid "could not read SQUASH_MSG"
msgstr "không thể Ä‘á»c SQUASH_MSG"
-#: builtin/commit.c:784
+#: builtin/commit.c:785
msgid "could not write commit template"
msgstr "không thể ghi mẫu chuyển giao"
-#: builtin/commit.c:802
+#: builtin/commit.c:803
#, c-format
msgid ""
"\n"
@@ -4977,7 +5030,7 @@ msgstr ""
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:807
+#: builtin/commit.c:808
#, c-format
msgid ""
"\n"
@@ -4992,7 +5045,7 @@ msgstr ""
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5003,7 +5056,7 @@ msgstr ""
"bắt đầu bằng “%c†sẽ được bỠqua, nếu phần chú thích rỗng sẽ hủy bỠlần "
"chuyển giao.\n"
-#: builtin/commit.c:827
+#: builtin/commit.c:828
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5015,156 +5068,157 @@ msgstr ""
"bắt đầu bằng “%c†sẽ được bỠqua; bạn có thể xóa chúng đi nếu muốn thế.\n"
"Phần chú thích này nếu trống rỗng sẽ hủy bỠlần chuyển giao.\n"
-#: builtin/commit.c:847
+#: builtin/commit.c:848
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sTác giả: %.*s <%.*s>"
-#: builtin/commit.c:855
+#: builtin/commit.c:856
#, c-format
msgid "%sDate: %s"
msgstr "%sNgày tháng: %s"
-#: builtin/commit.c:862
+#: builtin/commit.c:863
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sNgÆ°á»i chuyển giao: %.*s <%.*s>"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "Cannot read index"
msgstr "Không Ä‘á»c được bảng mục lục"
-#: builtin/commit.c:937
+#: builtin/commit.c:938
msgid "Error building trees"
msgstr "Gặp lỗi khi xây dựng cây"
-#: builtin/commit.c:952 builtin/tag.c:495
+#: builtin/commit.c:953 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Xin hãy cung cấp lá»i chú giải hoặc là dùng tùy chá»n -m hoặc là -F.\n"
-#: builtin/commit.c:1054
+#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author “%s†không phải là “HỠvà tên <thư điện tửl>†và không khớp bất kỳ "
"tác giả nào sẵn có"
-#: builtin/commit.c:1069 builtin/commit.c:1309
+#: builtin/commit.c:1070 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Chế Ä‘á»™ cho các tập tin chÆ°a được theo dõi không hợp lệ “%sâ€"
-#: builtin/commit.c:1106
+#: builtin/commit.c:1107
msgid "--long and -z are incompatible"
msgstr "hai tùy chá»n -long và -z không tÆ°Æ¡ng thích vá»›i nhau"
-#: builtin/commit.c:1136
+#: builtin/commit.c:1137
msgid "Using both --reset-author and --author does not make sense"
msgstr "Sá»­ dụng cả hai tùy chá»n --reset-author và --author không hợp lý"
-#: builtin/commit.c:1145
+#: builtin/commit.c:1146
msgid "You have nothing to amend."
msgstr "Không có gì để mà “tu bổ†cả."
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
"Bạn Ä‘ang ở giữa của quá trình hòa trá»™n -- không thể thá»±c hiện việc “tu bổâ€."
-#: builtin/commit.c:1150
+#: builtin/commit.c:1151
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
"Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu "
"bổâ€."
-#: builtin/commit.c:1153
+#: builtin/commit.c:1154
msgid "Options --squash and --fixup cannot be used together"
msgstr "Các tùy chá»n --squash và --fixup không thể sá»­ dụng cùng vá»›i nhau"
-#: builtin/commit.c:1163
+#: builtin/commit.c:1164
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
"Chỉ được dùng má»™t trong số tùy chá»n trong số các tùy chá»n -c/-C/-F/--fixup"
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Tùy chá»n -m không thể được tổ hợp cùng vá»›i -c/-C/-F/--fixup."
-#: builtin/commit.c:1173
+#: builtin/commit.c:1174
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"--reset-author chỉ có thể được sá»­ dụng vá»›i tùy chá»n -C, -c hay --amend."
-#: builtin/commit.c:1190
+#: builtin/commit.c:1191
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Chỉ má»™t trong các tùy chá»n --include/--only/--all/--interactive/--patch được "
"sử dụng."
-#: builtin/commit.c:1192
+#: builtin/commit.c:1193
msgid "No paths with --include/--only does not make sense."
msgstr "Không Ä‘Æ°á»ng dẫn vá»›i các tùy chá»n --include/--only không hợp lý."
-#: builtin/commit.c:1194
+#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
msgstr "Giá»i… “tu bổ†cái cuối vá»›i bảng mục lục bẩn."
-#: builtin/commit.c:1196
+#: builtin/commit.c:1197
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"Những Ä‘Æ°á»ng dẫn rõ ràng được chỉ ra không có tùy chá»n -i cÅ©ng không -o; coi "
"là --only những Ä‘Æ°á»ng dẫn"
-#: builtin/commit.c:1208 builtin/tag.c:730
+#: builtin/commit.c:1209 builtin/tag.c:475
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Chế Ä‘á»™ dá»n dẹp không hợp lệ %s"
-#: builtin/commit.c:1213
+#: builtin/commit.c:1214
msgid "Paths with -a does not make sense."
msgstr "Các Ä‘Æ°á»ng dẫn vá»›i tùy chá»n -a không hợp lý."
-#: builtin/commit.c:1323 builtin/commit.c:1602
+#: builtin/commit.c:1324 builtin/commit.c:1605
msgid "show status concisely"
msgstr "hiển thị trạng thái ở dạng súc tích"
-#: builtin/commit.c:1325 builtin/commit.c:1604
+#: builtin/commit.c:1326 builtin/commit.c:1607
msgid "show branch information"
msgstr "hiển thị thông tin nhánh"
-#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546
+#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "kết xuất dạng máy-có-thể-Ä‘á»c"
-#: builtin/commit.c:1330 builtin/commit.c:1608
+#: builtin/commit.c:1331 builtin/commit.c:1611
msgid "show status in long format (default)"
msgstr "hiển thị trạng thái ở định dạng dài (mặc định)"
-#: builtin/commit.c:1333 builtin/commit.c:1611
+#: builtin/commit.c:1334 builtin/commit.c:1614
msgid "terminate entries with NUL"
msgstr "chấm dứt các mục bằng NUL"
-#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:604
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "chế độ"
-#: builtin/commit.c:1336 builtin/commit.c:1614
+#: builtin/commit.c:1337 builtin/commit.c:1617
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"hiển thị các tập tin chÆ°a được theo dõi dấu vết, các chế Ä‘á»™ tùy chá»n: all, "
"normal, no. (Mặc định: all)"
-#: builtin/commit.c:1339
+#: builtin/commit.c:1340
msgid "show ignored files"
msgstr "hiển thị các tập tin ẩn"
-#: builtin/commit.c:1340 parse-options.h:155
+#: builtin/commit.c:1341 parse-options.h:155
msgid "when"
msgstr "khi"
-#: builtin/commit.c:1341
+#: builtin/commit.c:1342
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5172,200 +5226,205 @@ msgstr ""
"bá» qua các thay đổi trong mô-Ä‘un-con, tùy chá»n khi: all, dirty, untracked. "
"(Mặc định: all)"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1344
msgid "list untracked files in columns"
msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột"
-#: builtin/commit.c:1429
+#: builtin/commit.c:1430
msgid "couldn't look up newly created commit"
msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1432
msgid "could not parse newly created commit"
msgstr ""
"không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1477
msgid "detached HEAD"
msgstr "đã rá»i khá»i HEAD"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1480
msgid " (root-commit)"
msgstr " (root-commit)"
-#: builtin/commit.c:1572
+#: builtin/commit.c:1575
msgid "suppress summary after successful commit"
msgstr "không hiển thị tổng kết sau khi chuyển giao thành công"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1576
msgid "show diff in commit message template"
msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1578
msgid "Commit message options"
msgstr "Các tùy chá»n ghi chú commit"
-#: builtin/commit.c:1576 builtin/tag.c:602
+#: builtin/commit.c:1579 builtin/tag.c:351
msgid "read message from file"
msgstr "Ä‘á»c chú thích từ tập tin"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "author"
msgstr "tác giả"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "override author for commit"
msgstr "ghi đè tác giả cho commit"
-#: builtin/commit.c:1578 builtin/gc.c:268
+#: builtin/commit.c:1581 builtin/gc.c:326
msgid "date"
msgstr "ngày tháng"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1581
msgid "override date for commit"
msgstr "ghi đè ngày tháng cho lần chuyển giao"
-#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
-#: builtin/notes.c:555 builtin/tag.c:600
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
msgid "message"
msgstr "chú thích"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1582
msgid "commit message"
msgstr "chú thích của lần chuyển giao"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr "lần_chuyển_giao"
+
+#: builtin/commit.c:1583
msgid "reuse and edit message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1584
msgid "reuse message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1585
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1586
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"dùng lá»i nhắn có định dạng tá»± Ä‘á»™ng nén để nén lại các lần chuyển giao đã chỉ "
"ra"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1587
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"lần chuyển giao nhận tôi là tác giả (được dùng vá»›i tùy chá»n -C/-c/--amend)"
-#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "(nên dùng) thêm dòng Signed-off-by:"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1589
msgid "use specified template file"
msgstr "sử dụng tập tin mẫu đã cho"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1590
msgid "force edit of commit"
msgstr "ép buộc sửa lần commit"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1591
msgid "default"
msgstr "mặc định"
-#: builtin/commit.c:1588 builtin/tag.c:605
+#: builtin/commit.c:1591 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "làm thế nào để cắt bỠkhoảng trắng và #ghichú từ mẩu tin nhắn"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1592
msgid "include status in commit message template"
msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao"
-#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "ký lần chuyển giao dùng GPG"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1597
msgid "Commit contents options"
msgstr "Các tùy nội dung ghi chú commit"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1598
msgid "commit all changed files"
msgstr "chuyển giao tất cả các tập tin có thay đổi"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1599
msgid "add specified files to index for commit"
msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1600
msgid "interactively add files"
msgstr "thêm các tập-tin bằng tương tác"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1601
msgid "interactively add changes"
msgstr "thêm các thay đổi bằng tương tác"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1602
msgid "commit only specified files"
msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1603
msgid "bypass pre-commit hook"
msgstr "vòng qua móc (hook) pre-commit"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1604
msgid "show what would be committed"
msgstr "hiển thị xem cái gì có thể được chuyển giao"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1615
msgid "amend previous commit"
msgstr "“tu bổ†(amend) lần commit trước"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1616
msgid "bypass post-rewrite hook"
msgstr "vòng qua móc (hook) post-rewrite"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1621
msgid "ok to record an empty change"
msgstr "ok để ghi lại một thay đổi trống rỗng"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1623
msgid "ok to record a change with an empty message"
msgstr "ok để ghi các thay đổi vá»›i lá»i nhắn trống rá»—ng"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
msgid "could not parse HEAD commit"
msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
-#: builtin/commit.c:1695
+#: builtin/commit.c:1698
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Tập tin MERGE_HEAD sai há»ng (%s)"
-#: builtin/commit.c:1702
+#: builtin/commit.c:1705
msgid "could not read MERGE_MODE"
msgstr "không thể Ä‘á»c MERGE_MODE"
-#: builtin/commit.c:1721
+#: builtin/commit.c:1724
#, c-format
msgid "could not read commit message: %s"
msgstr "không thể Ä‘á»c phần chú thích (message) của llần chuyển giao: %s"
-#: builtin/commit.c:1732
+#: builtin/commit.c:1735
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
"Äang bá» qua việc chuyển giao; bạn đã không biên soạn phần chú thích "
"(message).\n"
-#: builtin/commit.c:1737
+#: builtin/commit.c:1740
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Bãi bỠviệc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1788
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5504,11 +5563,11 @@ msgstr "chỉ hiển thị các tên biến"
msgid "respect include directives on lookup"
msgstr "tôn trá»ng kể cà các hÆ°á»›ng trong tìm kiếm"
-#: builtin/config.c:311
+#: builtin/config.c:303
msgid "unable to parse default color value"
msgstr "không thể phân tích giá trị màu mặc định"
-#: builtin/config.c:449
+#: builtin/config.c:441
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5523,16 +5582,16 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:583
+#: builtin/config.c:575
#, c-format
msgid "cannot create configuration file %s"
msgstr "không thể tạo tập tin cấu hình “%sâ€"
-#: builtin/count-objects.c:55
+#: builtin/count-objects.c:77
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:65
+#: builtin/count-objects.c:87
msgid "print sizes in human readable format"
msgstr "hiển thị kích cỡ theo định dạng dành cho ngÆ°á»i Ä‘á»c"
@@ -5652,7 +5711,7 @@ msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)"
msgid "only consider tags matching <pattern>"
msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>"
-#: builtin/describe.c:410 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:314
msgid "show abbreviated commit object as fallback"
msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
@@ -5831,7 +5890,7 @@ msgstr "làm sâu hơn lịch sử của bản sao"
msgid "convert to a complete repository"
msgstr "chuyển đổi hoàn toàn sang kho git"
-#: builtin/fetch.c:118 builtin/log.c:1233
+#: builtin/fetch.c:118 builtin/log.c:1232
msgid "dir"
msgstr "tmục"
@@ -5873,7 +5932,7 @@ msgstr "[đã cập nhật]"
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (không thể fetch (lấy) vỠnhánh hiện hành)"
-#: builtin/fetch.c:478 builtin/fetch.c:564
+#: builtin/fetch.c:478 builtin/fetch.c:566
msgid "[rejected]"
msgstr "[Bị từ chối]"
@@ -5897,39 +5956,39 @@ msgstr "[nhánh mới]"
msgid "[new ref]"
msgstr "[ref (tham chiếu) mới]"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "unable to update local ref"
msgstr "không thể cập nhật tham chiếu nội bộ"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "forced update"
msgstr "cưỡng bức cập nhật"
-#: builtin/fetch.c:566
+#: builtin/fetch.c:568
msgid "(non-fast-forward)"
msgstr "(không-chuyển-tiếp-nhanh)"
-#: builtin/fetch.c:600 builtin/fetch.c:842
+#: builtin/fetch.c:602 builtin/fetch.c:843
#, c-format
msgid "cannot open %s: %s\n"
msgstr "không thể mở %s: %s\n"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:611
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n"
-#: builtin/fetch.c:627
+#: builtin/fetch.c:629
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật"
-#: builtin/fetch.c:715 builtin/fetch.c:807
+#: builtin/fetch.c:716 builtin/fetch.c:808
#, c-format
msgid "From %.*s\n"
msgstr "Từ %.*s\n"
-#: builtin/fetch.c:726
+#: builtin/fetch.c:727
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -5938,57 +5997,57 @@ msgstr ""
"một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n"
" “git remote prune %s†để bỠđi những nhánh cũ, hay bị xung đột"
-#: builtin/fetch.c:778
+#: builtin/fetch.c:779
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sẽ trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s đã trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:811
+#: builtin/fetch.c:812
msgid "[deleted]"
msgstr "[đã xóa]"
-#: builtin/fetch.c:812 builtin/remote.c:1034
+#: builtin/fetch.c:813 builtin/remote.c:1040
msgid "(none)"
msgstr "(không)"
-#: builtin/fetch.c:832
+#: builtin/fetch.c:833
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho "
"trần (bare)"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Tùy chá»n \"%s\" có giá trị \"%s\" là không hợp lệ cho %s"
-#: builtin/fetch.c:854
+#: builtin/fetch.c:855
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Tùy chá»n \"%s\" bị bá» qua vá»›i %s\n"
-#: builtin/fetch.c:910
+#: builtin/fetch.c:911
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Không biết làm cách nào để lấy vỠtừ %s"
-#: builtin/fetch.c:1071
+#: builtin/fetch.c:1072
#, c-format
msgid "Fetching %s\n"
msgstr "Äang lấy “%s†vá»\n"
-#: builtin/fetch.c:1073 builtin/remote.c:90
+#: builtin/fetch.c:1074 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "không thể “%s†vá»"
-#: builtin/fetch.c:1091
+#: builtin/fetch.c:1092
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -5996,32 +6055,32 @@ msgstr ""
"Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n"
"tên máy chủ từ cái mà những Ä‘iểm xét duyệt má»›i có thể được fetch (lấy vá»)."
-#: builtin/fetch.c:1114
+#: builtin/fetch.c:1115
msgid "You need to specify a tag name."
msgstr "Bạn phải định rõ tên thẻ."
-#: builtin/fetch.c:1156
+#: builtin/fetch.c:1157
msgid "--depth and --unshallow cannot be used together"
msgstr "tùy chá»n --depth và --unshallow không thể sá»­ dụng cùng vá»›i nhau"
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1159
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý"
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1179
msgid "fetch --all does not take a repository argument"
msgstr "lệnh lấy vỠ\"fetch --all\" không lấy đối số kho chứa"
-#: builtin/fetch.c:1183
+#: builtin/fetch.c:1181
msgid "fetch --all does not make sense with refspecs"
msgstr "lệnh lấy vỠ\"fetch --all\" không hợp lý với refspecs"
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1192
#, c-format
msgid "No such remote or remote group: %s"
msgstr "không có nhóm máy chủ hay máy chủ như thế: %s"
-#: builtin/fetch.c:1202
+#: builtin/fetch.c:1200
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Việc lấy vỠcả một nhóm và chỉ định refspecs không hợp lý"
@@ -6032,23 +6091,23 @@ msgstr ""
"git fmt-merge-msg [-m <chú_thích>] [--log[=<n>] | --no-log] [--file <tập-"
"tin>]"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:667
msgid "populate log with at most <n> entries from shortlog"
msgstr "gắn nhật ký vá»›i ít nhất <n> mục từ lệnh “shortlogâ€"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:670
msgid "alias for --log (deprecated)"
msgstr "bí danh cho --log (không được dùng)"
-#: builtin/fmt-merge-msg.c:676
+#: builtin/fmt-merge-msg.c:673
msgid "text"
msgstr "văn bản"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:674
msgid "use <text> as start of message"
msgstr "dùng <văn bản thÆ°á»ng> để bắt đầu ghi chú"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:675
msgid "file to read from"
msgstr "tập tin để Ä‘á»c dữ liệu từ đó"
@@ -6056,95 +6115,115 @@ msgstr "tập tin để Ä‘á»c dữ liệu từ đó"
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<các-tùy-chá»n>] [<mẫu>]"
-#: builtin/for-each-ref.c:24
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <đối tượng>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr "git branch ([--merged | --no-merged) [<đối_tượng>]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr "git for-each-ref [--contains [<đối_tượng>]]"
+
+#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr "trích dẫn để phù hợp cho hệ vỠ(shell)"
-#: builtin/for-each-ref.c:26
+#: builtin/for-each-ref.c:29
msgid "quote placeholders suitably for perl"
msgstr "trích dẫn để phù hợp cho perl"
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for python"
msgstr "trích dẫn để phù hợp cho python"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for Tcl"
msgstr "trích dẫn để phù hợp cho Tcl"
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:36
msgid "show only <n> matched refs"
msgstr "hiển thị chỉ <n> tham chiếu khớp"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
msgid "format to use for the output"
msgstr "định dạng sẽ dùng cho đầu ra"
-#: builtin/for-each-ref.c:35
-msgid "key"
-msgstr "khóa"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
+msgstr "chỉ hiển thị các tham chiếu mà nó chỉ đến đối tượng đã cho"
-#: builtin/for-each-ref.c:36
-msgid "field name to sort on"
-msgstr "tên trÆ°á»ng cần sắp xếp"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr "chỉ hiển thị những tham chiếu mà nó được hòa trộn"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr "chỉ hiển thị những tham chiếu mà nó không được hòa trộn"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr "chỉ hiển thị những tham chiếu mà nó chứa lần chuyển giao"
-#: builtin/fsck.c:163 builtin/prune.c:137
+#: builtin/fsck.c:156 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "Äang kiểm tra kết nối"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:486
msgid "Checking object directories"
msgstr "Äang kiểm tra các thÆ° mục đối tượng"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:553
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<các-tùy-chá»n>] [<đối-tượng>…]"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:559
msgid "show unreachable objects"
msgstr "hiển thị các đối tượng không thể Ä‘á»c được"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:560
msgid "show dangling objects"
msgstr "hiển thị các đối tượng không được quản lý"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:561
msgid "report tags"
msgstr "báo cáo các thẻ"
-#: builtin/fsck.c:640
+#: builtin/fsck.c:562
msgid "report root nodes"
msgstr "báo cáo node gốc"
-#: builtin/fsck.c:641
+#: builtin/fsck.c:563
msgid "make index objects head nodes"
msgstr "tạo “index objects head nodesâ€"
-#: builtin/fsck.c:642
+#: builtin/fsck.c:564
msgid "make reflogs head nodes (default)"
msgstr "tạo “reflogs head nodes†(mặc định)"
-#: builtin/fsck.c:643
+#: builtin/fsck.c:565
msgid "also consider packs and alternate objects"
msgstr "cũng cân nhắc đến các đối tượng gói và thay thế"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:566
msgid "check only connectivity"
msgstr "chỉ kiểm tra kết nối"
-#: builtin/fsck.c:645
+#: builtin/fsck.c:567
msgid "enable more strict checking"
msgstr "cho phép kiểm tra hạn chế hơn"
-#: builtin/fsck.c:647
+#: builtin/fsck.c:569
msgid "write dangling objects in .git/lost-found"
msgstr "ghi các đối tượng không được quản lý trong .git/lost-found"
-#: builtin/fsck.c:648 builtin/prune.c:107
+#: builtin/fsck.c:570 builtin/prune.c:107
msgid "show progress"
msgstr "hiển thị quá trình"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:631
msgid "Checking objects"
msgstr "Äang kiểm tra các đối tượng"
@@ -6152,50 +6231,65 @@ msgstr "Äang kiểm tra các đối tượng"
msgid "git gc [<options>]"
msgstr "git gc [<các-tùy-chá»n>]"
-#: builtin/gc.c:55
+#: builtin/gc.c:72
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s không hợp lệ: “%sâ€"
-#: builtin/gc.c:100
+#: builtin/gc.c:139
#, c-format
msgid "insanely long object directory %.*s"
msgstr "thư mục đối tượng dài một cách điên rồ %.*s"
-#: builtin/gc.c:269
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"Lần chạy gc cuối đã báo cáo các vấn đỠsau đây. Vui lòng sửa nguyên nhân\n"
+"tận gốc và xóa bỠ%s.\n"
+"Việc tá»± Ä‘á»™ng dá»n dẹp sẽ không thá»±c thi cho đến khi tập tin được xóa bá».\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:327
msgid "prune unreferenced objects"
msgstr "xóa bỠcác đối tượng không được tham chiếu"
-#: builtin/gc.c:271
+#: builtin/gc.c:329
msgid "be more thorough (increased runtime)"
msgstr "cẩn thận hÆ¡n nữa (tăng thá»i gian chạy)"
-#: builtin/gc.c:272
+#: builtin/gc.c:330
msgid "enable auto-gc mode"
msgstr "bật chế độ auto-gc"
-#: builtin/gc.c:273
+#: builtin/gc.c:331
msgid "force running gc even if there may be another gc running"
msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy"
-#: builtin/gc.c:315
+#: builtin/gc.c:373
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Tá»± Ä‘á»™ng đóng gói kho chứa trên ná»n hệ thống để tối Æ°u hóa hiệu suất làm "
"việc.\n"
-#: builtin/gc.c:317
+#: builtin/gc.c:375
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n"
-#: builtin/gc.c:318
+#: builtin/gc.c:376
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Xem \"git help gc\" để có hÆ°á»›ng dẫn cụ thể vá» cách dá»n dẹp kho git.\n"
-#: builtin/gc.c:336
+#: builtin/gc.c:397
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -6203,7 +6297,7 @@ msgstr ""
"gc đang được thực hiện trên máy “%s†pid %<PRIuMAX> (dùng --force nếu không "
"phải thế)"
-#: builtin/gc.c:364
+#: builtin/gc.c:441
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -6239,202 +6333,198 @@ msgstr "chuyển đến “%c†cần một giá trị bằng số"
msgid "cannot open '%s'"
msgstr "không mở được “%sâ€"
-#: builtin/grep.c:638
+#: builtin/grep.c:633
msgid "search in index instead of in the work tree"
msgstr "tìm trong bảng mục lục thay vì trong cây làm việc"
-#: builtin/grep.c:640
+#: builtin/grep.c:635
msgid "find in contents not managed by git"
msgstr "tìm trong nội dung không được quản lý bởi git"
-#: builtin/grep.c:642
+#: builtin/grep.c:637
msgid "search in both tracked and untracked files"
msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết"
-#: builtin/grep.c:644
+#: builtin/grep.c:639
msgid "ignore files specified via '.gitignore'"
msgstr "các tập tin bị bá» qua được chỉ định thông qua “.gitignoreâ€"
-#: builtin/grep.c:647
+#: builtin/grep.c:642
msgid "show non-matching lines"
msgstr "hiển thị những dòng không khớp với mẫu"
-#: builtin/grep.c:649
+#: builtin/grep.c:644
msgid "case insensitive matching"
msgstr "phân biệt HOA/thÆ°á»ng"
-#: builtin/grep.c:651
+#: builtin/grep.c:646
msgid "match patterns only at word boundaries"
msgstr "chỉ khá»›p mẫu tại Ä‘Æ°á»ng ranh giá»›i từ"
-#: builtin/grep.c:653
+#: builtin/grep.c:648
msgid "process binary files as text"
msgstr "xá»­ lý tập tin nhị phân nhÆ° là dạng văn bản thÆ°á»ng"
-#: builtin/grep.c:655
+#: builtin/grep.c:650
msgid "don't match patterns in binary files"
msgstr "không khớp mẫu trong các tập tin nhị phân"
-#: builtin/grep.c:658
+#: builtin/grep.c:653
msgid "process binary files with textconv filters"
msgstr "xá»­ lý tập tin nhị phân vá»›i các bá»™ lá»c “textconvâ€"
-#: builtin/grep.c:660
+#: builtin/grep.c:655
msgid "descend at most <depth> levels"
-msgstr "giảm xuống ít nhất mức <sâu>"
+msgstr "hạ xuống ít nhất là mức <sâu>"
-#: builtin/grep.c:664
+#: builtin/grep.c:659
msgid "use extended POSIX regular expressions"
msgstr "dùng biểu thức chính qui POSIX có mở rộng"
-#: builtin/grep.c:667
+#: builtin/grep.c:662
msgid "use basic POSIX regular expressions (default)"
msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)"
-#: builtin/grep.c:670
+#: builtin/grep.c:665
msgid "interpret patterns as fixed strings"
msgstr "diễn dịch các mẫu như là chuỗi cố định"
-#: builtin/grep.c:673
+#: builtin/grep.c:668
msgid "use Perl-compatible regular expressions"
msgstr "sử dụng biểu thức chính quy tương thích Perl"
-#: builtin/grep.c:676
+#: builtin/grep.c:671
msgid "show line numbers"
msgstr "hiển thị số của dòng"
-#: builtin/grep.c:677
+#: builtin/grep.c:672
msgid "don't show filenames"
msgstr "không hiển thị tên tập tin"
-#: builtin/grep.c:678
+#: builtin/grep.c:673
msgid "show filenames"
msgstr "hiển thị các tên tập tin"
-#: builtin/grep.c:680
+#: builtin/grep.c:675
msgid "show filenames relative to top directory"
msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)"
-#: builtin/grep.c:682
+#: builtin/grep.c:677
msgid "show only filenames instead of matching lines"
msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu"
-#: builtin/grep.c:684
+#: builtin/grep.c:679
msgid "synonym for --files-with-matches"
msgstr "đồng nghĩa với --files-with-matches"
-#: builtin/grep.c:687
+#: builtin/grep.c:682
msgid "show only the names of files without match"
msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu"
-#: builtin/grep.c:689
+#: builtin/grep.c:684
msgid "print NUL after filenames"
msgstr "thêm NUL vào sau tên tập tin"
-#: builtin/grep.c:691
+#: builtin/grep.c:686
msgid "show the number of matches instead of matching lines"
msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu"
-#: builtin/grep.c:692
+#: builtin/grep.c:687
msgid "highlight matches"
msgstr "tô sáng phần khớp mẫu"
-#: builtin/grep.c:694
+#: builtin/grep.c:689
msgid "print empty line between matches from different files"
msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt"
-#: builtin/grep.c:696
+#: builtin/grep.c:691
msgid "show filename only once above matches from same file"
msgstr ""
"hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin"
-#: builtin/grep.c:699
+#: builtin/grep.c:694
msgid "show <n> context lines before and after matches"
msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp"
-#: builtin/grep.c:702
+#: builtin/grep.c:697
msgid "show <n> context lines before matches"
msgstr "hiển thị <n> dòng nội dung trước khớp"
-#: builtin/grep.c:704
+#: builtin/grep.c:699
msgid "show <n> context lines after matches"
msgstr "hiển thị <n> dòng nội dung sau khớp"
-#: builtin/grep.c:705
+#: builtin/grep.c:700
msgid "shortcut for -C NUM"
msgstr "dạng viết tắt của -C Sá»"
-#: builtin/grep.c:708
+#: builtin/grep.c:703
msgid "show a line with the function name before matches"
msgstr "hiển thị dòng vói tên hàm trước các lần khớp"
-#: builtin/grep.c:710
+#: builtin/grep.c:705
msgid "show the surrounding function"
msgstr "hiển thị hàm bao quanh"
-#: builtin/grep.c:713
+#: builtin/grep.c:708
msgid "read patterns from file"
msgstr "Ä‘á»c mẫu từ tập-tin"
-#: builtin/grep.c:715
+#: builtin/grep.c:710
msgid "match <pattern>"
msgstr "match <mẫu>"
-#: builtin/grep.c:717
+#: builtin/grep.c:712
msgid "combine patterns specified with -e"
msgstr "tổ hợp mẫu được chỉ ra vá»›i tùy chá»n -e"
-#: builtin/grep.c:729
+#: builtin/grep.c:724
msgid "indicate hit with exit status without output"
msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất"
-#: builtin/grep.c:731
+#: builtin/grep.c:726
msgid "show only matches from files that match all patterns"
msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu"
-#: builtin/grep.c:733
+#: builtin/grep.c:728
msgid "show parse tree for grep expression"
msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep†(tìm kiếm)"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "pager"
msgstr "dàn trang"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "show matching files in the pager"
msgstr "hiển thị các tập tin khớp trong trang giấy"
-#: builtin/grep.c:740
+#: builtin/grep.c:735
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "cho phép gá»i grep(1) (bị bá» qua bởi lần dịch này)"
-#: builtin/grep.c:741 builtin/show-ref.c:189
-msgid "show usage"
-msgstr "hiển thị cách dùng"
-
-#: builtin/grep.c:808
+#: builtin/grep.c:793
msgid "no pattern given."
msgstr "chưa chỉ ra mẫu."
-#: builtin/grep.c:866
+#: builtin/grep.c:851
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc"
-#: builtin/grep.c:892
+#: builtin/grep.c:877
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached hay --untracked không được sử dụng với --no-index."
-#: builtin/grep.c:897
+#: builtin/grep.c:882
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
"--no-index hay --untracked không được sá»­ dụng cùng vá»›i các tùy chá»n liên "
"quan đến revs."
-#: builtin/grep.c:900
+#: builtin/grep.c:885
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết."
-#: builtin/grep.c:908
+#: builtin/grep.c:893
msgid "both --cached and trees are given."
msgstr "cả hai --cached và các cây phải được chỉ ra."
@@ -6447,10 +6537,10 @@ msgstr ""
"[--] <tập-tin>…"
#: builtin/hash-object.c:81
-msgid "git hash-object --stdin-paths < <list-of-paths>"
-msgstr "git hash-object --stdin-paths < <danh-sách-Ä‘Æ°á»ng-dẫn>"
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:92 builtin/tag.c:614
+#: builtin/hash-object.c:92
msgid "type"
msgstr "kiểu"
@@ -6521,12 +6611,12 @@ msgstr "Gặp lỗi khi phân tích phiên bản emacsclient."
msgid "emacsclient version '%d' too old (< 22)."
msgstr "phiên bản của emacsclient “%d†quá cũ (< 22)."
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
msgid "failed to exec '%s': %s"
msgstr "gặp lá»—i khi thá»±c thi “%sâ€: %s"
-#: builtin/help.c:215
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -6535,7 +6625,7 @@ msgstr ""
"“%sâ€: Ä‘Æ°á»ng dẫn không há»— trợ bá»™ trình chiếu man.\n"
"Hãy cân nhắc đến việc sử dụng “man.<tool>.cmd†để thay thế."
-#: builtin/help.c:227
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -6544,61 +6634,61 @@ msgstr ""
"“%sâ€: cmd (lệnh) há»— trợ bá»™ trình chiếu man.\n"
"Hãy cân nhắc đến việc sử dụng “man.<tool>.path†để thay thế."
-#: builtin/help.c:354
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr "“%sâ€: không rõ chÆ°Æ¡ng trình xem man."
-#: builtin/help.c:371
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu cầu"
-#: builtin/help.c:379
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu"
-#: builtin/help.c:428
+#: builtin/help.c:411
msgid "Defining attributes per path"
msgstr "Äịnh nghÄ©a các thuá»™c tính cho má»—i Ä‘Æ°á»ng dẫn"
-#: builtin/help.c:429
+#: builtin/help.c:412
msgid "Everyday Git With 20 Commands Or So"
msgstr "Má»—i ngày há»c 20 lệnh Git hay hÆ¡n"
-#: builtin/help.c:430
+#: builtin/help.c:413
msgid "A Git glossary"
msgstr "Thuật ngữ chuyên môn Git"
-#: builtin/help.c:431
+#: builtin/help.c:414
msgid "Specifies intentionally untracked files to ignore"
msgstr "Chỉ định các tập tin không cần theo dõi"
-#: builtin/help.c:432
+#: builtin/help.c:415
msgid "Defining submodule properties"
msgstr "Äịnh nghÄ©a thuá»™c tính mô-Ä‘un-con"
-#: builtin/help.c:433
+#: builtin/help.c:416
msgid "Specifying revisions and ranges for Git"
msgstr "Chỉ định điểm xét duyệt và vùng cho Git"
-#: builtin/help.c:434
+#: builtin/help.c:417
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Hướng dẫn cách dùng Git ở mức cơ bản (bản 1.5.1 hay mới hơn)"
-#: builtin/help.c:435
+#: builtin/help.c:418
msgid "An overview of recommended workflows with Git"
msgstr "Tổng quan vỠluồng công việc khuyến nghị nên dùng với Git."
-#: builtin/help.c:447
+#: builtin/help.c:430
msgid "The common Git guides are:\n"
msgstr "Các chỉ dẫn chung vỠcách dùng Git là:\n"
-#: builtin/help.c:468 builtin/help.c:485
+#: builtin/help.c:451 builtin/help.c:468
#, c-format
msgid "usage: %s%s"
msgstr "cách dùng: %s%s"
-#: builtin/help.c:501
+#: builtin/help.c:484
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "“git %s†được đặt bí danh thành “%sâ€"
@@ -6886,87 +6976,62 @@ msgstr "tên tập tin tập tin gói “%s†không được kết thúc bằn
msgid "--verify with no packfile name given"
msgstr "dùng tùy chá»n --verify mà không Ä‘Æ°a ra tên packfile"
-#: builtin/init-db.c:36
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Không thể làm %s được ghi bởi nhóm"
-
-#: builtin/init-db.c:63
-#, c-format
-msgid "insanely long template name %s"
-msgstr "tên mẫu dài một cách điên rồ %s"
-
-#: builtin/init-db.c:68
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "không thể lấy thông tin thống kê vỠ“%sâ€"
-#: builtin/init-db.c:74
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "không thể lấy thông tin thống kê vá» mẫu “%sâ€"
-#: builtin/init-db.c:81
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "không thể opendir() “%sâ€"
-#: builtin/init-db.c:98
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr "không thể readlink “%sâ€"
-#: builtin/init-db.c:100
-#, c-format
-msgid "insanely long symlink %s"
-msgstr "liên kết má»m dài má»™t cách Ä‘iên rồ %s"
-
-#: builtin/init-db.c:103
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "không thể tạo liên kết má»m (symlink) “%s†“%sâ€"
-#: builtin/init-db.c:107
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "không thể sao chép “%s†sang “%sâ€"
-#: builtin/init-db.c:111
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr "Ä‘ang lá» Ä‘i mẫu “%sâ€"
-#: builtin/init-db.c:137
-#, c-format
-msgid "insanely long template path %s"
-msgstr "Ä‘Æ°á»ng dẫn mẫu “%s†dài má»™t cách Ä‘iên rồ"
-
-#: builtin/init-db.c:145
+#: builtin/init-db.c:118
#, c-format
msgid "templates not found %s"
msgstr "các mẫu không được tìm thấy %s"
-#: builtin/init-db.c:158
+#: builtin/init-db.c:131
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr "không sao chép các mẫu của phiên bản sai định dạng %d từ “%sâ€"
-#: builtin/init-db.c:212
-#, c-format
-msgid "insane git directory %s"
-msgstr "thư mục git điên rồ %s"
-
-#: builtin/init-db.c:344 builtin/init-db.c:347
+#: builtin/init-db.c:309 builtin/init-db.c:312
#, c-format
msgid "%s already exists"
msgstr "%s đã có từ trước rồi"
-#: builtin/init-db.c:375
+#: builtin/init-db.c:340
#, c-format
msgid "unable to handle file type %d"
msgstr "không thể xử lý (handle) tập tin kiểu %d"
-#: builtin/init-db.c:378
+#: builtin/init-db.c:343
#, c-format
msgid "unable to move %s to %s"
msgstr "không di chuyển được %s vào %s"
@@ -6974,24 +7039,24 @@ msgstr "không di chuyển được %s vào %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:434
+#: builtin/init-db.c:399
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s kho Git trong %s%s\n"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Reinitialized existing"
msgstr "Khởi tạo lại đã sẵn có rồi"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Initialized empty"
msgstr "Khởi tạo trống rỗng"
-#: builtin/init-db.c:436
+#: builtin/init-db.c:401
msgid " shared"
msgstr " đã chia sẻ"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:448
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -6999,25 +7064,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-"
"quyá»n>]] [thÆ°-mục]"
-#: builtin/init-db.c:506
+#: builtin/init-db.c:471
msgid "permissions"
msgstr "các quyá»n"
-#: builtin/init-db.c:507
+#: builtin/init-db.c:472
msgid "specify that the git repository is to be shared amongst several users"
msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiá»u ngÆ°á»i dùng"
-#: builtin/init-db.c:541 builtin/init-db.c:546
+#: builtin/init-db.c:506 builtin/init-db.c:511
#, c-format
msgid "cannot mkdir %s"
msgstr "không thể mkdir (tạo thư mục): %s"
-#: builtin/init-db.c:550
+#: builtin/init-db.c:515
#, c-format
msgid "cannot chdir to %s"
msgstr "không thể chdir (chuyển đổi thư mục) sang %s"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:536
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7026,7 +7091,7 @@ msgstr ""
"%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-"
"dir=<thư-mục>)"
-#: builtin/init-db.c:599
+#: builtin/init-db.c:564
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "không thể truy cập cây (tree) làm việc “%sâ€"
@@ -7112,212 +7177,212 @@ msgstr "format.headers không có giá trị cụ thể"
msgid "name of output directory is too long"
msgstr "tên của thư mục kết xuất quá dài"
-#: builtin/log.c:814
+#: builtin/log.c:813
#, c-format
msgid "Cannot open patch file %s"
msgstr "Không thể mở tập tin miếng vá: %s"
-#: builtin/log.c:828
+#: builtin/log.c:827
msgid "Need exactly one range."
msgstr "Cần chính xác một vùng."
-#: builtin/log.c:838
+#: builtin/log.c:837
msgid "Not a range."
msgstr "Không phải là một vùng."
-#: builtin/log.c:944
+#: builtin/log.c:943
msgid "Cover letter needs email format"
msgstr "“Cover letter†cần cho định dạng thư"
-#: builtin/log.c:1023
+#: builtin/log.c:1022
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to điên rồ: %s"
-#: builtin/log.c:1051
+#: builtin/log.c:1050
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<các-tùy-chá»n>] [<kể-từ> | <vùng-xem-xét>]"
-#: builtin/log.c:1096
+#: builtin/log.c:1095
msgid "Two output directories?"
msgstr "Hai thư mục kết xuất?"
-#: builtin/log.c:1211
+#: builtin/log.c:1210
msgid "use [PATCH n/m] even with a single patch"
msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn"
-#: builtin/log.c:1214
+#: builtin/log.c:1213
msgid "use [PATCH] even with multiple patches"
msgstr "dùng [VÃ] ngay cả vá»›i các miếng vá phức tạp"
-#: builtin/log.c:1218
+#: builtin/log.c:1217
msgid "print patches to standard out"
msgstr "hiển thị miếng vá ra đầu ra chuẩn"
-#: builtin/log.c:1220
+#: builtin/log.c:1219
msgid "generate a cover letter"
msgstr "tạo bì thư"
-#: builtin/log.c:1222
+#: builtin/log.c:1221
msgid "use simple number sequence for output file names"
msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra"
-#: builtin/log.c:1223
+#: builtin/log.c:1222
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1224
+#: builtin/log.c:1223
msgid "use <sfx> instead of '.patch'"
msgstr "sá»­ dụng <sfx> thay cho “.patchâ€"
-#: builtin/log.c:1226
+#: builtin/log.c:1225
msgid "start numbering patches at <n> instead of 1"
msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1"
-#: builtin/log.c:1228
+#: builtin/log.c:1227
msgid "mark the series as Nth re-roll"
msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll"
-#: builtin/log.c:1230
+#: builtin/log.c:1229
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Dùng [<tiá»n-tố>] thay cho [VÃ]"
-#: builtin/log.c:1233
+#: builtin/log.c:1232
msgid "store resulting files in <dir>"
msgstr "lưu các tập tin kết quả trong <t.mục>"
-#: builtin/log.c:1236
+#: builtin/log.c:1235
msgid "don't strip/add [PATCH]"
msgstr "không strip/add [VÃ]"
-#: builtin/log.c:1239
+#: builtin/log.c:1238
msgid "don't output binary diffs"
msgstr "không kết xuất diff (những khác biệt) nhị phân"
-#: builtin/log.c:1241
+#: builtin/log.c:1240
msgid "don't include a patch matching a commit upstream"
msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn"
-#: builtin/log.c:1243
+#: builtin/log.c:1242
msgid "show patch format instead of default (patch + stat)"
msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)"
-#: builtin/log.c:1245
+#: builtin/log.c:1244
msgid "Messaging"
msgstr "Lá»i nhắn"
-#: builtin/log.c:1246
+#: builtin/log.c:1245
msgid "header"
msgstr "đầu đỠthư"
-#: builtin/log.c:1247
+#: builtin/log.c:1246
msgid "add email header"
msgstr "thêm đầu đỠthư"
-#: builtin/log.c:1248 builtin/log.c:1250
+#: builtin/log.c:1247 builtin/log.c:1249
msgid "email"
msgstr "thư điện tử"
-#: builtin/log.c:1248
+#: builtin/log.c:1247
msgid "add To: header"
msgstr "thêm To: đầu đỠthư"
-#: builtin/log.c:1250
+#: builtin/log.c:1249
msgid "add Cc: header"
msgstr "thêm Cc: đầu đỠthư"
-#: builtin/log.c:1252
+#: builtin/log.c:1251
msgid "ident"
msgstr "thụt lá»"
-#: builtin/log.c:1253
+#: builtin/log.c:1252
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"đặt “Äịa chỉ gá»­i†thành <thụ lá»> (hoặc thụt lá» ngÆ°á»i commit nếu bá» quên)"
-#: builtin/log.c:1255
+#: builtin/log.c:1254
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1256
+#: builtin/log.c:1255
msgid "make first mail a reply to <message-id>"
msgstr "dùng thÆ° đầu tiên để trả lá»i <message-id>"
-#: builtin/log.c:1257 builtin/log.c:1260
+#: builtin/log.c:1256 builtin/log.c:1259
msgid "boundary"
msgstr "ranh giá»›i"
-#: builtin/log.c:1258
+#: builtin/log.c:1257
msgid "attach the patch"
msgstr "đính kèm miếng vá"
-#: builtin/log.c:1261
+#: builtin/log.c:1260
msgid "inline the patch"
msgstr "dùng miếng vá làm nội dung"
-#: builtin/log.c:1265
+#: builtin/log.c:1264
msgid "enable message threading, styles: shallow, deep"
msgstr "cho phép luồng lá»i nhắn, kiểu: “shallowâ€, “deepâ€"
-#: builtin/log.c:1267
+#: builtin/log.c:1266
msgid "signature"
msgstr "chữ ký"
-#: builtin/log.c:1268
+#: builtin/log.c:1267
msgid "add a signature"
msgstr "thêm chữ ký"
-#: builtin/log.c:1270
+#: builtin/log.c:1269
msgid "add a signature from a file"
msgstr "thêm chữ ký từ một tập tin"
-#: builtin/log.c:1271
+#: builtin/log.c:1270
msgid "don't print the patch filenames"
msgstr "không hiển thị các tên tập tin của miếng vá"
-#: builtin/log.c:1360
+#: builtin/log.c:1359
msgid "-n and -k are mutually exclusive."
msgstr "-n và -k loại từ lẫn nhau."
-#: builtin/log.c:1362
+#: builtin/log.c:1361
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix và -k xung khắc nhau."
-#: builtin/log.c:1370
+#: builtin/log.c:1369
msgid "--name-only does not make sense"
msgstr "--name-only không hợp lý"
-#: builtin/log.c:1372
+#: builtin/log.c:1371
msgid "--name-status does not make sense"
msgstr "--name-status không hợp lý"
-#: builtin/log.c:1374
+#: builtin/log.c:1373
msgid "--check does not make sense"
msgstr "--check không hợp lý"
-#: builtin/log.c:1397
+#: builtin/log.c:1396
msgid "standard output, or directory, which one?"
msgstr "đầu ra chuẩn, hay thÆ° mục, chá»n cái nào?"
-#: builtin/log.c:1399
+#: builtin/log.c:1398
#, c-format
msgid "Could not create directory '%s'"
msgstr "Không thể tạo thÆ° mục “%sâ€"
-#: builtin/log.c:1496
+#: builtin/log.c:1495
#, c-format
msgid "unable to read signature file '%s'"
msgstr "không thể Ä‘á»c tập tin chữ ký “%sâ€"
-#: builtin/log.c:1559
+#: builtin/log.c:1558
msgid "Failed to create output files"
msgstr "Gặp lỗi khi tạo các tập tin kết xuất"
-#: builtin/log.c:1607
+#: builtin/log.c:1606
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
-#: builtin/log.c:1661
+#: builtin/log.c:1660
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7325,7 +7390,7 @@ msgstr ""
"Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một "
"cách thủ công.\n"
-#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
+#: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685
#, c-format
msgid "Unknown commit %s"
msgstr "Không hiểu lần chuyển giao %s"
@@ -7429,35 +7494,35 @@ msgstr "hiển thị dữ liệu gỡ lỗi"
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<các-tùy-chá»n>] <tree-ish> [<Ä‘Æ°á»ng-dẫn>…]"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "chỉ hiển thị các tree"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "đệ quy vào các thư mục con"
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "hiển thị cây khi đệ quy"
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "chấm dứt mục tin với byte NUL"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "gồm cả kích thước đối tượng"
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "chỉ liệt kê tên tập tin"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "dùng tên Ä‘Æ°á»ng dẫn đầy đủ"
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ ý --full-name)"
@@ -7565,7 +7630,7 @@ msgstr "không thể chạy stash."
#: builtin/merge.c:256
msgid "stash failed"
-msgstr "stash gặp lỗi"
+msgstr "lệnh tạm cất gặp lỗi"
#: builtin/merge.c:261
#, c-format
@@ -7665,7 +7730,7 @@ msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
#: builtin/merge.c:823
#, c-format
msgid "Wonderful.\n"
-msgstr "Thần kỳ.\n"
+msgstr "Tuyệt vá»i.\n"
#: builtin/merge.c:878
#, c-format
@@ -7696,17 +7761,17 @@ msgstr "Không có thượng nguồn mặc định được định nghĩa cho n
msgid "No remote-tracking branch for %s from %s"
msgstr "Không nhánh mạng theo dõi cho %s từ %s"
-#: builtin/merge.c:1081
+#: builtin/merge.c:1079
#, c-format
msgid "could not close '%s'"
msgstr "không thể đóng “%sâ€"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1206
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Ở đây không có lần hòa trộn nào được hủy bỠgiữa chừng cả (thiếu MERGE_HEAD)."
-#: builtin/merge.c:1224
+#: builtin/merge.c:1222
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7714,7 +7779,7 @@ msgstr ""
"Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n"
"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-#: builtin/merge.c:1231
+#: builtin/merge.c:1229
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7722,54 +7787,54 @@ msgstr ""
"Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n"
"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-#: builtin/merge.c:1234
+#: builtin/merge.c:1232
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)."
-#: builtin/merge.c:1243
+#: builtin/merge.c:1241
msgid "You cannot combine --squash with --no-ff."
msgstr "Bạn không thể kết hợp --squash với --no-ff."
-#: builtin/merge.c:1251
+#: builtin/merge.c:1249
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt."
-#: builtin/merge.c:1268
+#: builtin/merge.c:1266
msgid "Squash commit into empty head not supported yet"
msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1268
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng"
-#: builtin/merge.c:1276
+#: builtin/merge.c:1274
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - không phải là một số thứ chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1278
+#: builtin/merge.c:1276
msgid "Can merge only exactly one commit into empty head"
msgstr ""
"Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng"
-#: builtin/merge.c:1333
+#: builtin/merge.c:1331
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s."
-#: builtin/merge.c:1336
+#: builtin/merge.c:1334
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Lần chuyển giao %s không có chữ ký GPG."
-#: builtin/merge.c:1342
+#: builtin/merge.c:1340
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n"
@@ -7779,46 +7844,46 @@ msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n"
msgid "Updating %s..%s\n"
msgstr "Äang cập nhật %s..%s\n"
-#: builtin/merge.c:1462
+#: builtin/merge.c:1460
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Äang thá»­ hòa trá»™n kiểu “trivial in-indexâ€â€¦\n"
-#: builtin/merge.c:1469
+#: builtin/merge.c:1467
#, c-format
msgid "Nope.\n"
msgstr "Không.\n"
-#: builtin/merge.c:1501
+#: builtin/merge.c:1499
msgid "Not possible to fast-forward, aborting."
msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỠqua."
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Äang tua lại cây thành thá»i xa xÆ°a…\n"
-#: builtin/merge.c:1528
+#: builtin/merge.c:1526
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Äang thá»­ chiến lược hòa trá»™n %s…\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1592
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n"
-#: builtin/merge.c:1596
+#: builtin/merge.c:1594
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1603
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n"
-#: builtin/merge.c:1617
+#: builtin/merge.c:1615
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8009,49 +8074,49 @@ msgstr "%s, nguồn=%s, đích=%s"
msgid "Renaming %s to %s\n"
msgstr "Äổi tên %s thành %s\n"
-#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "gặp lá»—i khi đổi tên “%sâ€"
-#: builtin/name-rev.c:255
+#: builtin/name-rev.c:251
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<các-tùy-chá»n>] <commit>…"
-#: builtin/name-rev.c:256
+#: builtin/name-rev.c:252
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<các-tùy-chá»n>] --all"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:253
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<các-tùy-chá»n>] --stdin"
-#: builtin/name-rev.c:309
+#: builtin/name-rev.c:305
msgid "print only names (no SHA-1)"
msgstr "chỉ hiển thị tên (không SHA-1)"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:306
msgid "only use tags to name the commits"
msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:308
msgid "only use refs matching <pattern>"
msgstr "chỉ sử dụng các tham chiếu khớp với <mẫu>"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:310
msgid "list all commits reachable from all refs"
msgstr ""
"liệt kê tất cả các lần chuyển giao có thể Ä‘á»c được từ tất cả các tham chiếu"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:311
msgid "read from stdin"
msgstr "Ä‘á»c từ đầu vào tiêu chuẩn"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:312
msgid "allow to print `undefined` names (default)"
msgstr "cho phép in các tên “chưa định nghĩa†(mặc định)"
-#: builtin/name-rev.c:322
+#: builtin/name-rev.c:318
msgid "dereference tags in the input (internal use)"
msgstr "bãi bỠtham chiếu các thẻ trong đầu vào (dùng nội bộ)"
@@ -8179,7 +8244,7 @@ msgstr "không thể Ä‘á»c kết xuất “showâ€"
msgid "failed to finish 'show' for object '%s'"
msgstr "gặp lá»—i khi hoàn thành “show†cho đối tượng “%sâ€"
-#: builtin/notes.c:174 builtin/tag.c:477
+#: builtin/notes.c:174 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "không thể tạo tập tin “%sâ€"
@@ -8198,12 +8263,12 @@ msgstr "không thể ghi đối tượng ghi chú (note)"
msgid "The note contents have been left in %s"
msgstr "Nội dung ghi chú còn lại %s"
-#: builtin/notes.c:232 builtin/tag.c:695
+#: builtin/notes.c:232 builtin/tag.c:440
#, c-format
msgid "cannot read '%s'"
msgstr "không thể Ä‘á»c “%sâ€"
-#: builtin/notes.c:234 builtin/tag.c:698
+#: builtin/notes.c:234 builtin/tag.c:443
#, c-format
msgid "could not open or read '%s'"
msgstr "không thể mở hay Ä‘á»c “%sâ€"
@@ -8211,7 +8276,7 @@ msgstr "không thể mở hay Ä‘á»c “%sâ€"
#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
-#: builtin/notes.c:877 builtin/tag.c:711
+#: builtin/notes.c:877 builtin/tag.c:456
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Gặp lỗi khi phân giải “%s†như là một tham chiếu hợp lệ."
@@ -8245,11 +8310,6 @@ msgstr "nội dung ghi chú (note) nằm trong một chuỗi"
msgid "note contents in a file"
msgstr "nội dung ghi chú (note) nằm trong một tập tin"
-#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
-#: builtin/notes.c:564 builtin/tag.c:630
-msgid "object"
-msgstr "đối tượng"
-
#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra"
@@ -8380,7 +8440,7 @@ msgstr "notes-ref"
msgid "use notes from <notes-ref>"
msgstr "dùng “notes†từ <notes-ref>"
-#: builtin/notes.c:1012 builtin/remote.c:1588
+#: builtin/notes.c:1012 builtin/remote.c:1647
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Không hiểu câu lệnh con: %s"
@@ -8591,21 +8651,25 @@ msgstr "Äang gỡ các đối tượng trùng lặp"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <thá»i-gian>] [--] [<head>…]"
-#: builtin/prune.c:105 builtin/worktree.c:121
+#: builtin/prune.c:105 builtin/worktree.c:124
msgid "do not remove, show only"
msgstr "không gỡ bá», chỉ hiển thị"
-#: builtin/prune.c:106 builtin/worktree.c:122
+#: builtin/prune.c:106 builtin/worktree.c:125
msgid "report pruned objects"
msgstr "báo cáo các đối tượng đã prune"
-#: builtin/prune.c:109 builtin/worktree.c:124
+#: builtin/prune.c:109 builtin/worktree.c:127
msgid "expire objects older than <time>"
msgstr "các đối tượng hết hạn cÅ© hÆ¡n khoảng <thá»i gian>"
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "không thể tỉa bớt trong một kho đối_tượng_vĩ_đại"
+
#: builtin/pull.c:69
-msgid "git pull [options] [<repository> [<refspec>...]]"
-msgstr "git push [các-tùy-chá»n] [<kho-chứa> [<refspec>…]]"
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<các-tùy-chá»n>] [<kho-chứa> [<refspec>…]]"
#: builtin/pull.c:113
msgid "Options related to merging"
@@ -9179,12 +9243,12 @@ msgstr "bá» qua áp dụng bá»™ lá»c lấy ra (checkout) thÆ°a thá»›t"
msgid "debug unpack-trees"
msgstr "gỡ lá»—i “unpack-treesâ€"
-#: builtin/reflog.c:432
+#: builtin/reflog.c:428
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "“%s†dành cho “%s†không phải là dấu vết thá»i gian hợp lệ"
-#: builtin/reflog.c:549 builtin/reflog.c:554
+#: builtin/reflog.c:545 builtin/reflog.c:550
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "“%s†không phải là dấu thá»i gian hợp lệ"
@@ -9201,15 +9265,15 @@ msgstr ""
"git remote add [-t <nhánh>] [-m <master>] [-f] [--tags|--no-tags] [--"
"mirror=<fetch|push>] <tên> <url>"
-#: builtin/remote.c:14 builtin/remote.c:33
+#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
msgstr "git remote rename <tên-cũ> <tên-mới>"
-#: builtin/remote.c:15 builtin/remote.c:38
+#: builtin/remote.c:15 builtin/remote.c:39
msgid "git remote remove <name>"
msgstr "git remote remove <tên>"
-#: builtin/remote.c:16 builtin/remote.c:43
+#: builtin/remote.c:16 builtin/remote.c:44
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)"
@@ -9231,48 +9295,52 @@ msgstr ""
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <tên> <nhánh>…"
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote set-url [--push] [--all] <tên>"
+
+#: builtin/remote.c:22 builtin/remote.c:75
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <tên> <url-mới> [<url-cũ>]"
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <tên> <url-mới>"
-#: builtin/remote.c:23 builtin/remote.c:71
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <tên> <url>"
-#: builtin/remote.c:28
+#: builtin/remote.c:29
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<các-tùy-chá»n>] <tên> <url>"
-#: builtin/remote.c:48
+#: builtin/remote.c:49
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <tên> <nhánh>…"
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <tên> <nhánh>…"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<các-tùy-chá»n>] <tên>"
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<các-tùy-chá»n>] <tên>"
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<các-tùy-chá»n>] [<nhóm> | <máy-chủ>]…"
-#: builtin/remote.c:88
+#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
msgstr "Äang cập nhật %s"
-#: builtin/remote.c:120
+#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -9280,96 +9348,96 @@ msgstr ""
"--mirror nguy hiểm và không dùng nữa; xin hãy\n"
"\t sá»­ dụng tùy chá»n --mirror=fetch hoặc --mirror=push để thay thế"
-#: builtin/remote.c:137
+#: builtin/remote.c:143
#, c-format
msgid "unknown mirror argument: %s"
msgstr "không hiểu tham số máy bản sao (mirror): %s"
-#: builtin/remote.c:153
+#: builtin/remote.c:159
msgid "fetch the remote branches"
msgstr "lấy vỠcác nhánh từ máy chủ"
-#: builtin/remote.c:155
+#: builtin/remote.c:161
msgid "import all tags and associated objects when fetching"
msgstr "nhập vào tất cả các đối tượng thẻ và thành phần liên quan khi lấy vá»"
-#: builtin/remote.c:158
+#: builtin/remote.c:164
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "hoặc không lấy vỠbất kỳ thẻ nào (--no-tags)"
-#: builtin/remote.c:160
+#: builtin/remote.c:166
msgid "branch(es) to track"
msgstr "các nhánh để theo dõi"
-#: builtin/remote.c:161
+#: builtin/remote.c:167
msgid "master branch"
msgstr "nhánh master"
-#: builtin/remote.c:162
+#: builtin/remote.c:168
msgid "push|fetch"
msgstr "push|fetch"
-#: builtin/remote.c:163
+#: builtin/remote.c:169
msgid "set up remote as a mirror to push to or fetch from"
msgstr "đặt máy chủ (remote) như là một máy bản sao để push hay fetch từ đó"
-#: builtin/remote.c:175
+#: builtin/remote.c:181
msgid "specifying a master branch makes no sense with --mirror"
msgstr "Ä‘ang chỉ định má»™t nhánh master không hợp lý vá»›i tùy chá»n --mirror"
-#: builtin/remote.c:177
+#: builtin/remote.c:183
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "chỉ định những nhánh để theo dõi chỉ hợp lý vá»›i các “fetch mirrorâ€"
-#: builtin/remote.c:187 builtin/remote.c:637
+#: builtin/remote.c:193 builtin/remote.c:643
#, c-format
msgid "remote %s already exists."
msgstr "máy chủ %s đã tồn tại rồi."
-#: builtin/remote.c:191 builtin/remote.c:641
+#: builtin/remote.c:197 builtin/remote.c:647
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "“%s†không phải tên máy chủ hợp lệ"
-#: builtin/remote.c:235
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "Không thể cài đặt nhánh master “%sâ€"
-#: builtin/remote.c:335
+#: builtin/remote.c:341
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Không thể lấy ánh xạ (map) fetch cho đặc tả tham chiếu %s"
-#: builtin/remote.c:436 builtin/remote.c:444
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr "(khá»›p)"
-#: builtin/remote.c:448
+#: builtin/remote.c:454
msgid "(delete)"
msgstr "(xóa)"
-#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "Không thể nối thêm “%s†vào “%sâ€"
-#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
#, c-format
msgid "No such remote: %s"
msgstr "Không có máy chủ nào như thế: %s"
-#: builtin/remote.c:647
+#: builtin/remote.c:653
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Không thể đổi tên phần của cấu hình từ “%s†thành “%sâ€"
-#: builtin/remote.c:653 builtin/remote.c:821
+#: builtin/remote.c:659 builtin/remote.c:827
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Không thể gỡ bá» phần cấu hình “%sâ€"
-#: builtin/remote.c:668
+#: builtin/remote.c:674
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9380,27 +9448,27 @@ msgstr ""
"\t%s\n"
"\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết."
-#: builtin/remote.c:674
+#: builtin/remote.c:680
#, c-format
msgid "Could not append '%s'"
msgstr "Không thể nối thêm “%sâ€"
-#: builtin/remote.c:685
+#: builtin/remote.c:691
#, c-format
msgid "Could not set '%s'"
msgstr "Không thể đặt “%sâ€"
-#: builtin/remote.c:707
+#: builtin/remote.c:713
#, c-format
msgid "deleting '%s' failed"
msgstr "gặp lá»—i khi xóa “%sâ€"
-#: builtin/remote.c:741
+#: builtin/remote.c:747
#, c-format
msgid "creating '%s' failed"
msgstr "gặp lá»—i khi tạo “%sâ€"
-#: builtin/remote.c:807
+#: builtin/remote.c:813
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9412,259 +9480,272 @@ msgstr[0] ""
"Ä‘i;\n"
"để xóa đi, sử dụng:"
-#: builtin/remote.c:922
+#: builtin/remote.c:928
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " mới (lần lấy vỠtiếp theo sẽ lưu trong remotes/%s)"
-#: builtin/remote.c:925
+#: builtin/remote.c:931
msgid " tracked"
msgstr " được theo dõi"
-#: builtin/remote.c:927
+#: builtin/remote.c:933
msgid " stale (use 'git remote prune' to remove)"
msgstr " cÅ© rích (dùng “git remote prune†để gỡ bá»)"
-#: builtin/remote.c:929
+#: builtin/remote.c:935
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:970
+#: builtin/remote.c:976
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge không hợp lệ; không thể cải tổ vỠphía > 1 nhánh"
-#: builtin/remote.c:977
+#: builtin/remote.c:983
#, c-format
msgid "rebases onto remote %s"
msgstr "thực hiện rebase trên máy chủ %s"
-#: builtin/remote.c:980
+#: builtin/remote.c:986
#, c-format
msgid " merges with remote %s"
msgstr " hòa trộn với máy chủ %s"
-#: builtin/remote.c:981
+#: builtin/remote.c:987
msgid " and with remote"
msgstr " và với máy chủ"
-#: builtin/remote.c:983
+#: builtin/remote.c:989
#, c-format
msgid "merges with remote %s"
msgstr "hòa trộn với máy chủ %s"
-#: builtin/remote.c:984
+#: builtin/remote.c:990
msgid " and with remote"
msgstr " và với máy chủ"
-#: builtin/remote.c:1030
+#: builtin/remote.c:1036
msgid "create"
msgstr "tạo"
-#: builtin/remote.c:1033
+#: builtin/remote.c:1039
msgid "delete"
msgstr "xóa"
-#: builtin/remote.c:1037
+#: builtin/remote.c:1043
msgid "up to date"
msgstr "đã cập nhật"
-#: builtin/remote.c:1040
+#: builtin/remote.c:1046
msgid "fast-forwardable"
msgstr "có-thể-chuyển-tiếp-nhanh"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1049
msgid "local out of date"
msgstr "dữ liệu nội bộ đã cũ"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s ép buộc thành %-*s (%s)"
-#: builtin/remote.c:1053
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s đẩy lên thành %-*s (%s)"
-#: builtin/remote.c:1057
+#: builtin/remote.c:1063
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s ép buộc thành %s"
-#: builtin/remote.c:1060
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s đẩy lên thành %s"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
msgid "do not query remotes"
msgstr "không truy vấn các máy chủ"
-#: builtin/remote.c:1155
+#: builtin/remote.c:1161
#, c-format
msgid "* remote %s"
msgstr "* máy chủ %s"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1162
#, c-format
msgid " Fetch URL: %s"
msgstr " URL để lấy vá»: %s"
-#: builtin/remote.c:1157 builtin/remote.c:1308
+#: builtin/remote.c:1163 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(không có URL)"
-#: builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr " URL để đẩy lên: %s"
-#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr " Nhánh HEAD: %s"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1182
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Những nhánh trên máy chủ:%s"
-#: builtin/remote.c:1191 builtin/remote.c:1218
+#: builtin/remote.c:1197 builtin/remote.c:1224
msgid " (status not queried)"
msgstr " (trạng thái không được yêu cầu)"
-#: builtin/remote.c:1200
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Những nhánh ná»™i bá»™ đã được cấu hình cho lệnh “git pullâ€:"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr " refs ná»™i bá»™ sẽ được phản chiếu bởi lệnh “git pushâ€"
-#: builtin/remote.c:1215
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Những tham chiếu ná»™i bá»™ được cấu hình cho lệnh “git pushâ€%s:"
-#: builtin/remote.c:1236
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ"
-#: builtin/remote.c:1238
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "xóa refs/remotes/<tên>/HEAD"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "Không thể xác định được HEAD máy chủ"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Nhiá»u nhánh HEAD máy chủ. Hãy chá»n rõ ràng má»™t:"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "Không thể xóa bỠ%s"
-#: builtin/remote.c:1273
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "Không phải là tham chiếu hợp lệ: %s"
-#: builtin/remote.c:1275
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "Không thể cài đặt %s"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s sẽ trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1294
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s đã trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1304
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "Äang xén bá»›t %s"
-#: builtin/remote.c:1305
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1321
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [nên xén bớt] %s"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [đã bị xén] %s"
-#: builtin/remote.c:1369
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "cắt máy chủ sau khi lấy vá»"
-#: builtin/remote.c:1435 builtin/remote.c:1509
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
#, c-format
msgid "No such remote '%s'"
msgstr "Không có máy chủ nào có tên “%sâ€"
-#: builtin/remote.c:1455
+#: builtin/remote.c:1461
msgid "add branch"
msgstr "thêm nhánh"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1468
msgid "no remote specified"
msgstr "chưa chỉ ra máy chủ nào"
-#: builtin/remote.c:1484
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr "truy vấn đẩy URL thay vì lấy"
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr "trả vá» má»i URL"
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "không có URL nào được cấu hình cho nhánh “%sâ€"
+
+#: builtin/remote.c:1541
msgid "manipulate push URLs"
msgstr "đẩy các “URL†bằng tay"
-#: builtin/remote.c:1486
+#: builtin/remote.c:1543
msgid "add URL"
msgstr "thêm URL"
-#: builtin/remote.c:1488
+#: builtin/remote.c:1545
msgid "delete URLs"
msgstr "xóa URLs"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1552
msgid "--add --delete doesn't make sense"
msgstr "--add --delete không hợp lý"
-#: builtin/remote.c:1535
+#: builtin/remote.c:1592
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
-#: builtin/remote.c:1543
+#: builtin/remote.c:1600
#, c-format
msgid "No such URL found: %s"
msgstr "Không tìm thấy URL như vậy: %s"
-#: builtin/remote.c:1545
+#: builtin/remote.c:1602
msgid "Will not delete all non-push URLs"
msgstr "Sẽ không xóa những địa chỉ URL không-push"
-#: builtin/remote.c:1559
+#: builtin/remote.c:1616
msgid "be verbose; must be placed before a subcommand"
msgstr "chi tiết; phải được đặt trước một lệnh-con"
@@ -9736,7 +9817,11 @@ msgstr "kích thước tối đa cho từng tập tin gói"
msgid "repack objects in packs marked with .keep"
msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep"
-#: builtin/repack.c:378
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại"
+
+#: builtin/repack.c:381
#, c-format
msgid "removing '%s' failed"
msgstr "gặp lá»—i khi xóa bỠ“%sâ€"
@@ -9832,7 +9917,7 @@ msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
"git rerere [clear | forget <Ä‘Æ°á»ng dẫn>… | status | remaining | diff | gc]"
-#: builtin/rerere.c:57
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "sổ ghi dá»n sạch các phân giải trong bản mục lục"
@@ -9968,23 +10053,23 @@ msgstr "Không thể ghi tập tin lưu bảng mục lục mới."
msgid "rev-list does not support display of notes"
msgstr "rev-list không hỗ trợ hiển thị các ghi chú"
-#: builtin/rev-parse.c:361
+#: builtin/rev-parse.c:358
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<các-tùy-chá»n>] -- [<các tham số>…]"
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
msgstr "giữ lại “--†chuyển sang làm tham số"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
msgstr "dừng phân tích sau đối số đầu tiên không có tùy chá»n"
-#: builtin/rev-parse.c:371
+#: builtin/rev-parse.c:368
msgid "output in stuck long form"
msgstr "kết xuất trong định dạng gậy dài"
-#: builtin/rev-parse.c:502
+#: builtin/rev-parse.c:499
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -10237,7 +10322,7 @@ msgstr "w[,i1[,i2]]"
msgid "Linewrap output"
msgstr "Ngắt dòng khi quá dài"
-#: builtin/show-branch.c:9
+#: builtin/show-branch.c:10
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -10249,71 +10334,71 @@ msgstr ""
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<ná»n>]] [--list] [<ref>]"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
msgstr "hiển thị các nhánh remote-tracking và nội bộ"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
msgstr "hiển thị các nhánh remote-tracking"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
msgstr "màu “*!+-†tương ứng với nhánh"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:646
msgid "show <n> more commits after the common ancestor"
msgstr "hiển thị thêm <n> lần chuyển giao sau cha mẹ chung"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:648
msgid "synonym to more=-1"
msgstr "đồng nghĩa với more=-1"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:649
msgid "suppress naming strings"
msgstr "chặn các chuỗi đặt tên"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:651
msgid "include the current branch"
msgstr "bao gồm nhánh hiện hành"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:653
msgid "name commits with their object names"
msgstr "đặt tên các lần chuyển giao bằng các tên của đối tượng của chúng"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:655
msgid "show possible merge bases"
msgstr "hiển thị má»i cÆ¡ sở có thể dùng để hòa trá»™n"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
msgstr "hiển thị các tham chiếu không thể được Ä‘á»c bởi bất kỳ tham chiếu khác"
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:659
msgid "show commits in topological order"
msgstr "hiển thị các lần chuyển giao theo thứ tự tôpô"
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:662
msgid "show only commits not on the first branch"
msgstr "chỉ hiển thị các lần chuyển giao không nằm trên nhánh đầu tiên"
-#: builtin/show-branch.c:683
+#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
msgstr "hiển thị các lần hòa trá»™n có thể Ä‘á»c được chỉ từ má»™t đầu mút"
-#: builtin/show-branch.c:685
+#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
msgstr "sắp xếp hình thái há»c, bảo trì thứ tá»± ngày nếu có thể"
-#: builtin/show-branch.c:688
+#: builtin/show-branch.c:669
msgid "<n>[,<base>]"
msgstr "<n>[,<cơ_sở>]"
-#: builtin/show-branch.c:689
+#: builtin/show-branch.c:670
msgid "show <n> most recent ref-log entries starting at base"
msgstr "hiển thị <n> các mục “ref-log†gần nhất kể từ ná»n (base)"
@@ -10326,45 +10411,140 @@ msgstr ""
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mẫu>…] "
#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"
-msgstr "git show-ref --exclude-existing[=<mẫu>] < <ref-list>"
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<mẫu>]"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
msgstr "chỉ hiển thị thẻ (có thể tổ hợp cùng với đầu)"
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
msgstr "chỉ hiển thị đầu (có thể tổ hợp cùng với thẻ)"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
msgstr ""
"việc kiểm tra tham chiếu chính xác, đòi há»i chính xác Ä‘Æ°á»ng dẫn tham chiếu"
-#: builtin/show-ref.c:175 builtin/show-ref.c:177
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "hiển thị tham chiếu HEAD, ngay cả khi nó đã được lá»c ra"
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:174
msgid "dereference tags into object IDs"
msgstr "bãi bỠtham chiếu các thẻ thành ra các ID đối tượng"
-#: builtin/show-ref.c:181
+#: builtin/show-ref.c:176
msgid "only show SHA1 hash using <n> digits"
msgstr "chỉ hiển thị mã băm SHA1 sử dụng <n> chữ số"
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:180
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"không hiển thị kết quả ra đầu ra chuẩn (stdout) (chỉ hữu dụng với --verify)"
-#: builtin/show-ref.c:187
+#: builtin/show-ref.c:182
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"hiển thị các tham chiếu từ đầu vào tiêu chuẩn (stdin) cái mà không ở kho nội "
"bá»™"
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr "giữ và xóa bá» má»i dòng bắt đầu bằng ký tá»± ghi chú"
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr "treo trước ký tự ghi chú và để trắng cho từng dòng"
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr "Ä‘iểm neo thay thế cho các Ä‘Æ°á»ng dẫn tÆ°Æ¡ng đối"
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<Ä‘Æ°á»ng/dẫn>] [<Ä‘Æ°á»ng/dẫn>…]"
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <Ä‘Æ°á»ng/dẫn>"
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr ""
+"Không tìm thấy ánh xạ (mapping) mô-Ä‘un-con trong .gitmodules cho Ä‘Æ°á»ng dẫn "
+"“%sâ€"
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr "nhân bản mô-đun-con mới vào chỗ nào"
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr "tên của mô-đun-con mới"
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr "url nơi mà nhân bản mô-đun-con từ đó"
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr "chiá»u sâu lịch sá»­ khi tạo bản sao"
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+msgstr ""
+"git submodule--helper clone [--prefix=<Ä‘Æ°á»ng/dẫn>] [--quiet] [--reference "
+"<kho>] [--name <tên>] [--url <url>][--depth <Ä‘Æ°á»ng/dẫn>] [--] [<Ä‘Æ°á»ng/dẫn>…]"
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "không thể tạo thÆ° mục “%sâ€"
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "Nhân bản “%s†vào Ä‘Æ°á»ng dẫn mô-Ä‘un-con “%s†gặp lá»—i"
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr "không thể mở tập tin “%sâ€"
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr "không thể đóng tập tin %s"
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "không thể lấy thÆ° mục mô-Ä‘un-con cho “%sâ€"
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr ""
+"lá»—i nghiêm trá»ng: lệnh con submodule--helper phải được gói vá»›i má»™t lệnh con"
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr "lá»—i nghiêm trá»ng: “%s†không phải là lệnh con submodule--helper hợp lệ"
+
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<các-tùy-chá»n>] <tên> [<t.chiếu>]"
@@ -10393,7 +10573,7 @@ msgstr "lý do"
msgid "reason of the update"
msgstr "lý do cập nhật"
-#: builtin/tag.c:22
+#: builtin/tag.c:23
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
@@ -10401,49 +10581,44 @@ msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg>|-F <tập-tin>] <tên-thẻ> "
"[<head>]"
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid "git tag -d <tagname>..."
msgstr "git tag -d <tên-thẻ>…"
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[<pattern>...]"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
"git tag -l [-n[<số>]] [--contains <lần_chuyển_giao>] [--points-at <đối-"
"tượng>]\n"
-"\t\t[<mẫu>…]"
+"\t\t[--format=<định dạng>] [--[no-]merged [<lần_chuyển_giao>]] [<mẫu>…]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -v <tagname>..."
msgstr "git tag -v <tên-thẻ>…"
-#: builtin/tag.c:69
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "đối tượng dị hình tại “%sâ€"
-
-#: builtin/tag.c:301
+#: builtin/tag.c:80
#, c-format
msgid "tag name too long: %.*s..."
msgstr "tên thẻ quá dài: %.*s…"
-#: builtin/tag.c:306
+#: builtin/tag.c:85
#, c-format
msgid "tag '%s' not found."
msgstr "không tìm thấy tìm thấy thẻ “%sâ€."
-#: builtin/tag.c:321
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Thẻ đã bị xóa “%s†(từng là %s)\n"
-#: builtin/tag.c:333
+#: builtin/tag.c:112
#, c-format
msgid "could not verify the tag '%s'"
msgstr "không thể thẩm tra thẻ “%sâ€"
-#: builtin/tag.c:343
+#: builtin/tag.c:122
#, c-format
msgid ""
"\n"
@@ -10456,7 +10631,7 @@ msgstr ""
" %s\n"
"Những dòng được bắt đầu bằng “%c†sẽ được bỠqua.\n"
-#: builtin/tag.c:347
+#: builtin/tag.c:126
#, c-format
msgid ""
"\n"
@@ -10471,153 +10646,138 @@ msgstr ""
"Những dòng được bắt đầu bằng “%c†sẽ được giữ lại; bạn có thể xóa chúng đi "
"nếu muốn.\n"
-#: builtin/tag.c:371
-#, c-format
-msgid "unsupported sort specification '%s'"
-msgstr "không há»— trợ đặc tả sắp xếp “%sâ€"
-
-#: builtin/tag.c:373
-#, c-format
-msgid "unsupported sort specification '%s' in variable '%s'"
-msgstr "không há»— trợ đặc tả sắp xếp “%s†trong biến “%sâ€"
-
-#: builtin/tag.c:428
+#: builtin/tag.c:199
msgid "unable to sign the tag"
msgstr "không thể ký thẻ"
-#: builtin/tag.c:430
+#: builtin/tag.c:201
msgid "unable to write tag file"
msgstr "không thể ghi vào tập tin lưu thẻ"
-#: builtin/tag.c:455
+#: builtin/tag.c:226
msgid "bad object type."
msgstr "kiểu đối tượng sai."
-#: builtin/tag.c:468
+#: builtin/tag.c:239
msgid "tag header too big."
msgstr "phần đầu thẻ quá lớn."
-#: builtin/tag.c:504
+#: builtin/tag.c:275
msgid "no tag message?"
msgstr "không có chú thích gì cho cho thẻ à?"
-#: builtin/tag.c:510
+#: builtin/tag.c:281
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Nội dung ghi chú còn lại %s\n"
-#: builtin/tag.c:559
-msgid "switch 'points-at' requires an object"
-msgstr "chuyển đến “points-at†yêu cần một đối tượng"
-
-#: builtin/tag.c:561
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "tên đối tượng dị hình “%sâ€"
-
-#: builtin/tag.c:590
+#: builtin/tag.c:339
msgid "list tag names"
msgstr "chỉ liệt kê tên các thẻ"
-#: builtin/tag.c:592
+#: builtin/tag.c:341
msgid "print <n> lines of each tag message"
msgstr "hiển thị <n> dòng cho mỗi ghi chú"
-#: builtin/tag.c:594
+#: builtin/tag.c:343
msgid "delete tags"
msgstr "xóa thẻ"
-#: builtin/tag.c:595
+#: builtin/tag.c:344
msgid "verify tags"
msgstr "thẩm tra thẻ"
-#: builtin/tag.c:597
+#: builtin/tag.c:346
msgid "Tag creation options"
msgstr "Tùy chá»n tạo thẻ"
-#: builtin/tag.c:599
+#: builtin/tag.c:348
msgid "annotated tag, needs a message"
msgstr "để chú giải cho thẻ, cần má»™t lá»i ghi chú"
-#: builtin/tag.c:601
+#: builtin/tag.c:350
msgid "tag message"
msgstr "phần chú thích cho thẻ"
-#: builtin/tag.c:603
+#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
msgstr "thẻ chú giải và ký kiểu GPG"
-#: builtin/tag.c:607
+#: builtin/tag.c:356
msgid "use another key to sign the tag"
msgstr "dùng kháo khác để ký thẻ"
-#: builtin/tag.c:608
+#: builtin/tag.c:357
msgid "replace the tag if exists"
msgstr "thay thế nếu thẻ đó đã có trước"
-#: builtin/tag.c:609 builtin/update-ref.c:368
+#: builtin/tag.c:358 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "tạo một reflog"
-#: builtin/tag.c:611
+#: builtin/tag.c:360
msgid "Tag listing options"
msgstr "Các tùy chá»n liệt kê thẻ"
-#: builtin/tag.c:612
+#: builtin/tag.c:361
msgid "show tag list in columns"
msgstr "hiển thị danh sách thẻ trong các cột"
-#: builtin/tag.c:614
-msgid "sort tags"
-msgstr "sắp xếp các thẻ"
-
-#: builtin/tag.c:619 builtin/tag.c:625
+#: builtin/tag.c:362 builtin/tag.c:363
msgid "print only tags that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/tag.c:631
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
+msgstr "chỉ hiển thị những thẻ mà nó được hòa trộn"
+
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
+msgstr "chỉ hiển thị những thẻ mà nó không được hòa trộn"
+
+#: builtin/tag.c:370
msgid "print only tags of the object"
msgstr "chỉ hiển thị các thẻ của đối tượng"
-#: builtin/tag.c:657
+#: builtin/tag.c:399
msgid "--column and -n are incompatible"
msgstr "--column và -n xung khắc nhau"
-#: builtin/tag.c:669
-msgid "--sort and -n are incompatible"
-msgstr "--sort và -n xung khắc nhau"
-
-#: builtin/tag.c:676
+#: builtin/tag.c:419
msgid "-n option is only allowed with -l."
msgstr "tùy chá»n -n chỉ cho phép dùng vá»›i -l."
-#: builtin/tag.c:678
+#: builtin/tag.c:421
msgid "--contains option is only allowed with -l."
msgstr "tùy chá»n --contains chỉ cho phép dùng vá»›i -l."
-#: builtin/tag.c:680
+#: builtin/tag.c:423
msgid "--points-at option is only allowed with -l."
msgstr "tùy chá»n --points-at chỉ cho phép dùng vá»›i -l."
-#: builtin/tag.c:688
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr "tùy chá»n --merged và --no-merged chỉ cho phép dùng vá»›i -l."
+
+#: builtin/tag.c:433
msgid "only one -F or -m option is allowed."
msgstr "chỉ có má»™t tùy chá»n -F hoặc -m là được phép."
-#: builtin/tag.c:708
+#: builtin/tag.c:453
msgid "too many params"
msgstr "quá nhiá»u đối số"
-#: builtin/tag.c:714
+#: builtin/tag.c:459
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "“%s†không phải thẻ hợp lệ."
-#: builtin/tag.c:719
+#: builtin/tag.c:464
#, c-format
msgid "tag '%s' already exists"
msgstr "Thẻ “%s†đã tồn tại rồi"
-#: builtin/tag.c:744
+#: builtin/tag.c:489
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Äã cập nhật thẻ “%s†(trÆ°á»›c là %s)\n"
@@ -10882,76 +11042,80 @@ msgstr "git verify-tag [-v | --verbose] <thẻ>…"
msgid "print tag contents"
msgstr "hiển thị nội dung của thẻ"
-#: builtin/worktree.c:13
-msgid "git worktree add [<options>] <path> <branch>"
-msgstr "git worktree add [<các-tùy-chá»n>] <Ä‘Æ°á»ng-dẫn> <nhánh>"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<các-tùy-chá»n>] <Ä‘Æ°á»ng-dẫn> [<nhánh>]"
-#: builtin/worktree.c:14
+#: builtin/worktree.c:16
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<các-tùy-chá»n>]"
-#: builtin/worktree.c:36
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<các-tùy-chá»n>]"
+
+#: builtin/worktree.c:39
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Gỡ bỠcây làm việc/%s: không phải là thư mục hợp lệ"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:45
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Gỡ bỠcây làm việc/%s: không có tập tin gitdir"
-#: builtin/worktree.c:47
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Gỡ bá» cây làm việc/%s: không thể Ä‘á»c tập tin gitdir (%s)"
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Gỡ bỠcây làm việc/%s: tập tin gitdir không hợp lệ"
-#: builtin/worktree.c:74
+#: builtin/worktree.c:77
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Gỡ bỠcây làm việc/%s: tập tin gitdir chỉ đến vị trí không tồn tại"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:112
#, c-format
msgid "failed to remove: %s"
msgstr "gặp lá»—i khi gỡ bá»: %s"
-#: builtin/worktree.c:198
+#: builtin/worktree.c:201
#, c-format
msgid "'%s' already exists"
msgstr "“%s†đã có từ trước rồi"
-#: builtin/worktree.c:232
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "không thể tạo thÆ° mục của “%sâ€"
-#: builtin/worktree.c:268
+#: builtin/worktree.c:271
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Äang chuẩn bị %s (định danh %s)"
-#: builtin/worktree.c:316
+#: builtin/worktree.c:319
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác"
-#: builtin/worktree.c:318
+#: builtin/worktree.c:321
msgid "create a new branch"
msgstr "tạo nhánh mới"
-#: builtin/worktree.c:320
+#: builtin/worktree.c:323
msgid "create or reset a branch"
msgstr "tạo hay đặt lại một nhánh"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:324
msgid "detach HEAD at named commit"
msgstr "rá»i bá» HEAD tại lần chuyển giao theo tên"
-#: builtin/worktree.c:328
+#: builtin/worktree.c:331
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Các tùy chá»n -b, -B, và --detach loại từ lẫn nhau"
@@ -11100,48 +11264,48 @@ msgstr "ngày hết hạn"
msgid "no-op (backward compatibility)"
msgstr "no-op (tương thích ngược)"
-#: parse-options.h:236
+#: parse-options.h:237
msgid "be more verbose"
msgstr "chi tiết hơn nữa"
-#: parse-options.h:238
+#: parse-options.h:239
msgid "be more quiet"
msgstr "im lặng hơn nữa"
-#: parse-options.h:244
+#: parse-options.h:245
msgid "use <n> digits to display SHA-1s"
msgstr "sử dụng <n> chữ số để hiển thị SHA-1s"
-#: rerere.h:28
+#: rerere.h:38
msgid "update the index with reused conflict resolution if possible"
msgstr "cập nhật bảng mục lục với phân giải xung đột dùng lại nếu được"
-#: git-bisect.sh:50
+#: git-bisect.sh:55
msgid "You need to start by \"git bisect start\""
msgstr "Bạn cần khởi đầu bằng \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:56
+#: git-bisect.sh:61
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Bạn có muốn tôi thá»±c hiện Ä‘iá»u này cho bạn không [Y/n]? "
-#: git-bisect.sh:99
+#: git-bisect.sh:122
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "không công nhận tùy chá»n: “$argâ€"
-#: git-bisect.sh:103
+#: git-bisect.sh:126
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "â€$arg†không có vẻ nhÆ° là má»™t Ä‘iểm xét duyệt hợp lệ"
-#: git-bisect.sh:132
+#: git-bisect.sh:155
msgid "Bad HEAD - I need a HEAD"
msgstr "HEAD sai - Tôi cần một HEAD"
-#: git-bisect.sh:145
+#: git-bisect.sh:168
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
@@ -11149,39 +11313,39 @@ msgstr ""
"Việc lấy “$start_head†ra gặp lỗi. Hãy thử \"git bisect reset <nhánh_hợp_lệ>"
"\"."
-#: git-bisect.sh:155
+#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
msgstr "sẽ không di chuyển nửa bước trên cây được cg-seek"
-#: git-bisect.sh:159
+#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
msgstr "HEAD sai - tham chiếu má»m kỳ lạ"
-#: git-bisect.sh:211
+#: git-bisect.sh:234
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Äối số bisect_write sai: $state"
-#: git-bisect.sh:240
+#: git-bisect.sh:263
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Äầu vào rev sai: $arg"
-#: git-bisect.sh:255
+#: git-bisect.sh:278
msgid "Please call 'bisect_state' with at least one argument."
msgstr "Hãy gá»i lệnhl “bisect_state†vá»›i ít nhất má»™t đối số."
-#: git-bisect.sh:267
+#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Äầu vào rev sai: $rev"
-#: git-bisect.sh:276
+#: git-bisect.sh:299
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "“git bisect $TERM_BAD†có thể lấy chỉ một đối số."
-#: git-bisect.sh:299
+#: git-bisect.sh:322
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "Cảnh báo: chỉ thực hiện việc bisect với một lần chuyển giao $TERM_BAD."
@@ -11189,11 +11353,11 @@ msgstr "Cảnh báo: chỉ thực hiện việc bisect với một lần chuyể
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:305
+#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
msgstr "Bạn có chắc chắn chưa [Y/n]? "
-#: git-bisect.sh:317
+#: git-bisect.sh:340
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -11203,7 +11367,7 @@ msgstr ""
"(Bạn có thể sử dụng \"git bisect $bad_syn\" và \"git bisect $good_syn\" cho "
"cái đó.)"
-#: git-bisect.sh:320
+#: git-bisect.sh:343
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11216,16 +11380,16 @@ msgstr ""
"(Bạn có thể sử dụng \"git bisect $bad_syn\" và \"git bisect $good_syn\" cho "
"chúng.)"
-#: git-bisect.sh:391 git-bisect.sh:521
+#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
msgstr "Chúng tôi không bisect."
-#: git-bisect.sh:398
+#: git-bisect.sh:421
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "â€$invalid†không phải là lần chuyển giao hợp lệ"
-#: git-bisect.sh:407
+#: git-bisect.sh:430
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -11234,25 +11398,25 @@ msgstr ""
"Không thể check-out HEAD nguyên thủy của “$branchâ€.\n"
"Hãy thá»­ “git bisect reset <lần-chuyển-giao>â€."
-#: git-bisect.sh:435
+#: git-bisect.sh:458
msgid "No logfile given"
msgstr "Chưa chỉ ra tập tin ghi nhật ký"
-#: git-bisect.sh:436
+#: git-bisect.sh:459
#, sh-format
msgid "cannot read $file for replaying"
msgstr "không thể Ä‘á»c $file để thao diá»…n lại"
-#: git-bisect.sh:455
+#: git-bisect.sh:480
msgid "?? what are you talking about?"
msgstr "?? bạn đang nói gì thế?"
-#: git-bisect.sh:467
+#: git-bisect.sh:492
#, sh-format
msgid "running $command"
msgstr "đang chạy lệnh $command"
-#: git-bisect.sh:474
+#: git-bisect.sh:499
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11261,11 +11425,11 @@ msgstr ""
"chạy bisect gặp lỗi:\n"
"mã trả vỠ$res từ lệnh “$command†là < 0 hoặc >= 128"
-#: git-bisect.sh:500
+#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
msgstr "bisect không thể tiếp tục thêm được nữa"
-#: git-bisect.sh:506
+#: git-bisect.sh:531
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11274,15 +11438,47 @@ msgstr ""
"chạy bisect gặp lỗi:\n"
"â€bisect_state $state†đã thoát ra vá»›i mã lá»—i $res"
-#: git-bisect.sh:513
+#: git-bisect.sh:538
msgid "bisect run success"
msgstr "bisect chạy thành công"
-#: git-bisect.sh:548
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "vui lòng dùng hai thá»i kỳ khác nhau"
+
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "“$term†không phải là thá»i kỳ hợp lệ"
+
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr "không thể dùng lệnh tích hợp “$term†nhÆ° là má»™t thá»i kỳ"
+
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "không thể thay đổi nghÄ©a của thá»i kỳ “$termâ€"
+
+#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr "Lệnh không hợp lệ: bạn hiện đang ở bisect $TERM_BAD/$TERM_GOOD."
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "chÆ°a định nghÄ©a thá»i kỳ nào"
+
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"tham số không hợp lệ $arg cho “git bisect termsâ€.\n"
+"Các tùy chá»n há»— trợ là: --term-good|--term-old và --term-bad|--term-new."
+
#: git-rebase.sh:57
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
@@ -11326,25 +11522,25 @@ msgstr ""
"Hình như đang trong quá trình thực hiện lệnh git-am. Không thể chạy lệnh "
"rebase."
-#: git-rebase.sh:351
+#: git-rebase.sh:354
msgid "The --exec option must be used with the --interactive option"
msgstr "Tùy chá»n --exec phải được sá»­ dụng cùng vá»›i tùy chá»n --interactive"
-#: git-rebase.sh:356
+#: git-rebase.sh:359
msgid "No rebase in progress?"
msgstr "Không có tiến trình rebase nào phải không?"
-#: git-rebase.sh:367
+#: git-rebase.sh:370
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Hành động “--edit-todo†chỉ có thể dùng trong quá trình “rebase†(sửa lịch "
"sử) tương tác."
-#: git-rebase.sh:374
+#: git-rebase.sh:377
msgid "Cannot read HEAD"
msgstr "Không thể Ä‘á»c HEAD"
-#: git-rebase.sh:377
+#: git-rebase.sh:380
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11352,12 +11548,12 @@ msgstr ""
"Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n"
"đó đánh dấu chúng là cần xử lý sử dụng lệnh git add"
-#: git-rebase.sh:395
+#: git-rebase.sh:398
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Không thể quay trở lại $head_name"
-#: git-rebase.sh:414
+#: git-rebase.sh:417
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11369,75 +11565,73 @@ msgid ""
"and run me again. I am stopping in case you still have something\n"
"valuable there."
msgstr ""
-"Hình như là ở đây sẵn có một thư mục $state_dir_base directory, và\n"
+"Hình như là ở đây sẵn có một thư mục $state_dir_base, và\n"
"Tôi tá»± há»i có phải bạn Ä‘ang ở giữa má»™t lệnh rebase khác. Nếu đúng là\n"
"như vậy, xin hãy thử\n"
"\t$cmd_live_rebase\n"
"Nếu không phải thế, hãy thử\n"
"\t$cmd_clear_stale_rebase\n"
-"và chạy TÔI lần nữa. TÔI dừng lại trong trÆ°á»ng hợp bạn vẫn\n"
-"có một số thứ quý giá ở đây.\n"
-"\n"
-"TÔI: là lệnh bạn vừa gá»i!"
+"và chạy TÔI lần nữa. TÔI dừng lại trong trÆ°á»ng hợp bạn vẫn\n"
+"có một số thứ quý giá ở đây."
-#: git-rebase.sh:465
+#: git-rebase.sh:468
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "thượng nguồn không hợp lệ $upstream_name"
-#: git-rebase.sh:489
+#: git-rebase.sh:492
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: ở đây có nhiá»u hÆ¡n má»™t ná»n móng hòa trá»™n"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:495 git-rebase.sh:499
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ở đây không có ná»n móng hòa trá»™n nào"
-#: git-rebase.sh:501
+#: git-rebase.sh:504
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Không chỉ đến một lần chuyển giao không hợp lệ: $onto_name"
-#: git-rebase.sh:524
+#: git-rebase.sh:527
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "nghiêm trá»ng: không có nhánh nhÆ° thế: $branch_name"
-#: git-rebase.sh:557
+#: git-rebase.sh:560
msgid "Cannot autostash"
msgstr "Không thể autostash"
-#: git-rebase.sh:562
+#: git-rebase.sh:565
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Äã tạo autostash: $stash_abbrev"
-#: git-rebase.sh:566
+#: git-rebase.sh:569
msgid "Please commit or stash them."
-msgstr "Xin hãy commit hoặc tạm cất (stash) chúng."
+msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: git-rebase.sh:586
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi."
-#: git-rebase.sh:590
+#: git-rebase.sh:593
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc."
-#: git-rebase.sh:601
+#: git-rebase.sh:604
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Thay đổi từ $mb thành $onto:"
-#: git-rebase.sh:610
+#: git-rebase.sh:613
msgid "First, rewinding head to replay your work on top of it..."
msgstr "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…"
-#: git-rebase.sh:620
+#: git-rebase.sh:623
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name."
@@ -11512,118 +11706,100 @@ msgstr "Không thể ghi lại trạng thái hiện hành"
msgid "Cannot remove worktree changes"
msgstr "Không thể gỡ bỠcác thay đổi cây-làm-việc"
-#: git-stash.sh:387
+#: git-stash.sh:405
#, sh-format
msgid "unknown option: $opt"
msgstr "không hiểu tùy chá»n: $opt"
-#: git-stash.sh:397
+#: git-stash.sh:415
msgid "No stash found."
msgstr "Không tìm thấy lần chuyển giao cất đi (stash) nào."
-#: git-stash.sh:404
+#: git-stash.sh:422
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Chỉ ra quá nhiá»u Ä‘iểm xét duyệt: $REV"
-#: git-stash.sh:410
+#: git-stash.sh:428
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference không phải là tham chiếu hợp lệ"
-#: git-stash.sh:438
+#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "“$args†không phải là lần chuyển giao kiểu-stash (cất đi)"
-#: git-stash.sh:449
+#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "â€$args†không phải tham chiếu đến stash"
-#: git-stash.sh:457
+#: git-stash.sh:475
msgid "unable to refresh index"
msgstr "không thể làm tươi mới bảng mục lục"
-#: git-stash.sh:461
+#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn"
-#: git-stash.sh:469
+#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
msgstr "Xung Ä‘á»™t trong bảng mục lục. Hãy thá»­ mà không dùng tùy chá»n --index."
-#: git-stash.sh:471
+#: git-stash.sh:489
msgid "Could not save index tree"
msgstr "Không thể ghi lại cây chỉ mục"
-#: git-stash.sh:505
+#: git-stash.sh:523
msgid "Cannot unstage modified files"
msgstr "Không thể bá» ra khá»i bệ phóng các tập tin đã được sá»­a chữa"
-#: git-stash.sh:520
+#: git-stash.sh:538
msgid "Index was not unstashed."
msgstr "Bảng mục lục đã không được bỠstash."
-#: git-stash.sh:543
+#: git-stash.sh:561
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Äã xóa ${REV} ($s)"
-#: git-stash.sh:544
+#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Không thể xóa bỠmục stash"
-#: git-stash.sh:552
+#: git-stash.sh:570
msgid "No branch name specified"
msgstr "Chưa chỉ ra tên của nhánh"
-#: git-stash.sh:624
+#: git-stash.sh:642
msgid "(To restore them type \"git stash apply\")"
msgstr "(Äể phục hồi lại chúng hãy gõ \"git stash apply\")"
-#: git-submodule.sh:95
+#: git-submodule.sh:104
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "không thể tháo bá» má»™t thành phần ra khá»i “$remoteurl†url"
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr ""
-"Không tìm thấy ánh xạ (mapping) mô-Ä‘un-con trong .gitmodules cho Ä‘Æ°á»ng dẫn "
-"“$sm_pathâ€"
-
-#: git-submodule.sh:287
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr "Nhân bản “$url†vào Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$sm_path†gặp lá»—i"
-
-#: git-submodule.sh:296
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr ""
-"Gitdir “$a†là bá»™ phận của Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$b†hoặc \"vice versa\""
-
-#: git-submodule.sh:406
+#: git-submodule.sh:281
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"ÄÆ°á»ng dẫn tÆ°Æ¡ng đối chỉ có thể dùng từ thÆ° mục ở mức cao nhất của cây làm "
"việc"
-#: git-submodule.sh:416
+#: git-submodule.sh:291
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
"repo URL: “$repo†phải là Ä‘Æ°á»ng dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
-#: git-submodule.sh:433
+#: git-submodule.sh:308
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "â€$sm_path†thá»±c sá»± đã tồn tại ở bảng mục lục rồi"
-#: git-submodule.sh:437
+#: git-submodule.sh:312
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11635,36 +11811,36 @@ msgstr ""
"$sm_path\n"
"Sử dụng -f nếu bạn thực sự muốn thêm nó vào."
-#: git-submodule.sh:455
+#: git-submodule.sh:330
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Äang thêm repo có sẵn tại “$sm_path†vào bảng mục lục"
-#: git-submodule.sh:457
+#: git-submodule.sh:332
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "â€$sm_path†đã tồn tại từ trÆ°á»›c và không phải là má»™t kho git hợp lệ"
-#: git-submodule.sh:465
+#: git-submodule.sh:340
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Thư mục git cho “$sm_name†được tìm thấy một cách cục bộ với các máy chủ:"
-#: git-submodule.sh:467
+#: git-submodule.sh:342
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr "Nếu bạn muốn dùng lại thư mục git nội bộ này thay vì nhân bản từ nó"
-#: git-submodule.sh:469
+#: git-submodule.sh:344
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr ""
"dùng tùy chá»n “--forceâ€. Nếu thÆ° mục git ná»™i bá»™ không phải là repo (kho) đúng"
-#: git-submodule.sh:470
+#: git-submodule.sh:345
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
@@ -11673,71 +11849,71 @@ msgstr ""
"hay bạn không chắc chắn Ä‘iá»u đó có nghÄ©a gì chá»n tên khác vá»›i tùy chá»n “--"
"nameâ€."
-#: git-submodule.sh:472
+#: git-submodule.sh:347
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
"Phục hồi sá»± hoạt Ä‘á»™ng của thÆ° mục git ná»™i bá»™ cho mô-Ä‘un-con “$sm_nameâ€."
-#: git-submodule.sh:484
+#: git-submodule.sh:359
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Không thể lấy ra mô-Ä‘un-con “$sm_pathâ€"
-#: git-submodule.sh:489
+#: git-submodule.sh:364
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Gặp lá»—i khi thêm mô-Ä‘un-con “$sm_pathâ€"
-#: git-submodule.sh:498
+#: git-submodule.sh:373
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Gặp lá»—i khi đăng ký vá»›i hệ thống mô-Ä‘un-con “$sm_pathâ€"
-#: git-submodule.sh:542
+#: git-submodule.sh:417
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr "Äang vào “$prefix$displaypathâ€"
-#: git-submodule.sh:562
+#: git-submodule.sh:437
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr ""
"Dừng lại tại “$prefix$displaypathâ€; script trả vá» trạng thái khác không."
-#: git-submodule.sh:608
+#: git-submodule.sh:483
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr ""
"Không tìm thấy url cho Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypath†trong .gitmodules"
-#: git-submodule.sh:617
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
msgstr "Gặp lá»—i khi đăng ký url cho Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:619
+#: git-submodule.sh:494
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr "Mô-Ä‘un-con “$name†($url) được đăng ký cho Ä‘Æ°á»ng dẫn “$displaypathâ€"
-#: git-submodule.sh:636
+#: git-submodule.sh:511
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr ""
"Gặp lá»—i khi đăng ký chế Ä‘á»™ cập nhật cho Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:674
+#: git-submodule.sh:549
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr "Dùng “.†nếu bạn thá»±c sá»± muốn gỡ bá» má»i mô-Ä‘un-con"
-#: git-submodule.sh:691
+#: git-submodule.sh:566
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr "Cây làm việc mô-đun-con “$displaypath†có chứa thư mục .git"
-#: git-submodule.sh:692
+#: git-submodule.sh:567
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -11745,7 +11921,7 @@ msgstr ""
"(dùng “rm -rf†nếu bạn thực sự muốn gỡ bỠnó cùng với tất cả lịch sử của "
"chúng)"
-#: git-submodule.sh:698
+#: git-submodule.sh:573
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -11754,27 +11930,27 @@ msgstr ""
"Cây làm việc mô-đun-con “$displaypath†chứa các thay đổi nội bộ; hãy dùng “-"
"f†để loại bỠchúng đi"
-#: git-submodule.sh:701
+#: git-submodule.sh:576
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Äã tạo thÆ° mục “$displaypathâ€"
-#: git-submodule.sh:702
+#: git-submodule.sh:577
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Không thể gỡ bá» cây làm việc mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:705
+#: git-submodule.sh:580
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Không thể tạo thÆ° mục mô-Ä‘un-con rá»—ng “$displaypathâ€"
-#: git-submodule.sh:714
+#: git-submodule.sh:589
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Mô-Ä‘un-con “$name†($url) được bỠđăng ký cho Ä‘Æ°á»ng dẫn “$displaypathâ€"
-#: git-submodule.sh:830
+#: git-submodule.sh:705
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
@@ -11783,55 +11959,55 @@ msgstr ""
"ÄÆ°á»ng dẫn mô-Ä‘un-con “$displaypath†chÆ°a được khởi tạo.\n"
"Có lẽ bạn muốn sử dụng lệnh “update --init�"
-#: git-submodule.sh:843
+#: git-submodule.sh:718
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Không tìm thấy Ä‘iểm xét duyệt hiện hành trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con "
"“$displaypathâ€"
-#: git-submodule.sh:852
+#: git-submodule.sh:727
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Không thể lấy vá» trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$sm_pathâ€"
-#: git-submodule.sh:876
+#: git-submodule.sh:751
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Không thể lấy vá» trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:890
+#: git-submodule.sh:765
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Không thể lấy ra “$sha1†trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:891
+#: git-submodule.sh:766
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "ÄÆ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€: đã checkout “$sha1â€"
-#: git-submodule.sh:895
+#: git-submodule.sh:770
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Không thể cải tổ “$sha1†trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:896
+#: git-submodule.sh:771
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "ÄÆ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€: được rebase vào trong “$sha1â€"
-#: git-submodule.sh:901
+#: git-submodule.sh:776
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Không thể hòa trá»™n (merge) “$sha1†trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:902
+#: git-submodule.sh:777
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "ÄÆ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€: được hòa trá»™n vào “$sha1â€"
-#: git-submodule.sh:907
+#: git-submodule.sh:782
#, sh-format
msgid ""
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
@@ -11839,56 +12015,105 @@ msgstr ""
"Thá»±c hiện không thành công lệnh “$command $sha1†trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con "
"“$prefix$sm_pathâ€"
-#: git-submodule.sh:908
+#: git-submodule.sh:783
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr "ÄÆ°á»ng dẫn mô-Ä‘un-con “$prefix$sm_pathâ€: “$command $sha1â€"
-#: git-submodule.sh:938
+#: git-submodule.sh:813
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Gặp lá»—i khi đệ quy vào trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:1046
+#: git-submodule.sh:921
msgid "The --cached option cannot be used with the --files option"
msgstr "Tùy chá»n --cached không thể dùng cùng vá»›i tùy chá»n --files"
-#: git-submodule.sh:1098
+#: git-submodule.sh:973
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "chế độ không như mong chỠ$mod_dst"
-#: git-submodule.sh:1118
+#: git-submodule.sh:993
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src"
-#: git-submodule.sh:1121
+#: git-submodule.sh:996
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst"
-#: git-submodule.sh:1124
+#: git-submodule.sh:999
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và "
"$sha1_dst"
-#: git-submodule.sh:1149
+#: git-submodule.sh:1024
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1267
+#: git-submodule.sh:1142
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Gặp lá»—i khi đệ quy vào trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$sm_pathâ€"
-#: git-submodule.sh:1331
+#: git-submodule.sh:1206
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Url Mô-Ä‘un-con đồng bá»™ hóa cho “$displaypathâ€"
+#~ msgid "branch '%s' does not point at a commit"
+#~ msgstr "nhánh “%s†không chỉ đến một lần chuyển giao nào cả"
+
+#~ msgid "object '%s' does not point to a commit"
+#~ msgstr "đối tượng “%s†không chỉ đến một lần chuyển giao nào cả"
+
+#~ msgid "some refs could not be read"
+#~ msgstr "má»™t số tham chiếu đã không thể Ä‘á»c được"
+
+#~ msgid "print only merged branches"
+#~ msgstr "chỉ hiển thị các nhánh đã hòa trộn"
+
+#~ msgid "--dissociate given, but there is no --reference"
+#~ msgstr "đã đưa ra --dissociate, nhưng ở đây lại không có --reference"
+
+#~ msgid "show usage"
+#~ msgstr "hiển thị cách dùng"
+
+#~ msgid "insanely long template name %s"
+#~ msgstr "tên mẫu dài một cách điên rồ %s"
+
+#~ msgid "insanely long symlink %s"
+#~ msgstr "liên kết má»m dài má»™t cách Ä‘iên rồ %s"
+
+#~ msgid "insanely long template path %s"
+#~ msgstr "Ä‘Æ°á»ng dẫn mẫu “%s†dài má»™t cách Ä‘iên rồ"
+
+#~ msgid "insane git directory %s"
+#~ msgstr "thư mục git điên rồ %s"
+
+#~ msgid "unsupported sort specification '%s'"
+#~ msgstr "không há»— trợ đặc tả sắp xếp “%sâ€"
+
+#~ msgid "unsupported sort specification '%s' in variable '%s'"
+#~ msgstr "không há»— trợ đặc tả sắp xếp “%s†trong biến “%sâ€"
+
+#~ msgid "switch 'points-at' requires an object"
+#~ msgstr "chuyển đến “points-at†yêu cần một đối tượng"
+
+#~ msgid "sort tags"
+#~ msgstr "sắp xếp các thẻ"
+
+#~ msgid "--sort and -n are incompatible"
+#~ msgstr "--sort và -n xung khắc nhau"
+
+#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
+#~ msgstr ""
+#~ "Gitdir “$a†là bá»™ phận của Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$b†hoặc \"vice versa\""
+
#~ msgid "false|true|preserve"
#~ msgstr "false|true|preserve"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fcdaa7e..c7fed46 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -87,6 +87,7 @@
# pickaxe | 挖掘
# plumbing | 管件(Git 底层核心命令的别称)
# porcelain | 瓷件(Git 上层å°è£…命令的别称)
+# precious-objects repo | çå“仓库
# prune | 清除
# pull | 拉,拉å–
# push | 推,推é€
@@ -134,8 +135,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-09-15 06:45+0800\n"
-"PO-Revision-Date: 2015-09-15 21:49+0800\n"
+"POT-Creation-Date: 2015-12-22 22:50+0800\n"
+"PO-Revision-Date: 2015-12-22 23:06+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
@@ -157,12 +158,12 @@ msgstr ""
"请在工作区改正文件,然åŽé…Œæƒ…使用 'git add/rm <文件>' 命令标记\n"
"解决方案并æ交。"
-#: advice.c:101 builtin/merge.c:1227
+#: advice.c:101 builtin/merge.c:1225
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå­˜åœ¨ MERGE_HEAD)。"
#: advice.c:103
-msgid "Please, commit your changes before you can merge."
+msgid "Please, commit your changes before merging."
msgstr "请在åˆå¹¶å‰å…ˆæ交您的修改。"
#: advice.c:104
@@ -187,76 +188,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹é…任何文件"
-#: archive.c:428
+#: archive.c:429
msgid "fmt"
msgstr "æ ¼å¼"
-#: archive.c:428
+#: archive.c:429
msgid "archive format"
msgstr "归档格å¼"
-#: archive.c:429 builtin/log.c:1229
+#: archive.c:430 builtin/log.c:1229
msgid "prefix"
msgstr "å‰ç¼€"
-#: archive.c:430
+#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中æ¯ä¸ªè·¯å¾„å加上å‰ç¼€"
-#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516
-#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535
+#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99
#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "文件"
-#: archive.c:432 builtin/archive.c:89
+#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:434
+#: archive.c:435
msgid "read .gitattributes in working directory"
msgstr "读å–工作区中的 .gitattributes"
-#: archive.c:435
+#: archive.c:436
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:436
+#: archive.c:437
msgid "store only"
msgstr "åªå­˜å‚¨"
-#: archive.c:437
+#: archive.c:438
msgid "compress faster"
msgstr "压缩速度更快"
-#: archive.c:445
+#: archive.c:446
msgid "compress better"
msgstr "压缩效果更好"
-#: archive.c:448
+#: archive.c:449
msgid "list supported archive formats"
msgstr "列出支æŒçš„归档格å¼"
-#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr "仓库"
-#: archive.c:451 builtin/archive.c:91
+#: archive.c:452 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库(<仓库>)æå–归档文件"
-#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr "命令"
-#: archive.c:453 builtin/archive.c:93
+#: archive.c:454 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
@@ -268,81 +269,81 @@ msgstr ""
"负值模版在 git attributes 中被忽略\n"
"当字符串确实è¦ä»¥æ„Ÿå¹å·å¼€å§‹æ—¶ï¼Œä½¿ç”¨ '\\!'。"
-#: branch.c:60
+#: branch.c:61
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "未设置分支 %s 作为它自己的上游。"
-#: branch.c:83
+#: branch.c:84
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr "分支 %1$s 设置为使用å˜åŸºæ¥è·Ÿè¸ªæ¥è‡ª %3$s 的远程分支 %2$s。"
-#: branch.c:84
+#: branch.c:85
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "分支 %1$s 设置为跟踪æ¥è‡ª %3$s 的远程分支 %2$s。"
-#: branch.c:88
+#: branch.c:89
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr "分支 %s 设置为使用å˜åŸºæ¥è·Ÿè¸ªæœ¬åœ°åˆ†æ”¯ %s。"
-#: branch.c:89
+#: branch.c:90
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "分支 %s 设置为跟踪本地分支 %s。"
-#: branch.c:94
+#: branch.c:95
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr "分支 %s 设置为使用å˜åŸºæ¥è·Ÿè¸ªè¿œç¨‹å¼•ç”¨ %s。"
-#: branch.c:95
+#: branch.c:96
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "分支 %s 设置为跟踪远程引用 %s。"
-#: branch.c:99
+#: branch.c:100
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr "分支 %s 设置为使用å˜åŸºæ¥è·Ÿè¸ªæœ¬åœ°å¼•ç”¨ %s。"
-#: branch.c:100
+#: branch.c:101
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "分支 %s 设置为跟踪本地引用 %s。"
-#: branch.c:133
+#: branch.c:134
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "未跟踪:引用 %s 有歧义"
-#: branch.c:162
+#: branch.c:163
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„分支å称。"
-#: branch.c:167
+#: branch.c:168
#, c-format
msgid "A branch named '%s' already exists."
msgstr "一个分支å '%s' å·²ç»å­˜åœ¨ã€‚"
-#: branch.c:175
+#: branch.c:176
msgid "Cannot force update the current branch."
msgstr "无法强制更新当å‰åˆ†æ”¯ã€‚"
-#: branch.c:195
+#: branch.c:196
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "无法设置跟踪信æ¯ï¼›èµ·å§‹ç‚¹ '%s' ä¸æ˜¯ä¸€ä¸ªåˆ†æ”¯ã€‚"
-#: branch.c:197
+#: branch.c:198
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' ä¸å­˜åœ¨"
-#: branch.c:199
+#: branch.c:200
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -360,22 +361,22 @@ msgstr ""
"如果您正计划推é€ä¸€ä¸ªèƒ½ä¸Žå¯¹åº”远程分支建立跟踪的新的本地分支,\n"
"您å¯èƒ½éœ€è¦ä½¿ç”¨ \"git push -u\" 推é€åˆ†æ”¯å¹¶é…置和上游的关è”。"
-#: branch.c:243
+#: branch.c:244
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å:'%s'。"
-#: branch.c:263
+#: branch.c:264
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "歧义的对象å:'%s'。"
-#: branch.c:268
+#: branch.c:269
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点:'%s'。"
-#: branch.c:399
+#: branch.c:322
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' å·²ç»æ£€å‡ºåˆ° '%s'"
@@ -390,7 +391,7 @@ msgstr "'%s' ä¸åƒæ˜¯ä¸€ä¸ª v2 版本的包文件"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头:%s%s (%d)"
-#: bundle.c:87 builtin/commit.c:765
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr "ä¸èƒ½æ‰“å¼€ '%s'"
@@ -399,9 +400,9 @@ msgstr "ä¸èƒ½æ‰“å¼€ '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的æ交:"
-#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708
-#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
-#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
+#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
+#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
+#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "版本é历设置失败"
@@ -441,7 +442,7 @@ msgstr "rev-list 终止"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的å‚数:%s"
@@ -459,13 +460,13 @@ msgstr "ä¸èƒ½åˆ›å»º '%s'"
msgid "index-pack died"
msgstr "index-pack 终止"
-#: color.c:260
+#: color.c:275
#, c-format
msgid "invalid color value: %.*s"
msgstr "无效的颜色值:%.*s"
-#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
-#: builtin/am.c:2128
+#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
+#: builtin/am.c:2149
#, c-format
msgid "could not parse %s"
msgstr "ä¸èƒ½è§£æž %s"
@@ -624,23 +625,23 @@ msgid "Performing inexact rename detection"
msgstr "正在进行éžç²¾ç¡®çš„é‡å‘½å检测"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: diff.c:116
+#: diff.c:115
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " æ— æ³•è§£æž dirstat 截止(cut-off)百分比 '%s'\n"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: diff.c:121
+#: diff.c:120
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat å‚æ•° '%s'\n"
-#: diff.c:216
+#: diff.c:215
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "é…ç½®å˜é‡ 'diff.submodule' 未知的å–值:'%s'"
-#: diff.c:268
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -649,16 +650,16 @@ msgstr ""
"å‘现é…ç½®å˜é‡ 'diff.dirstat' 中的错误:\n"
"%s"
-#: diff.c:2998
+#: diff.c:3000
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出,åœæ­¢åœ¨ %s"
-#: diff.c:3394
+#: diff.c:3396
msgid "--follow requires exactly one pathspec"
msgstr "--follow å‚æ•°åŽåªè·Ÿä¸€ä¸ª pathspec"
-#: diff.c:3557
+#: diff.c:3559
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -667,16 +668,16 @@ msgstr ""
"æ— æ³•è§£æž --dirstat/-X 选项的å‚数:\n"
"%s"
-#: diff.c:3571
+#: diff.c:3573
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "æ— æ³•è§£æž --submodule 选项的å‚数:'%s'"
-#: dir.c:1853
+#: dir.c:1915
msgid "failed to get kernel name and information"
msgstr "无法获得内核å称和信æ¯"
-#: dir.c:1936
+#: dir.c:1998
msgid "Untracked cache is disabled on this system."
msgstr "缓存未跟踪文件在本系统被ç¦ç”¨"
@@ -785,8 +786,8 @@ msgstr "%s:%s - %s"
msgid "failed to read the cache"
msgstr "无法读å–缓存"
-#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:715
+#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
+#: builtin/checkout.c:587 builtin/clone.c:722
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
@@ -804,64 +805,64 @@ msgstr "为路径 '%s' addinfo_cache 失败"
msgid "error building trees"
msgstr "无法创建树"
-#: merge-recursive.c:687
+#: merge-recursive.c:686
#, c-format
msgid "failed to create path '%s'%s"
msgstr "无法创建路径 '%s'%s"
-#: merge-recursive.c:698
+#: merge-recursive.c:697
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为å­ç›®å½•ç•™å‡ºç©ºé—´\n"
-#: merge-recursive.c:712 merge-recursive.c:733
+#: merge-recursive.c:711 merge-recursive.c:732
msgid ": perhaps a D/F conflict?"
msgstr ":å¯èƒ½æ˜¯ä¸€ä¸ªç›®å½•/文件冲çªï¼Ÿ"
-#: merge-recursive.c:723
+#: merge-recursive.c:722
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "æ‹’ç»ä¸¢å¼ƒ '%s' 中的未跟踪文件"
-#: merge-recursive.c:763
+#: merge-recursive.c:762
#, c-format
msgid "cannot read object %s '%s'"
msgstr "ä¸èƒ½è¯»å–对象 %s '%s'"
-#: merge-recursive.c:765
+#: merge-recursive.c:764
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数æ®å¯¹è±¡"
-#: merge-recursive.c:788 builtin/clone.c:364
+#: merge-recursive.c:787 builtin/clone.c:369
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: merge-recursive.c:796
+#: merge-recursive.c:795
#, c-format
msgid "failed to symlink '%s'"
msgstr "无法创建符å·é“¾æŽ¥ '%s'"
-#: merge-recursive.c:799
+#: merge-recursive.c:798
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "ä¸çŸ¥é“å¦‚ä½•å¤„ç† %06o %s '%s'"
-#: merge-recursive.c:937
+#: merge-recursive.c:936
msgid "Failed to execute internal merge"
msgstr "无法执行内部åˆå¹¶"
-#: merge-recursive.c:941
+#: merge-recursive.c:940
#, c-format
msgid "Unable to add %s to database"
msgstr "ä¸èƒ½æ·»åŠ  %s 至对象库"
-#: merge-recursive.c:957
+#: merge-recursive.c:956
msgid "unsupported object type in the tree"
msgstr "在树中有ä¸æ”¯æŒçš„对象类型"
-#: merge-recursive.c:1032 merge-recursive.c:1046
+#: merge-recursive.c:1031 merge-recursive.c:1045
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -870,7 +871,7 @@ msgstr ""
"冲çªï¼ˆ%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
"的版本被ä¿ç•™ã€‚"
-#: merge-recursive.c:1038 merge-recursive.c:1051
+#: merge-recursive.c:1037 merge-recursive.c:1050
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -879,20 +880,20 @@ msgstr ""
"冲çªï¼ˆ%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
"的版本ä¿ç•™äºŽ %8$s 中。"
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "rename"
msgstr "é‡å‘½å"
-#: merge-recursive.c:1092
+#: merge-recursive.c:1091
msgid "renamed"
msgstr "é‡å‘½å"
-#: merge-recursive.c:1148
+#: merge-recursive.c:1147
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为å被添加"
-#: merge-recursive.c:1170
+#: merge-recursive.c:1169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -901,144 +902,144 @@ msgstr ""
"冲çªï¼ˆé‡å‘½å/é‡å‘½å):在分支 \"%3$s\" 中é‡å‘½å \"%1$s\"->\"%2$s\",在分支 "
"\"%6$s\" 中é‡å‘½å \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1174
msgid " (left unresolved)"
msgstr "(留下未解决)"
-#: merge-recursive.c:1229
+#: merge-recursive.c:1228
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"冲çªï¼ˆé‡å‘½å/é‡å‘½å):在 %3$s 中é‡å‘½å %1$s->%2$s,在 %6$s 中é‡å‘½å %4$s->"
"%5$s"
-#: merge-recursive.c:1259
+#: merge-recursive.c:1258
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是é‡å‘½å %s 至 %sï¼Œä»¥åŠ %s 至 %s"
-#: merge-recursive.c:1458
+#: merge-recursive.c:1457
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "冲çªï¼ˆé‡å‘½å/添加):在 %3$s 中é‡å‘½å %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: merge-recursive.c:1468
+#: merge-recursive.c:1467
#, c-format
msgid "Adding merged %s"
msgstr "添加åˆå¹¶åŽçš„ %s"
-#: merge-recursive.c:1473 merge-recursive.c:1671
+#: merge-recursive.c:1472 merge-recursive.c:1674
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为å添加"
-#: merge-recursive.c:1524
+#: merge-recursive.c:1523
#, c-format
msgid "cannot read object %s"
msgstr "ä¸èƒ½è¯»å–对象 %s"
-#: merge-recursive.c:1527
+#: merge-recursive.c:1526
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s ä¸æ˜¯ä¸€ä¸ªæ•°æ®å¯¹è±¡"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:1575
+#: merge-recursive.c:1578
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:1585
+#: merge-recursive.c:1588
msgid "content"
msgstr "内容"
-#: merge-recursive.c:1592
+#: merge-recursive.c:1595
msgid "add/add"
msgstr "添加/添加"
-#: merge-recursive.c:1626
+#: merge-recursive.c:1629
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s(已ç»åšè¿‡ç›¸åŒåˆå¹¶ï¼‰"
-#: merge-recursive.c:1640
+#: merge-recursive.c:1643
#, c-format
msgid "Auto-merging %s"
msgstr "自动åˆå¹¶ %s"
-#: merge-recursive.c:1644 git-submodule.sh:1150
+#: merge-recursive.c:1647 git-submodule.sh:1025
msgid "submodule"
msgstr "å­æ¨¡ç»„"
-#: merge-recursive.c:1645
+#: merge-recursive.c:1648
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲çªï¼ˆ%s):åˆå¹¶å†²çªäºŽ %s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1734
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:1756
+#: merge-recursive.c:1759
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1765
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:1767
+#: merge-recursive.c:1770
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "冲çªï¼ˆ%1$s):在 %3$s 中有一个å为 %2$s 的目录。以 %5$s 为å添加 %4$s"
-#: merge-recursive.c:1777
+#: merge-recursive.c:1780
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:1794
+#: merge-recursive.c:1797
msgid "Fatal merge failure, shouldn't happen."
msgstr "严é‡çš„åˆå¹¶é”™è¯¯ï¼Œä¸åº”å‘生。"
-#: merge-recursive.c:1813
+#: merge-recursive.c:1816
msgid "Already up-to-date!"
msgstr "å·²ç»æ˜¯æœ€æ–°çš„ï¼"
-#: merge-recursive.c:1822
+#: merge-recursive.c:1825
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法åˆå¹¶æ ‘ %s å’Œ %s"
-#: merge-recursive.c:1852
+#: merge-recursive.c:1855
#, c-format
msgid "Unprocessed path??? %s"
msgstr "未处ç†çš„路径??? %s"
-#: merge-recursive.c:1900
+#: merge-recursive.c:1903
msgid "Merging:"
msgstr "åˆå¹¶ï¼š"
-#: merge-recursive.c:1913
+#: merge-recursive.c:1916
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "å‘现 %u 个共åŒç¥–先:"
msgstr[1] "å‘现 %u 个共åŒç¥–先:"
-#: merge-recursive.c:1950
+#: merge-recursive.c:1953
msgid "merge returned no commit"
msgstr "åˆå¹¶æœªè¿”回æ交"
-#: merge-recursive.c:2007
+#: merge-recursive.c:2010
#, c-format
msgid "Could not parse object '%s'"
msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'"
-#: merge-recursive.c:2018 builtin/merge.c:645
+#: merge-recursive.c:2021 builtin/merge.c:645
msgid "Unable to write index."
msgstr "ä¸èƒ½å†™å…¥ç´¢å¼•ã€‚"
@@ -1068,32 +1069,42 @@ msgstr "åçš„ %s 值:'%s'"
msgid "unable to parse object: %s"
msgstr "ä¸èƒ½è§£æžå¯¹è±¡ï¼š%s"
-#: parse-options.c:563
+#: parse-options.c:570
msgid "..."
msgstr "..."
-#: parse-options.c:581
+#: parse-options.c:588
#, c-format
msgid "usage: %s"
msgstr "用法:%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:585
+#: parse-options.c:592
#, c-format
msgid " or: %s"
msgstr " 或:%s"
# 译者:为ä¿è¯åœ¨è¾“出中对é½ï¼Œæ³¨æ„调整å¥ä¸­ç©ºæ ¼ï¼
-#: parse-options.c:588
+#: parse-options.c:595
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:622
+#: parse-options.c:629
msgid "-NUM"
msgstr "-æ•°å­—"
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "éžæ³•çš„对象å '%s'"
+
+#: path.c:752
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "ä¸èƒ½è®¾ç½® %s 为组å¯å†™"
+
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全局的 'glob' å’Œ 'noglob' 路径规格设置ä¸å…¼å®¹"
@@ -1160,11 +1171,11 @@ msgstr ""
msgid "unable to parse --pretty format"
msgstr "ä¸èƒ½è§£æž --pretty æ ¼å¼"
-#: progress.c:236
+#: progress.c:235
msgid "done"
msgstr "完æˆ"
-#: read-cache.c:1296
+#: read-cache.c:1281
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -1173,7 +1184,7 @@ msgstr ""
"设置了 index.version,但是å–值无效。\n"
"使用版本 %i"
-#: read-cache.c:1306
+#: read-cache.c:1291
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1182,118 +1193,163 @@ msgstr ""
"设置了 GIT_INDEX_VERSION,但是å–值无效。\n"
"使用版本 %i"
-#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
#: builtin/merge.c:983
#, c-format
msgid "Could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: refs.c:3001
+#: refs/files-backend.c:2359
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s:%s"
-#: refs.c:3004
+#: refs/files-backend.c:2362
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用:%s"
-#: refs.c:3013
+#: refs/files-backend.c:2371
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
-#: ref-filter.c:660
+#: ref-filter.c:245
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "æ ¼å¼ï¼šä½¿ç”¨äº† %%(end) 元素å´æ²¡æœ‰å®ƒçš„对应元素"
+
+#: ref-filter.c:704
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "è¦ä¸º contents:lines=%s æ供一个正数"
+
+#: ref-filter.c:833
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "期望的格å¼ï¼š%%(color:<color>)"
+
+#: ref-filter.c:835
msgid "unable to parse format"
msgstr "ä¸èƒ½è§£æžæ ¼å¼"
-#: remote.c:792
+#: ref-filter.c:870
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "期望的格å¼ï¼š%%(align:<width>,<position>)"
+
+#: ref-filter.c:893
+#, c-format
+msgid "improper format entered align:%s"
+msgstr "输入了ä¸æ­£ç¡®çš„æ ¼å¼ align:%s"
+
+#: ref-filter.c:898
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "元素 %%(align) 需è¦ä¸€ä¸ªæ­£æ•°çš„宽度"
+
+#: ref-filter.c:1219
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "éžæ³•çš„对象于 '%s'"
+
+#: ref-filter.c:1561
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "æ ¼å¼ï¼šç¼ºå°‘ %%(end) 元素"
+
+#: ref-filter.c:1615
+#, c-format
+msgid "malformed object name %s"
+msgstr "éžæ³•çš„对象å %s"
+
+#: remote.c:756
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "ä¸èƒ½åŒæ—¶èŽ·å– %s å’Œ %s 至 %s"
-#: remote.c:796
+#: remote.c:760
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %sï¼Œè€Œéž %s"
-#: remote.c:800
+#: remote.c:764
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s åŒæ—¶è·Ÿè¸ª %s å’Œ %s"
-#: remote.c:808
+#: remote.c:772
msgid "Internal error"
msgstr "内部错误"
-#: remote.c:1723 remote.c:1766
+#: remote.c:1687 remote.c:1730
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指å‘一个分支"
-#: remote.c:1732
+#: remote.c:1696
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支:'%s'"
-#: remote.c:1735
+#: remote.c:1699
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1741
+#: remote.c:1705
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1756
+#: remote.c:1720
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推é€ç›®æ ‡ '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1771
+#: remote.c:1735
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置è¦æŽ¨é€çš„远程æœåŠ¡å™¨"
-#: remote.c:1782
+#: remote.c:1746
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "å‘ '%s' 推é€å¼•ç”¨è§„æ ¼æœªåŒ…å« '%s'"
-#: remote.c:1795
+#: remote.c:1759
msgid "push has no destination (push.default is 'nothing')"
msgstr "推é€æ— ç›®æ ‡ï¼ˆpush.default 是 'nothing')"
-#: remote.c:1817
+#: remote.c:1781
msgid "cannot resolve 'simple' push to a single destination"
msgstr "æ— æ³•è§£æž 'simple' 推é€è‡³ä¸€ä¸ªå•ç‹¬çš„目标"
-#: remote.c:2124
+#: remote.c:2083
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s',但此上游分支已ç»ä¸å­˜åœ¨ã€‚\n"
-#: remote.c:2128
+#: remote.c:2087
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (使用 \"git branch --unset-upstream\" æ¥ä¿®å¤ï¼‰\n"
-#: remote.c:2131
+#: remote.c:2090
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: remote.c:2135
+#: remote.c:2094
#, 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] "您的分支领先 '%s' å…± %d 个æ交。\n"
msgstr[1] "您的分支领先 '%s' å…± %d 个æ交。\n"
-#: remote.c:2141
+#: remote.c:2100
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (使用 \"git push\" æ¥å‘布您的本地æ交)\n"
-#: remote.c:2144
+#: remote.c:2103
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1302,11 +1358,11 @@ msgstr[0] "您的分支è½åŽ '%s' å…± %d 个æ交,并且å¯ä»¥å¿«è¿›ã€‚\n"
msgstr[1] "您的分支è½åŽ '%s' å…± %d 个æ交,并且å¯ä»¥å¿«è¿›ã€‚\n"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: remote.c:2152
+#: remote.c:2111
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (使用 \"git pull\" æ¥æ›´æ–°æ‚¨çš„本地分支)\n"
-#: remote.c:2155
+#: remote.c:2114
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1322,28 +1378,28 @@ msgstr[1] ""
"并且分别有 %d å’Œ %d 处ä¸åŒçš„æ交。\n"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: remote.c:2165
+#: remote.c:2124
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (使用 \"git pull\" æ¥åˆå¹¶è¿œç¨‹åˆ†æ”¯ï¼‰\n"
-#: revision.c:2198
+#: revision.c:2193
msgid "your current branch appears to be broken"
msgstr "您的当å‰åˆ†æ”¯å¥½åƒè¢«æŸå"
-#: revision.c:2201
+#: revision.c:2196
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当å‰åˆ†æ”¯ '%s' 尚无任何æ交"
-#: revision.c:2395
+#: revision.c:2390
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 与 --bisect ä¸å…¼å®¹"
-#: run-command.c:83
+#: run-command.c:90
msgid "open /dev/null failed"
msgstr "ä¸èƒ½æ‰“å¼€ /dev/null"
-#: run-command.c:85
+#: run-command.c:92
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "ä¸èƒ½è°ƒç”¨ dup2(%d,%d)"
@@ -1558,7 +1614,7 @@ msgstr "ä¸èƒ½è§£æž HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "ä¸èƒ½ä»Žå°šæœªå»ºç«‹çš„分支终止"
-#: sequencer.c:887 builtin/apply.c:4291
+#: sequencer.c:887 builtin/apply.c:4287
#, c-format
msgid "cannot open %s: %s"
msgstr "ä¸èƒ½æ‰“å¼€ %s:%s"
@@ -1600,12 +1656,12 @@ msgstr "ä¸èƒ½ä½œä¸ºåˆå§‹æ交还原"
msgid "Can't cherry-pick into empty head"
msgstr "ä¸èƒ½æ‹£é€‰åˆ°ç©ºåˆ†æ”¯"
-#: setup.c:243
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "æ— æ³•è¯»å– %s"
-#: sha1_name.c:453
+#: sha1_name.c:463
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -1649,7 +1705,7 @@ msgstr "无法移除 %s çš„ .gitmodules æ¡ç›®"
msgid "staging updated .gitmodules failed"
msgstr "å°†æ›´æ–°åŽ .gitmodules 添加暂存区失败"
-#: submodule.c:1045
+#: submodule.c:1040
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "ä¸èƒ½åœ¨ %s 中设置 core.worktree"
@@ -1660,7 +1716,7 @@ msgstr "ä¸èƒ½åœ¨ %s 中设置 core.worktree"
msgid "unknown value '%s' for key '%s'"
msgstr "é”® '%2$s' 的未知å–值 '%1$s'"
-#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:296
#, c-format
msgid "more than one %s"
msgstr "多于一个 %s"
@@ -1727,8 +1783,8 @@ msgstr "无法打开 '%s' 进行读写"
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
-#: builtin/merge.c:1076 builtin/pull.c:380
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
+#: builtin/merge.c:1074 builtin/pull.c:380
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读å–"
@@ -1743,30 +1799,21 @@ msgstr "ä¸èƒ½è®¿é—® '%s':%s"
msgid "unable to access '%s'"
msgstr "ä¸èƒ½è®¿é—® '%s'"
-#: wrapper.c:611
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr "无法在å£ä»¤æ–‡ä»¶ä¸­æŸ¥è¯¢åˆ°å½“å‰ç”¨æˆ·ï¼š%s"
-
-#: wrapper.c:612
-msgid "no such user"
-msgstr "无此用户"
-
-#: wrapper.c:620
+#: wrapper.c:608
msgid "unable to get current working directory"
msgstr "ä¸èƒ½èŽ·å–当å‰å·¥ä½œç›®å½•"
-#: wrapper.c:631
+#: wrapper.c:635
#, c-format
msgid "could not open %s for writing"
msgstr "ä¸èƒ½å†™å…¥ %s"
-#: wrapper.c:642 builtin/am.c:424
+#: wrapper.c:646 builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "ä¸èƒ½å†™å…¥ %s"
-#: wrapper.c:648
+#: wrapper.c:652
#, c-format
msgid "could not close %s"
msgstr "ä¸èƒ½å…³é—­ %s"
@@ -2128,27 +2175,27 @@ msgstr "您在执行二分查找æ“作。"
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
-#: wt-status.c:1437
+#: wt-status.c:1438
msgid "On branch "
msgstr "ä½äºŽåˆ†æ”¯ "
-#: wt-status.c:1445
+#: wt-status.c:1444
msgid "interactive rebase in progress; onto "
msgstr "交互å¼å˜åŸºæ“作正在进行中;至 "
-#: wt-status.c:1447
+#: wt-status.c:1446
msgid "rebase in progress; onto "
msgstr "å˜åŸºæ“作正在进行中;至 "
-#: wt-status.c:1452
+#: wt-status.c:1451
msgid "HEAD detached at "
msgstr "头指针分离于 "
-#: wt-status.c:1454
+#: wt-status.c:1453
msgid "HEAD detached from "
msgstr "头指针分离自 "
-#: wt-status.c:1457
+#: wt-status.c:1456
msgid "Not currently on any branch."
msgstr "当å‰ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šã€‚"
@@ -2233,25 +2280,25 @@ msgstr "无文件è¦æ交(使用 -u 显示未跟踪的文件)\n"
msgid "nothing to commit, working directory clean\n"
msgstr "无文件è¦æ交,干净的工作区\n"
-#: wt-status.c:1644
-msgid "HEAD (no branch)"
-msgstr "HEAD(éžåˆ†æ”¯ï¼‰"
-
# 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼
-#: wt-status.c:1650
+#: wt-status.c:1642
msgid "Initial commit on "
msgstr "åˆå§‹æ交于 "
-#: wt-status.c:1677
+#: wt-status.c:1646
+msgid "HEAD (no branch)"
+msgstr "HEAD(éžåˆ†æ”¯ï¼‰"
+
+#: wt-status.c:1675
msgid "gone"
msgstr "丢失"
# 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼
-#: wt-status.c:1679 wt-status.c:1687
+#: wt-status.c:1677 wt-status.c:1685
msgid "behind "
msgstr "è½åŽ "
-#: compat/precompose_utf8.c:55 builtin/clone.c:403
+#: compat/precompose_utf8.c:56 builtin/clone.c:408
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
@@ -2265,7 +2312,7 @@ msgstr "git add [<选项>] [--] <路径规格>..."
msgid "unexpected diff status %c"
msgstr "æ„å¤–çš„å·®å¼‚çŠ¶æ€ %c"
-#: builtin/add.c:70 builtin/commit.c:277
+#: builtin/add.c:70 builtin/commit.c:278
msgid "updating files failed"
msgstr "更新文件失败"
@@ -2278,7 +2325,7 @@ msgstr "删除 '%s'\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之åŽå°šæœªè¢«æš‚存的å˜æ›´ï¼š"
-#: builtin/add.c:194 builtin/rev-parse.c:799
+#: builtin/add.c:194 builtin/rev-parse.c:796
msgid "Could not read the index"
msgstr "ä¸èƒ½è¯»å–索引"
@@ -2313,15 +2360,15 @@ msgstr "ä¸èƒ½åº”用 '%s'"
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根æ®æ‚¨çš„一个 .gitignore 文件而被忽略:\n"
-#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
-#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
+#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
-#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
-#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
+#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "冗长输出"
@@ -2329,7 +2376,7 @@ msgstr "冗长输出"
msgid "interactive picking"
msgstr "交互å¼æ‹£é€‰"
-#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "交互å¼æŒ‘选数æ®å—"
@@ -2386,145 +2433,145 @@ msgstr "-A 和 -u 选项互斥"
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing åªèƒ½å’Œ --dry-run åŒæ—¶ä½¿ç”¨"
-#: builtin/add.c:358
+#: builtin/add.c:352
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件,也没有文件被添加。\n"
-#: builtin/add.c:359
+#: builtin/add.c:353
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想è¦æ‰§è¡Œ 'git add .'?\n"
-#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
-#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
+#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:40
msgid "index file corrupt"
msgstr "索引文件æŸå"
-#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: builtin/am.c:41
+#: builtin/am.c:42
#, c-format
msgid "could not stat %s"
msgstr "ä¸èƒ½èŽ·å– %s 的文件状æ€"
-#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737
-#: builtin/merge.c:1079
+#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
#, c-format
msgid "could not read '%s'"
msgstr "ä¸èƒ½è¯»å– '%s'"
-#: builtin/am.c:444
+#: builtin/am.c:445
msgid "could not parse author script"
msgstr "ä¸èƒ½è§£æžä½œè€…脚本"
-#: builtin/am.c:521
+#: builtin/am.c:522
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg é’©å­åˆ é™¤"
-#: builtin/am.c:562 builtin/notes.c:300
+#: builtin/am.c:563 builtin/notes.c:300
#, c-format
msgid "Malformed input line: '%s'."
msgstr "éžæ³•çš„输入行:'%s'。"
-#: builtin/am.c:599 builtin/notes.c:315
+#: builtin/am.c:600 builtin/notes.c:315
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' æ‹·è´æ³¨è§£åˆ° '%s' 时失败"
-#: builtin/am.c:625
+#: builtin/am.c:626
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:786 builtin/am.c:874
+#: builtin/am.c:787 builtin/am.c:875
#, c-format
msgid "could not open '%s' for reading: %s"
msgstr "无法打开 '%s' 进行读å–:%s"
-#: builtin/am.c:793
+#: builtin/am.c:794
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "无法打开 '%s' 进行写入:%s"
-#: builtin/am.c:802
+#: builtin/am.c:803
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解æžè¡¥ä¸ '%s'"
-#: builtin/am.c:867
+#: builtin/am.c:868
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次åªèƒ½æœ‰ä¸€ä¸ª StGIT è¡¥ä¸é˜Ÿåˆ—被应用"
-#: builtin/am.c:915
+#: builtin/am.c:916
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:918 builtin/am.c:926
+#: builtin/am.c:919 builtin/am.c:927
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:923
+#: builtin/am.c:924
msgid "invalid timezone offset"
msgstr "无效的时区å移值"
-#: builtin/am.c:1010
+#: builtin/am.c:1011
msgid "Patch format detection failed."
msgstr "è¡¥ä¸æ ¼å¼æ£€æµ‹å¤±è´¥ã€‚"
-#: builtin/am.c:1015 builtin/clone.c:368
+#: builtin/am.c:1016 builtin/clone.c:373
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/am.c:1019
+#: builtin/am.c:1020
msgid "Failed to split patches."
msgstr "无法拆分补ä¸ã€‚"
-#: builtin/am.c:1151 builtin/commit.c:362
+#: builtin/am.c:1152 builtin/commit.c:363
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1202
+#: builtin/am.c:1203
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题,执行 \"%s --continue\"。"
-#: builtin/am.c:1203
+#: builtin/am.c:1204
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想è¦è·³è¿‡è¿™ä¸€è¡¥ä¸ï¼Œåˆ™æ‰§è¡Œ \"%s --skip\"。"
-#: builtin/am.c:1204
+#: builtin/am.c:1205
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "è‹¥è¦å¤åŽŸè‡³åŽŸå§‹åˆ†æ”¯å¹¶åœæ­¢è¡¥ä¸æ“作,执行 \"%s --abort\"。"
-#: builtin/am.c:1339
+#: builtin/am.c:1343
msgid "Patch is empty. Was it split wrong?"
msgstr "è¡¥ä¸ä¸ºç©ºã€‚是ä¸æ˜¯åˆ‡åˆ†é”™è¯¯ï¼Ÿ"
-#: builtin/am.c:1413 builtin/log.c:1345
+#: builtin/am.c:1417 builtin/log.c:1347
#, c-format
msgid "invalid ident line: %s"
msgstr "包å«æ— æ•ˆçš„身份标识:%s"
-#: builtin/am.c:1440
+#: builtin/am.c:1444
#, c-format
msgid "unable to parse commit %s"
msgstr "ä¸èƒ½è§£æžæ交 %s"
-#: builtin/am.c:1614
+#: builtin/am.c:1646
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺ä¹å¿…è¦çš„æ•°æ®å¯¹è±¡ä»¥è¿›è¡Œä¸‰æ–¹åˆå¹¶ã€‚"
-#: builtin/am.c:1616
+#: builtin/am.c:1648
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引æ¥é‡å»ºä¸€ä¸ªï¼ˆä¸‰æ–¹åˆå¹¶çš„)基础目录树..."
-#: builtin/am.c:1635
+#: builtin/am.c:1667
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2532,37 +2579,37 @@ msgstr ""
"您是å¦æ›¾æ‰‹åŠ¨ç¼–辑过您的补ä¸ï¼Ÿ\n"
"无法应用补ä¸åˆ°ç´¢å¼•ä¸­çš„æ•°æ®å¯¹è±¡ä¸Šã€‚"
-#: builtin/am.c:1641
+#: builtin/am.c:1673
msgid "Falling back to patching base and 3-way merge..."
msgstr "回è½åˆ°åŸºç¡€ç‰ˆæœ¬ä¸Šæ‰“è¡¥ä¸åŠè¿›è¡Œä¸‰æ–¹åˆå¹¶..."
-#: builtin/am.c:1666
+#: builtin/am.c:1688
msgid "Failed to merge in the changes."
msgstr "无法åˆå¹¶å˜æ›´ã€‚"
-#: builtin/am.c:1691 builtin/merge.c:632
+#: builtin/am.c:1712 builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"
-#: builtin/am.c:1698
+#: builtin/am.c:1719
msgid "applying to an empty history"
msgstr "正应用到一个空历å²ä¸Š"
-#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829
+#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
#: builtin/merge.c:854
msgid "failed to write commit object"
msgstr "无法写æ交对象"
-#: builtin/am.c:1743 builtin/am.c:1747
+#: builtin/am.c:1764 builtin/am.c:1768
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续:%s ä¸å­˜åœ¨ã€‚"
-#: builtin/am.c:1763
+#: builtin/am.c:1784
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "标准输入没有和终端关è”,ä¸èƒ½è¿›è¡Œäº¤äº’å¼æ“作。"
-#: builtin/am.c:1768
+#: builtin/am.c:1789
msgid "Commit Body is:"
msgstr "æ交内容为:"
@@ -2571,35 +2618,35 @@ msgstr "æ交内容为:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1778
+#: builtin/am.c:1799
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用?是[y]/å¦[n]/编辑[e]/查看补ä¸[v]/应用所有[a]:"
-#: builtin/am.c:1828
+#: builtin/am.c:1849
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "è„索引:ä¸èƒ½åº”用补ä¸ï¼ˆè„文件:%s)"
-#: builtin/am.c:1863 builtin/am.c:1934
+#: builtin/am.c:1884 builtin/am.c:1955
#, c-format
msgid "Applying: %.*s"
msgstr "应用:%.*s"
-#: builtin/am.c:1879
+#: builtin/am.c:1900
msgid "No changes -- Patch already applied."
msgstr "没有å˜æ›´ —— è¡¥ä¸å·²ç»åº”用过。"
-#: builtin/am.c:1887
+#: builtin/am.c:1908
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补ä¸å¤±è´¥äºŽ %s %.*s"
-#: builtin/am.c:1893
+#: builtin/am.c:1914
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "失败的补ä¸æ–‡ä»¶å‰¯æœ¬ä½äºŽï¼š%s"
-#: builtin/am.c:1937
+#: builtin/am.c:1958
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2609,7 +2656,7 @@ msgstr ""
"如果没有什么è¦æ·»åŠ åˆ°æš‚存区的,则很å¯èƒ½æ˜¯å…¶å®ƒæ交已ç»å¼•å…¥äº†ç›¸åŒçš„å˜æ›´ã€‚\n"
"您也许想è¦è·³è¿‡è¿™ä¸ªè¡¥ä¸ã€‚"
-#: builtin/am.c:1944
+#: builtin/am.c:1965
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2617,166 +2664,168 @@ msgstr ""
"您的索引中ä»æœ‰æœªåˆå¹¶çš„路径。\n"
"您是å¦å¿˜äº†æ‰§è¡Œ 'git add'?"
-#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308
+#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'。"
-#: builtin/am.c:2104
+#: builtin/am.c:2125
msgid "failed to clean index"
msgstr "无法清空索引"
-#: builtin/am.c:2138
+#: builtin/am.c:2159
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好åƒåœ¨ä¸Šä¸€æ¬¡ 'am' 失败åŽç§»åŠ¨äº† HEAD。未回退至 ORIG_HEAD"
-#: builtin/am.c:2199
+#: builtin/am.c:2220
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值:%s"
-#: builtin/am.c:2221
-msgid "git am [options] [(<mbox>|<Maildir>)...]"
-msgstr "git am [选项] [(<mbox>|<Maildir>)...]"
+#: builtin/am.c:2253
+msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2222
-msgid "git am [options] (--continue | --skip | --abort)"
-msgstr "git am [选项] (--continue | --skip | --abort)"
+#: builtin/am.c:2254
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2228
+#: builtin/am.c:2260
msgid "run interactively"
msgstr "以交互å¼æ–¹å¼è¿è¡Œ"
-#: builtin/am.c:2230
+#: builtin/am.c:2262
msgid "historical option -- no-op"
msgstr "è€çš„å‚æ•° —— 无作用"
-#: builtin/am.c:2232
+#: builtin/am.c:2264
msgid "allow fall back on 3way merging if needed"
msgstr "如果必è¦ï¼Œå…许使用三方åˆå¹¶ã€‚"
-#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57
+#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "é™é»˜æ¨¡å¼"
-#: builtin/am.c:2235
+#: builtin/am.c:2267
msgid "add a Signed-off-by line to the commit message"
msgstr "在æ交说明中添加一个 Signed-off-by ç­¾å"
-#: builtin/am.c:2238
+#: builtin/am.c:2270
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集(默认)"
-#: builtin/am.c:2240
+#: builtin/am.c:2272
msgid "pass -k flag to git-mailinfo"
msgstr "å‘ git-mailinfo 传递 -k å‚æ•°"
-#: builtin/am.c:2242
+#: builtin/am.c:2274
msgid "pass -b flag to git-mailinfo"
msgstr "å‘ git-mailinfo 传递 -b å‚æ•°"
-#: builtin/am.c:2244
+#: builtin/am.c:2276
msgid "pass -m flag to git-mailinfo"
msgstr "å‘ git-mailinfo 传递 -m å‚æ•°"
-#: builtin/am.c:2246
+#: builtin/am.c:2278
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox æ ¼å¼ï¼Œå‘ git-mailsplit 传递 --keep-cr å‚æ•°"
-#: builtin/am.c:2249
+#: builtin/am.c:2281
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "ä¸å‘ git-mailsplit 传递 --keep-cr å‚数,覆盖 am.keepcr 的设置"
-#: builtin/am.c:2252
+#: builtin/am.c:2284
msgid "strip everything before a scissors line"
msgstr "丢弃è£åˆ‡çº¿å‰çš„所有内容"
-#: builtin/am.c:2253 builtin/apply.c:4563
+#: builtin/am.c:2285 builtin/apply.c:4554
msgid "action"
msgstr "动作"
-#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2281
+#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2313
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2262 builtin/apply.c:4587
+#: builtin/am.c:2294 builtin/apply.c:4578
msgid "root"
msgstr "根目录"
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525
-#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
-#: builtin/pull.c:167
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
+#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167 builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
msgid "path"
msgstr "路径"
-#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
-#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
-#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
-#: parse-options.h:134 parse-options.h:243
+#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2274 builtin/apply.c:4531
+#: builtin/am.c:2306 builtin/apply.c:4522
msgid "num"
msgstr "æ•°å­—"
-#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438
+#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:372
msgid "format"
msgstr "æ ¼å¼"
-#: builtin/am.c:2278
+#: builtin/am.c:2310
msgid "format the patch(es) are in"
msgstr "è¡¥ä¸çš„æ ¼å¼"
-#: builtin/am.c:2284
+#: builtin/am.c:2316
msgid "override error message when patch failure occurs"
msgstr "打补ä¸å¤±è´¥æ—¶æ˜¾ç¤ºçš„错误信æ¯"
-#: builtin/am.c:2286
+#: builtin/am.c:2318
msgid "continue applying patches after resolving a conflict"
msgstr "冲çªè§£å†³åŽç»§ç»­åº”用补ä¸"
-#: builtin/am.c:2289
+#: builtin/am.c:2321
msgid "synonyms for --continue"
msgstr "å’Œ --continue åŒä¹‰"
-#: builtin/am.c:2292
+#: builtin/am.c:2324
msgid "skip the current patch"
msgstr "跳过当å‰è¡¥ä¸"
-#: builtin/am.c:2295
+#: builtin/am.c:2327
msgid "restore the original branch and abort the patching operation."
msgstr "æ¢å¤åŽŸå§‹åˆ†æ”¯å¹¶ç»ˆæ­¢æ‰“è¡¥ä¸æ“作。"
-#: builtin/am.c:2299
+#: builtin/am.c:2331
msgid "lie about committer date"
msgstr "将作者日期作为æ交日期"
-#: builtin/am.c:2301
+#: builtin/am.c:2333
msgid "use current timestamp for author date"
msgstr "用当å‰æ—¶é—´ä½œä¸ºä½œè€…日期"
-#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225
-#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
+#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2304
+#: builtin/am.c:2336
msgid "GPG-sign commits"
msgstr "使用 GPG ç­¾åæ交"
-#: builtin/am.c:2307
+#: builtin/am.c:2339
msgid "(internal use for git-rebase)"
msgstr "(内部使用,用于 git-rebase)"
-#: builtin/am.c:2322
+#: builtin/am.c:2354
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -2784,16 +2833,16 @@ msgstr ""
"å‚æ•° -b/--binary å·²ç»å¾ˆé•¿æ—¶é—´ä¸åšä»»ä½•å®žè´¨æ“作了,并且将被移除。\n"
"请ä¸è¦å†ä½¿ç”¨å®ƒäº†ã€‚"
-#: builtin/am.c:2329
+#: builtin/am.c:2361
msgid "failed to read the index"
msgstr "无法读å–索引"
-#: builtin/am.c:2344
+#: builtin/am.c:2376
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之å‰çš„å˜åŸºç›®å½• %s ä»ç„¶å­˜åœ¨ï¼Œä½†å´æ供了 mbox。"
-#: builtin/am.c:2368
+#: builtin/am.c:2400
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2802,7 +2851,7 @@ msgstr ""
"å‘现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2374
+#: builtin/am.c:2406
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决æ“作未进行,我们ä¸ä¼šç»§ç»­ã€‚"
@@ -2810,62 +2859,62 @@ msgstr "解决æ“作未进行,我们ä¸ä¼šç»§ç»­ã€‚"
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<选项>] [<è¡¥ä¸>...]"
-#: builtin/apply.c:112
+#: builtin/apply.c:111
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "未能识别的空白字符选项 '%s'"
-#: builtin/apply.c:127
+#: builtin/apply.c:126
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
-#: builtin/apply.c:822
+#: builtin/apply.c:818
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "æ— æ³•å‡†å¤‡æ—¶é—´æˆ³æ­£åˆ™è¡¨è¾¾å¼ %s"
-#: builtin/apply.c:831
+#: builtin/apply.c:827
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d,输入为:%s"
-#: builtin/apply.c:912
+#: builtin/apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "ä¸èƒ½åœ¨è¡¥ä¸çš„第 %d 行找到文件å"
-#: builtin/apply.c:944
+#: builtin/apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
-#: builtin/apply.c:948
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上新文件åä¸ä¸€è‡´"
-#: builtin/apply.c:949
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件åä¸ä¸€è‡´"
-#: builtin/apply.c:956
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
-#: builtin/apply.c:1419
+#: builtin/apply.c:1415
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount:æ„外的行:%.*s"
-#: builtin/apply.c:1476
+#: builtin/apply.c:1472
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补ä¸ç‰‡æ®µæ²¡æœ‰å¤´ä¿¡æ¯ï¼š%.*s"
-#: builtin/apply.c:1493
+#: builtin/apply.c:1489
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2876,77 +2925,77 @@ msgid_plural ""
msgstr[0] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行)"
msgstr[1] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行)"
-#: builtin/apply.c:1659
+#: builtin/apply.c:1655
msgid "new file depends on old contents"
msgstr "新文件ä¾èµ–旧内容"
-#: builtin/apply.c:1661
+#: builtin/apply.c:1657
msgid "deleted file still has contents"
msgstr "删除的文件ä»æœ‰å†…容"
-#: builtin/apply.c:1687
+#: builtin/apply.c:1683
#, c-format
msgid "corrupt patch at line %d"
msgstr "è¡¥ä¸åœ¨ç¬¬ %d è¡ŒæŸå"
-#: builtin/apply.c:1723
+#: builtin/apply.c:1719
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s ä¾èµ–旧内容"
-#: builtin/apply.c:1725
+#: builtin/apply.c:1721
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s ä»æœ‰å†…容"
-#: builtin/apply.c:1728
+#: builtin/apply.c:1724
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告:文件 %s æˆä¸ºç©ºæ–‡ä»¶ä½†å¹¶æœªåˆ é™¤"
-#: builtin/apply.c:1874
+#: builtin/apply.c:1870
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补ä¸åœ¨ç¬¬ %d è¡ŒæŸå:%.*s"
-#: builtin/apply.c:1903
+#: builtin/apply.c:1899
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补ä¸ä½äºŽç¬¬ %d è¡Œ"
-#: builtin/apply.c:2054
+#: builtin/apply.c:2050
#, c-format
msgid "patch with only garbage at line %d"
msgstr "è¡¥ä¸æ–‡ä»¶çš„第 %d è¡Œåªæœ‰åžƒåœ¾æ•°æ®"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2140
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读å–符å·é“¾æŽ¥ %s"
-#: builtin/apply.c:2148
+#: builtin/apply.c:2144
#, c-format
msgid "unable to open or read %s"
msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– %s"
-#: builtin/apply.c:2781
+#: builtin/apply.c:2777
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符:'%c'"
-#: builtin/apply.c:2900
+#: builtin/apply.c:2896
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "å— #%d æˆåŠŸåº”用于 %d(å移 %d 行)"
msgstr[1] "å— #%d æˆåŠŸåº”用于 %d(å移 %d 行)"
-#: builtin/apply.c:2912
+#: builtin/apply.c:2908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文å‡å°‘到(%ld/%ld)以在第 %d 行应用补ä¸ç‰‡æ®µ"
-#: builtin/apply.c:2918
+#: builtin/apply.c:2914
#, c-format
msgid ""
"while searching for:\n"
@@ -2955,319 +3004,319 @@ msgstr ""
"当查询:\n"
"%.*s"
-#: builtin/apply.c:2938
+#: builtin/apply.c:2934
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补ä¸æ•°æ®"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3035
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补ä¸æœªåº”用到 '%s'"
-#: builtin/apply.c:3045
+#: builtin/apply.c:3041
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补ä¸äº§ç”Ÿäº†ä¸æ­£ç¡®çš„结果(应为 %s,å´ä¸º %s)"
-#: builtin/apply.c:3066
+#: builtin/apply.c:3062
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补ä¸å¤±è´¥ï¼š%s:%ld"
-#: builtin/apply.c:3190
+#: builtin/apply.c:3186
#, c-format
msgid "cannot checkout %s"
msgstr "ä¸èƒ½æ£€å‡º %s"
-#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
+#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
#, c-format
msgid "read of %s failed"
msgstr "è¯»å– %s 失败"
-#: builtin/apply.c:3243
+#: builtin/apply.c:3239
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读å–ä½äºŽç¬¦å·é“¾æŽ¥ä¸­çš„ '%s'"
-#: builtin/apply.c:3271 builtin/apply.c:3493
+#: builtin/apply.c:3267 builtin/apply.c:3489
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s å·²ç»è¢«é‡å‘½å/删除"
-#: builtin/apply.c:3352 builtin/apply.c:3507
+#: builtin/apply.c:3348 builtin/apply.c:3503
#, c-format
msgid "%s: does not exist in index"
msgstr "%s:ä¸å­˜åœ¨äºŽç´¢å¼•ä¸­"
-#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
+#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
#, c-format
msgid "%s: %s"
msgstr "%s:%s"
-#: builtin/apply.c:3361 builtin/apply.c:3515
+#: builtin/apply.c:3357 builtin/apply.c:3511
#, c-format
msgid "%s: does not match index"
msgstr "%s:和索引ä¸åŒ¹é…"
-#: builtin/apply.c:3463
+#: builtin/apply.c:3459
msgid "removal patch leaves file contents"
msgstr "移除补ä¸ä»ç•™ä¸‹äº†æ–‡ä»¶å†…容"
-#: builtin/apply.c:3532
+#: builtin/apply.c:3528
#, c-format
msgid "%s: wrong type"
msgstr "%s:错误类型"
-#: builtin/apply.c:3534
+#: builtin/apply.c:3530
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o,应为 %o"
-#: builtin/apply.c:3693 builtin/apply.c:3695
+#: builtin/apply.c:3689 builtin/apply.c:3691
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: builtin/apply.c:3750
+#: builtin/apply.c:3746
#, c-format
msgid "%s: already exists in index"
msgstr "%s:已ç»å­˜åœ¨äºŽç´¢å¼•ä¸­"
-#: builtin/apply.c:3753
+#: builtin/apply.c:3749
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s:已ç»å­˜åœ¨äºŽå·¥ä½œåŒºä¸­"
-#: builtin/apply.c:3773
+#: builtin/apply.c:3769
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模å¼ï¼ˆ%1$o)和旧模å¼ï¼ˆ%3$o)ä¸åŒ¹é…"
-#: builtin/apply.c:3778
+#: builtin/apply.c:3774
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模å¼ï¼ˆ%1$o)和 %4$s 的旧模å¼ï¼ˆ%3$o)ä¸åŒ¹é…"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3794
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "å—å½±å“的文件 '%s' ä½äºŽç¬¦å·é“¾æŽ¥ä¸­"
-#: builtin/apply.c:3802
+#: builtin/apply.c:3798
#, c-format
msgid "%s: patch does not apply"
msgstr "%s:补ä¸æœªåº”用"
-#: builtin/apply.c:3816
+#: builtin/apply.c:3812
#, c-format
msgid "Checking patch %s..."
msgstr "æ£€æŸ¥è¡¥ä¸ %s..."
-#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
+#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' çš„ make_cache_entry æ“作失败"
-#: builtin/apply.c:4052
+#: builtin/apply.c:4048
#, c-format
msgid "unable to remove %s from index"
msgstr "ä¸èƒ½ä»Žç´¢å¼•ä¸­ç§»é™¤ %s"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4077
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "å­æ¨¡ç»„ %s æŸåçš„è¡¥ä¸"
-#: builtin/apply.c:4085
+#: builtin/apply.c:4081
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "ä¸èƒ½æžšä¸¾æ–°å»ºæ–‡ä»¶ '%s' 的状æ€"
-#: builtin/apply.c:4090
+#: builtin/apply.c:4086
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "ä¸èƒ½ä¸ºæ–°å»ºæ–‡ä»¶ %s 创建åŽç«¯å­˜å‚¨"
-#: builtin/apply.c:4093 builtin/apply.c:4201
+#: builtin/apply.c:4089 builtin/apply.c:4197
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存æ¡ç›®"
-#: builtin/apply.c:4126
+#: builtin/apply.c:4122
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: builtin/apply.c:4175
+#: builtin/apply.c:4171
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "ä¸èƒ½å†™æ–‡ä»¶ '%s' æƒé™ %o"
-#: builtin/apply.c:4262
+#: builtin/apply.c:4258
#, c-format
msgid "Applied patch %s cleanly."
msgstr "æˆåŠŸåº”ç”¨è¡¥ä¸ %s。"
-#: builtin/apply.c:4270
+#: builtin/apply.c:4266
msgid "internal error"
msgstr "内部错误"
-#: builtin/apply.c:4273
+#: builtin/apply.c:4269
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补ä¸ï¼Œå…¶ä¸­ %d 个被拒ç»..."
msgstr[1] "应用 %%s 个补ä¸ï¼Œå…¶ä¸­ %d 个被拒ç»..."
-#: builtin/apply.c:4283
+#: builtin/apply.c:4279
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件å为 %.*s.rej"
-#: builtin/apply.c:4304
+#: builtin/apply.c:4300
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段æˆåŠŸåº”用。"
-#: builtin/apply.c:4307
+#: builtin/apply.c:4303
#, c-format
msgid "Rejected hunk #%d."
msgstr "æ‹’ç»ç¬¬ #%d 个片段。"
-#: builtin/apply.c:4397
+#: builtin/apply.c:4393
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4404
msgid "unable to read index file"
msgstr "无法读å–索引文件"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4517
msgid "don't apply changes matching the given path"
msgstr "ä¸è¦åº”用与给出路径å‘匹é…çš„å˜æ›´"
-#: builtin/apply.c:4529
+#: builtin/apply.c:4520
msgid "apply changes matching the given path"
msgstr "应用与给出路径å‘匹é…çš„å˜æ›´"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4523
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数é‡çš„å‰å¯¼æ–œçº¿"
-#: builtin/apply.c:4535
+#: builtin/apply.c:4526
msgid "ignore additions made by the patch"
msgstr "忽略补ä¸ä¸­çš„添加的文件"
-#: builtin/apply.c:4537
+#: builtin/apply.c:4528
msgid "instead of applying the patch, output diffstat for the input"
msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的差异统计(diffstat)"
-#: builtin/apply.c:4541
+#: builtin/apply.c:4532
msgid "show number of added and deleted lines in decimal notation"
msgstr "以å进制数显示添加和删除的行数"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4534
msgid "instead of applying the patch, output a summary for the input"
msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的概è¦"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4536
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æŸ¥çœ‹è¡¥ä¸æ˜¯å¦å¯åº”用"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4538
msgid "make sure the patch is applicable to the current index"
msgstr "确认补ä¸å¯ä»¥åº”用到当å‰ç´¢å¼•"
-#: builtin/apply.c:4549
+#: builtin/apply.c:4540
msgid "apply a patch without touching the working tree"
msgstr "应用补ä¸è€Œä¸ä¿®æ”¹å·¥ä½œåŒº"
-#: builtin/apply.c:4551
+#: builtin/apply.c:4542
msgid "accept a patch that touches outside the working area"
msgstr "接å—修改工作区之外文件的补ä¸"
-#: builtin/apply.c:4553
+#: builtin/apply.c:4544
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补ä¸ï¼ˆä¸Ž --stat/--summary/--check 选项åŒæ—¶ä½¿ç”¨ï¼‰"
-#: builtin/apply.c:4555
+#: builtin/apply.c:4546
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补ä¸ä¸èƒ½åº”用则å°è¯•ä¸‰æ–¹åˆå¹¶"
-#: builtin/apply.c:4557
+#: builtin/apply.c:4548
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信æ¯"
-#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4553
msgid "ensure at least <n> lines of context match"
msgstr "ç¡®ä¿è‡³å°‘åŒ¹é… <n> 行上下文"
-#: builtin/apply.c:4564
+#: builtin/apply.c:4555
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: builtin/apply.c:4567 builtin/apply.c:4570
+#: builtin/apply.c:4558 builtin/apply.c:4561
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的å˜æ›´"
-#: builtin/apply.c:4573
+#: builtin/apply.c:4564
msgid "apply the patch in reverse"
msgstr "åå‘应用补ä¸"
-#: builtin/apply.c:4575
+#: builtin/apply.c:4566
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: builtin/apply.c:4577
+#: builtin/apply.c:4568
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒ç»çš„è¡¥ä¸ç‰‡æ®µä¿å­˜åœ¨å¯¹åº”çš„ *.rej 文件中"
-#: builtin/apply.c:4579
+#: builtin/apply.c:4570
msgid "allow overlapping hunks"
msgstr "å…许é‡å çš„è¡¥ä¸ç‰‡æ®µ"
-#: builtin/apply.c:4582
+#: builtin/apply.c:4573
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "å…许ä¸æ­£ç¡®çš„文件末尾æ¢è¡Œç¬¦"
-#: builtin/apply.c:4585
+#: builtin/apply.c:4576
msgid "do not trust the line counts in the hunk headers"
msgstr "ä¸ä¿¡ä»»è¡¥ä¸ç‰‡æ®µçš„头信æ¯ä¸­çš„è¡Œå·"
-#: builtin/apply.c:4588
+#: builtin/apply.c:4579
msgid "prepend <root> to all filenames"
msgstr "为所有文件åå‰æ·»åŠ  <根目录>"
-#: builtin/apply.c:4610
+#: builtin/apply.c:4601
msgid "--3way outside a repository"
msgstr "--3way 在一个仓库之外"
-#: builtin/apply.c:4618
+#: builtin/apply.c:4609
msgid "--index outside a repository"
msgstr "--index 在一个仓库之外"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4612
msgid "--cached outside a repository"
msgstr "--cached 在一个仓库之外"
-#: builtin/apply.c:4640
+#: builtin/apply.c:4631
#, c-format
msgid "can't open patch '%s'"
msgstr "ä¸èƒ½æ‰“å¼€è¡¥ä¸ '%s'"
-#: builtin/apply.c:4654
+#: builtin/apply.c:4645
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下ä»æœ‰ %d 个空白字符误用"
msgstr[1] "抑制下ä»æœ‰ %d 个空白字符误用"
-#: builtin/apply.c:4660 builtin/apply.c:4670
+#: builtin/apply.c:4651 builtin/apply.c:4661
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3329,95 +3378,95 @@ msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:2500
+#: builtin/blame.c:2519
msgid "Show blame entries as we find them, incrementally"
msgstr "增é‡å¼åœ°æ˜¾ç¤ºå‘现的 blame æ¡ç›®"
-#: builtin/blame.c:2501
+#: builtin/blame.c:2520
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界æ交显示空的 SHA-1(默认:关闭)"
-#: builtin/blame.c:2502
+#: builtin/blame.c:2521
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "ä¸æŠŠæ ¹æ交作为边界(默认:关闭)"
-#: builtin/blame.c:2503
+#: builtin/blame.c:2522
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:2504
+#: builtin/blame.c:2523
msgid "Show output score for blame entries"
msgstr "显示判断 blame æ¡ç›®ä½ç§»çš„得分诊断信æ¯"
-#: builtin/blame.c:2505
+#: builtin/blame.c:2524
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件å(默认:自动)"
-#: builtin/blame.c:2506
+#: builtin/blame.c:2525
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行å·ï¼ˆé»˜è®¤ï¼šå…³é—­ï¼‰"
-#: builtin/blame.c:2507
+#: builtin/blame.c:2526
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适åˆæœºå™¨è¯»å–çš„æ ¼å¼"
-#: builtin/blame.c:2508
+#: builtin/blame.c:2527
msgid "Show porcelain format with per-line commit information"
msgstr "为æ¯ä¸€è¡Œæ˜¾ç¤ºæœºå™¨é€‚用的æ交信æ¯"
-#: builtin/blame.c:2509
+#: builtin/blame.c:2528
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相åŒçš„输出模å¼ï¼ˆé»˜è®¤ï¼šå…³é—­ï¼‰"
-#: builtin/blame.c:2510
+#: builtin/blame.c:2529
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳(默认:关闭)"
-#: builtin/blame.c:2511
+#: builtin/blame.c:2530
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 æ交å·ï¼ˆé»˜è®¤ï¼šå…³é—­ï¼‰"
-#: builtin/blame.c:2512
+#: builtin/blame.c:2531
msgid "Suppress author name and timestamp (Default: off)"
msgstr "éšè—作者å字和时间戳(默认:关闭)"
-#: builtin/blame.c:2513
+#: builtin/blame.c:2532
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而ä¸æ˜¯å字(默认:关闭)"
-#: builtin/blame.c:2514
+#: builtin/blame.c:2533
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:2515
+#: builtin/blame.c:2534
msgid "Spend extra cycles to find better match"
msgstr "花费é¢å¤–的循环æ¥æ‰¾åˆ°æ›´å¥½çš„匹é…"
-#: builtin/blame.c:2516
+#: builtin/blame.c:2535
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用æ¥è‡ª <文件> 的修订集而ä¸æ˜¯è°ƒç”¨ git-rev-list"
-#: builtin/blame.c:2517
+#: builtin/blame.c:2536
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
-#: builtin/blame.c:2518 builtin/blame.c:2519
+#: builtin/blame.c:2537 builtin/blame.c:2538
msgid "score"
msgstr "得分"
-#: builtin/blame.c:2518
+#: builtin/blame.c:2537
msgid "Find line copies within and across files"
msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行拷è´"
-#: builtin/blame.c:2519
+#: builtin/blame.c:2538
msgid "Find line movements within and across files"
msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行移动"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2539
msgid "Process only line range n,m, counting from 1"
msgstr "åªå¤„ç†è¡ŒèŒƒå›´åœ¨ n å’Œ m 之间的,从 1 开始"
@@ -3427,28 +3476,32 @@ msgstr "åªå¤„ç†è¡ŒèŒƒå›´åœ¨ n å’Œ m 之间的,从 1 开始"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2601
+#: builtin/blame.c:2620
msgid "4 years, 11 months ago"
msgstr "4 å¹´ 11 个月å‰"
-#: builtin/branch.c:24
+#: builtin/branch.c:25
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<选项>] [-l] [-f] <分支å> [<起始点>]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<选项>] [-r] (-d | -D) <分支å>..."
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<选项>] [-r | -a] [--points-at]"
+
# 译者:ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让字符串å˜é•¿
-#: builtin/branch.c:150
+#: builtin/branch.c:142
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3458,7 +3511,7 @@ msgstr ""
" '%s',但未åˆå¹¶åˆ° HEAD。"
# 译者:ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让字符串å˜é•¿
-#: builtin/branch.c:154
+#: builtin/branch.c:146
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3467,12 +3520,12 @@ msgstr ""
"并未删除分支 '%s', 虽然它已ç»åˆå¹¶åˆ° HEAD,\n"
" 然而å´å°šæœªè¢«åˆå¹¶åˆ°åˆ†æ”¯ '%s' 。"
-#: builtin/branch.c:168
+#: builtin/branch.c:160
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指å‘çš„æ交对象"
-#: builtin/branch.c:172
+#: builtin/branch.c:164
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3481,343 +3534,335 @@ msgstr ""
"分支 '%s' 没有完全åˆå¹¶ã€‚\n"
"如果您确认è¦åˆ é™¤å®ƒï¼Œæ‰§è¡Œ 'git branch -D %s'。"
-#: builtin/branch.c:185
+#: builtin/branch.c:177
msgid "Update of config-file failed"
msgstr "无法更新 config 文件"
-#: builtin/branch.c:213
+#: builtin/branch.c:205
msgid "cannot use -a with -d"
msgstr "ä¸èƒ½å°† -a å’Œ -d åŒæ—¶ä½¿ç”¨"
-#: builtin/branch.c:219
+#: builtin/branch.c:211
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指å‘çš„æ交对象"
-#: builtin/branch.c:227
+#: builtin/branch.c:219
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "无法删除您当å‰æ‰€åœ¨çš„分支 '%s'。"
-#: builtin/branch.c:243
+#: builtin/branch.c:235
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/branch.c:244
+#: builtin/branch.c:236
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未å‘现。"
-#: builtin/branch.c:259
+#: builtin/branch.c:251
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "无法删除远程跟踪分支 '%s'"
-#: builtin/branch.c:260
+#: builtin/branch.c:252
#, c-format
msgid "Error deleting branch '%s'"
msgstr "无法删除分支 '%s'"
-#: builtin/branch.c:267
+#: builtin/branch.c:259
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
-#: builtin/branch.c:268
+#: builtin/branch.c:260
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s(曾为 %s)。\n"
-#: builtin/branch.c:369
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr "分支 '%s' 未指å‘一个æ交"
-
-#: builtin/branch.c:452
+#: builtin/branch.c:303
#, c-format
msgid "[%s: gone]"
msgstr "[%s: 丢失]"
-#: builtin/branch.c:457
+#: builtin/branch.c:308
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:462
+#: builtin/branch.c:313
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s:è½åŽ %d]"
-#: builtin/branch.c:464
+#: builtin/branch.c:315
#, c-format
msgid "[behind %d]"
msgstr "[è½åŽ %d]"
-#: builtin/branch.c:468
+#: builtin/branch.c:319
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s:领先 %d]"
-#: builtin/branch.c:470
+#: builtin/branch.c:321
#, c-format
msgid "[ahead %d]"
msgstr "[领先 %d]"
-#: builtin/branch.c:473
+#: builtin/branch.c:324
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s:领先 %d,è½åŽ %d]"
-#: builtin/branch.c:476
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[领先 %d,è½åŽ %d]"
-#: builtin/branch.c:489
+#: builtin/branch.c:340
msgid " **** invalid ref ****"
msgstr " **** 无效引用 ****"
-#: builtin/branch.c:580
+#: builtin/branch.c:366
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(éžåˆ†æ”¯ï¼Œæ­£å˜åŸº %s)"
-#: builtin/branch.c:583
+#: builtin/branch.c:369
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(éžåˆ†æ”¯ï¼ŒäºŒåˆ†æŸ¥æ‰¾å¼€å§‹äºŽ %s)"
-#: builtin/branch.c:589
+#: builtin/branch.c:375
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(头指针分离于 %s)"
-#: builtin/branch.c:592
+#: builtin/branch.c:378
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(头指针分离自 %s)"
-#: builtin/branch.c:596
+#: builtin/branch.c:382
msgid "(no branch)"
msgstr "(éžåˆ†æ”¯ï¼‰"
-#: builtin/branch.c:643
-#, c-format
-msgid "object '%s' does not point to a commit"
-msgstr "对象 '%s' 没有指å‘一个æ交"
-
-#: builtin/branch.c:691
-msgid "some refs could not be read"
-msgstr "一些引用ä¸èƒ½è¯»å–"
-
-#: builtin/branch.c:704
+#: builtin/branch.c:524
msgid "cannot rename the current branch while not on any."
msgstr "无法é‡å‘½å当å‰åˆ†æ”¯å› ä¸ºä¸å¤„于任何分支上。"
-#: builtin/branch.c:714
+#: builtin/branch.c:534
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支å:'%s'"
-#: builtin/branch.c:729
+#: builtin/branch.c:549
msgid "Branch rename failed"
msgstr "分支é‡å‘½å失败"
-#: builtin/branch.c:733
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "é‡å‘½å掉一个错误命å的旧分支 '%s'"
-#: builtin/branch.c:737
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支é‡å‘½å为 %s,但 HEAD 没有更新ï¼"
-#: builtin/branch.c:744
+#: builtin/branch.c:564
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被é‡å‘½å,但更新 config 文件失败"
-#: builtin/branch.c:759
-#, c-format
-msgid "malformed object name %s"
-msgstr "éžæ³•çš„对象å %s"
-
-#: builtin/branch.c:781
+#: builtin/branch.c:587
#, c-format
msgid "could not write branch description template: %s"
msgstr "ä¸èƒ½å†™åˆ†æ”¯æ述模版:%s"
-#: builtin/branch.c:811
+#: builtin/branch.c:616
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:813
+#: builtin/branch.c:618
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题,若å‚数出现两次则显示上游分支"
-#: builtin/branch.c:814
+#: builtin/branch.c:619
msgid "suppress informational messages"
msgstr "ä¸æ˜¾ç¤ºä¿¡æ¯"
-#: builtin/branch.c:815
+#: builtin/branch.c:620
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模å¼ï¼ˆå‚è§ git-pull(1))"
-#: builtin/branch.c:817
+#: builtin/branch.c:622
msgid "change upstream info"
msgstr "改å˜ä¸Šæ¸¸ä¿¡æ¯"
-#: builtin/branch.c:821
+#: builtin/branch.c:626
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:822
+#: builtin/branch.c:627
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
-#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
-#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
-#: builtin/tag.c:624
-msgid "commit"
-msgstr "æ交"
-
-#: builtin/branch.c:826 builtin/branch.c:832
+#: builtin/branch.c:629 builtin/branch.c:630
msgid "print only branches that contain the commit"
msgstr "åªæ‰“å°åŒ…å«è¯¥æ交的分支"
-#: builtin/branch.c:838
+#: builtin/branch.c:633
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作:"
-#: builtin/branch.c:839
+#: builtin/branch.c:634
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪åŠæœ¬åœ°åˆ†æ”¯"
-#: builtin/branch.c:841
+#: builtin/branch.c:636
msgid "delete fully merged branch"
msgstr "删除完全åˆå¹¶çš„分支"
-#: builtin/branch.c:842
+#: builtin/branch.c:637
msgid "delete branch (even if not merged)"
msgstr "删除分支(å³ä½¿æ²¡æœ‰åˆå¹¶ï¼‰"
-#: builtin/branch.c:843
+#: builtin/branch.c:638
msgid "move/rename a branch and its reflog"
msgstr "移动/é‡å‘½å一个分支,以åŠå®ƒçš„引用日志"
-#: builtin/branch.c:844
+#: builtin/branch.c:639
msgid "move/rename a branch, even if target exists"
msgstr "移动/é‡å‘½å一个分支,å³ä½¿ç›®æ ‡å·²å­˜åœ¨"
-#: builtin/branch.c:845
+#: builtin/branch.c:640
msgid "list branch names"
msgstr "列出分支å"
-#: builtin/branch.c:846
+#: builtin/branch.c:641
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:848
+#: builtin/branch.c:643
msgid "edit the description for the branch"
msgstr "标记分支的æè¿°"
-#: builtin/branch.c:849
+#: builtin/branch.c:644
msgid "force creation, move/rename, deletion"
msgstr "强制创建ã€ç§»åŠ¨/é‡å‘½åã€åˆ é™¤"
-#: builtin/branch.c:852
-msgid "print only not merged branches"
-msgstr "åªæ‰“å°æ²¡æœ‰åˆå¹¶çš„分支"
+#: builtin/branch.c:645
+msgid "print only branches that are merged"
+msgstr "åªæ‰“å°å·²ç»åˆå¹¶çš„分支"
-#: builtin/branch.c:858
-msgid "print only merged branches"
-msgstr "åªæ‰“å°åˆå¹¶çš„分支"
+#: builtin/branch.c:646
+msgid "print only branches that are not merged"
+msgstr "åªæ‰“å°å°šæœªåˆå¹¶çš„分支"
-#: builtin/branch.c:862
+#: builtin/branch.c:647
msgid "list branches in columns"
msgstr "以列的方å¼æ˜¾ç¤ºåˆ†æ”¯"
-#: builtin/branch.c:875
+#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+msgid "key"
+msgstr "key"
+
+#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+msgid "field name to sort on"
+msgstr "排åºçš„字段å"
+
+#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
+#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/tag.c:369
+msgid "object"
+msgstr "对象"
+
+#: builtin/branch.c:652
+msgid "print only branches of the object"
+msgstr "åªæ‰“å°æŒ‡å‘该对象的分支"
+
+#: builtin/branch.c:670
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解æžä¸ºæœ‰æ•ˆå¼•ç”¨ã€‚"
-#: builtin/branch.c:879 builtin/clone.c:690
+#: builtin/branch.c:674 builtin/clone.c:697
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有ä½äºŽ /refs/heads 之下ï¼"
-#: builtin/branch.c:901
+#: builtin/branch.c:694
msgid "--column and --verbose are incompatible"
msgstr "--column å’Œ --verbose ä¸å…¼å®¹"
-#: builtin/branch.c:912 builtin/branch.c:951
+#: builtin/branch.c:705 builtin/branch.c:747
msgid "branch name required"
msgstr "å¿…é¡»æ供分支å"
-#: builtin/branch.c:927
+#: builtin/branch.c:723
msgid "Cannot give description to detached HEAD"
msgstr "ä¸èƒ½å‘分离头指针æä¾›æè¿°"
-#: builtin/branch.c:932
+#: builtin/branch.c:728
msgid "cannot edit description of more than one branch"
msgstr "ä¸èƒ½ä¸ºä¸€ä¸ªä»¥ä¸Šçš„分支编辑æè¿°"
-#: builtin/branch.c:939
+#: builtin/branch.c:735
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' å°šæ— æ交。"
-#: builtin/branch.c:942
+#: builtin/branch.c:738
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:957
+#: builtin/branch.c:753
msgid "too many branches for a rename operation"
msgstr "为é‡å‘½åæ“作æ供了太多的分支å"
-#: builtin/branch.c:962
+#: builtin/branch.c:758
msgid "too many branches to set new upstream"
msgstr "为设置新上游æ供了太多的分支å"
-#: builtin/branch.c:966
+#: builtin/branch.c:762
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指å‘任何分支。"
-#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012
+#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:973
+#: builtin/branch.c:769
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' ä¸å­˜åœ¨"
-#: builtin/branch.c:985
+#: builtin/branch.c:781
msgid "too many branches to unset upstream"
msgstr "为å–消上游设置æ“作æ供了太多的分支å"
-#: builtin/branch.c:989
+#: builtin/branch.c:785
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法å–消 HEAD 的上游设置因为它没有指å‘一个分支"
-#: builtin/branch.c:995
+#: builtin/branch.c:791
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信æ¯"
-#: builtin/branch.c:1009
+#: builtin/branch.c:805
msgid "it does not make sense to create 'HEAD' manually"
msgstr "手工创建 'HEAD' 没有æ„义"
-#: builtin/branch.c:1015
+#: builtin/branch.c:811
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' çš„ -a å’Œ -r 选项带一个分支åå‚数没有æ„义"
-#: builtin/branch.c:1018
+#: builtin/branch.c:814
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3825,7 +3870,7 @@ msgid ""
msgstr ""
"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
-#: builtin/branch.c:1035
+#: builtin/branch.c:831
#, c-format
msgid ""
"\n"
@@ -3836,12 +3881,12 @@ msgstr ""
"如果你想用 '%s' 跟踪 '%s', 这么åšï¼š\n"
"\n"
-#: builtin/branch.c:1036
+#: builtin/branch.c:832
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1037
+#: builtin/branch.c:833
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@ -3868,11 +3913,8 @@ msgstr ""
">|--textconv) <对象>"
#: builtin/cat-file.c:429
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
-"objects>"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
+msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
#: builtin/cat-file.c:466
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -3927,8 +3969,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <属性>...] [--] <路径å>..."
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
-msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@ -3946,7 +3988,7 @@ msgstr "从标准输入读出文件å"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267
+#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "ä¸æ˜¾ç¤ºè¿›åº¦æŠ¥å‘Š"
@@ -4032,6 +4074,8 @@ msgid "write the content to temporary files"
msgstr "将内容写入临时文件"
#: builtin/checkout-index.c:204 builtin/column.c:30
+#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
msgid "string"
msgstr "字符串"
@@ -4051,106 +4095,106 @@ msgstr "git checkout [<选项>] <分支>"
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
-#: builtin/checkout.c:133 builtin/checkout.c:166
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:151
+#: builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必须的版本"
-#: builtin/checkout.c:195
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必须的版本"
-#: builtin/checkout.c:212
+#: builtin/checkout.c:213
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s':无法åˆå¹¶"
-#: builtin/checkout.c:229
+#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加åˆå¹¶ç»“æžœ"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' ä¸èƒ½åœ¨æ›´æ–°è·¯å¾„时使用"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:263 builtin/checkout.c:266
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' ä¸èƒ½å’Œ %s åŒæ—¶ä½¿ç”¨"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:269
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。"
-#: builtin/checkout.c:279 builtin/checkout.c:473
+#: builtin/checkout.c:280 builtin/checkout.c:474
msgid "corrupt index file"
msgstr "æŸå的索引文件"
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未åˆå¹¶"
-#: builtin/checkout.c:495
+#: builtin/checkout.c:496
msgid "you need to resolve your current index first"
msgstr "您需è¦å…ˆè§£å†³å½“å‰ç´¢å¼•çš„冲çª"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:623
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "ä¸èƒ½å¯¹ '%s' 执行 reflog æ“作:%s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:661
msgid "HEAD is now at"
msgstr "HEAD ç›®å‰ä½äºŽ"
-#: builtin/checkout.c:667
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "é‡ç½®åˆ†æ”¯ '%s'\n"
-#: builtin/checkout.c:670
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "å·²ç»ä½äºŽ '%s'\n"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切æ¢å¹¶é‡ç½®åˆ†æ”¯ '%s'\n"
-#: builtin/checkout.c:676 builtin/checkout.c:1065
+#: builtin/checkout.c:677 builtin/checkout.c:1066
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切æ¢åˆ°ä¸€ä¸ªæ–°åˆ†æ”¯ '%s'\n"
-#: builtin/checkout.c:678
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切æ¢åˆ°åˆ†æ”¯ '%s'\n"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/checkout.c:730
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... åŠå…¶å®ƒ %d 个。\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4171,7 +4215,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:755
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4198,144 +4242,150 @@ msgstr[1] ""
" git branch <新分支å> %s\n"
"\n"
-#: builtin/checkout.c:791
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "在版本é历时é‡åˆ°å†…部错误"
-#: builtin/checkout.c:795
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "之å‰çš„ HEAD ä½ç½®æ˜¯"
-#: builtin/checkout.c:822 builtin/checkout.c:1060
+#: builtin/checkout.c:823 builtin/checkout.c:1061
msgid "You are on a branch yet to be born"
msgstr "您ä½äºŽä¸€ä¸ªå°šæœªåˆå§‹åŒ–的分支"
-#: builtin/checkout.c:967
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "åªè¦ä¸€ä¸ªå¼•ç”¨ï¼Œå´ç»™å‡ºäº† %d 个"
-#: builtin/checkout.c:1006 builtin/worktree.c:210
+#: builtin/checkout.c:1007 builtin/worktree.c:213
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用:%s"
-#: builtin/checkout.c:1035
+#: builtin/checkout.c:1036
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用ä¸æ˜¯ä¸€ä¸ªæ ‘:%s"
-#: builtin/checkout.c:1074
+#: builtin/checkout.c:1075
msgid "paths cannot be used with switching branches"
msgstr "路径ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨"
-#: builtin/checkout.c:1077 builtin/checkout.c:1081
+#: builtin/checkout.c:1078 builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨"
-#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
+#: builtin/checkout.c:1097
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ä¸èƒ½å’Œ '%s' åŒæ—¶ä½¿ç”¨"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1102
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "ä¸èƒ½åˆ‡æ¢åˆ†æ”¯åˆ°ä¸€ä¸ªéžæ交 '%s'"
-#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
-#: builtin/worktree.c:319
+#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
+#: builtin/worktree.c:322
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1136
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1138
msgid "create/reset and checkout a branch"
msgstr "创建/é‡ç½®å¹¶æ£€å‡ºä¸€ä¸ªåˆ†æ”¯"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1139
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1140
msgid "detach the HEAD at named commit"
msgstr "æˆä¸ºæŒ‡å‘该æ交的分离头指针"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1141
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信æ¯"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1143
msgid "new unparented branch"
msgstr "新的没有父æ交的分支"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
msgid "checkout our version for unmerged files"
msgstr "对尚未åˆå¹¶çš„文件检出我们的版本"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1146
msgid "checkout their version for unmerged files"
msgstr "对尚未åˆå¹¶çš„文件检出他们的版本"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1148
msgid "force checkout (throw away local modifications)"
msgstr "强制检出(丢弃本地修改)"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1149
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方åˆå¹¶"
-#: builtin/checkout.c:1149 builtin/merge.c:227
+#: builtin/checkout.c:1150 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr "更新忽略的文件(默认)"
-#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
+#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1152
msgid "conflict style (merge or diff3)"
msgstr "冲çªè¾“出风格(merge 或 diff3)"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1155
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径ä¸åšç¨€ç–检出的é™åˆ¶"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1157
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "二次猜测'git checkout <无此分支>'"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1159
msgid "do not check if another worktree is holding the given ref"
msgstr "ä¸æ£€æŸ¥æŒ‡å®šçš„引用是å¦è¢«å…¶ä»–工作区所å ç”¨"
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
+msgstr "强制显示进度报告"
+
+#: builtin/checkout.c:1191
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-bã€-B å’Œ --orphan 是互斥的"
-#: builtin/checkout.c:1198
+#: builtin/checkout.c:1208
msgid "--track needs a branch name"
msgstr "--track 需è¦ä¸€ä¸ªåˆ†æ”¯å"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1213
msgid "Missing branch name; try -b"
msgstr "缺少分支åï¼›å°è¯• -b"
-#: builtin/checkout.c:1239
+#: builtin/checkout.c:1249
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1256
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4344,12 +4394,12 @@ msgstr ""
"ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。\n"
"您是想è¦æ£€å‡º '%s' 但其未能解æžä¸ºæ交么?"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1261
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout:--detach ä¸èƒ½æŽ¥æ”¶è·¯å¾„å‚æ•° '%s'"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1265
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4387,7 +4437,7 @@ msgstr "将忽略仓库 %s\n"
msgid "failed to remove %s"
msgstr "无法删除 %s"
-#: builtin/clean.c:317
+#: builtin/clean.c:315
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -4399,7 +4449,7 @@ msgstr ""
"foo - 通过标题选择一个选项\n"
" - (空)什么也ä¸é€‰æ‹©"
-#: builtin/clean.c:321
+#: builtin/clean.c:319
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -4419,36 +4469,36 @@ msgstr ""
"* - 选择所有选项\n"
" - (空)结æŸé€‰æ‹©"
-#: builtin/clean.c:537
+#: builtin/clean.c:535
#, c-format
msgid "Huh (%s)?"
msgstr "嗯(%s)?"
-#: builtin/clean.c:679
+#: builtin/clean.c:677
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除æ¡ç›®>> "
-#: builtin/clean.c:716
+#: builtin/clean.c:714
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告:无法找到和 %s 匹é…çš„æ¡ç›®"
-#: builtin/clean.c:737
+#: builtin/clean.c:735
msgid "Select items to delete"
msgstr "选择è¦åˆ é™¤çš„æ¡ç›®"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:778
+#: builtin/clean.c:776
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]?"
-#: builtin/clean.c:803
+#: builtin/clean.c:801
msgid "Bye."
msgstr "å†è§ã€‚"
-#: builtin/clean.c:811
+#: builtin/clean.c:809
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -4466,69 +4516,69 @@ msgstr ""
"help - 显示本帮助\n"
"? - 显示如何在æ示符下选择的帮助"
-#: builtin/clean.c:838
+#: builtin/clean.c:836
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: builtin/clean.c:839
+#: builtin/clean.c:837
msgid "What now"
msgstr "请选择"
-#: builtin/clean.c:847
+#: builtin/clean.c:845
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下æ¡ç›®ï¼š"
msgstr[1] "将删除如下æ¡ç›®ï¼š"
-#: builtin/clean.c:864
+#: builtin/clean.c:862
msgid "No more files to clean, exiting."
msgstr "没有è¦æ¸…ç†çš„文件,退出。"
-#: builtin/clean.c:895
+#: builtin/clean.c:893
msgid "do not print names of files removed"
msgstr "ä¸æ‰“å°åˆ é™¤æ–‡ä»¶çš„å称"
-#: builtin/clean.c:897
+#: builtin/clean.c:895
msgid "force"
msgstr "强制"
-#: builtin/clean.c:898
+#: builtin/clean.c:896
msgid "interactive cleaning"
msgstr "交互å¼æ¸…除"
-#: builtin/clean.c:900
+#: builtin/clean.c:898
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
+#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
+#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
msgid "pattern"
msgstr "模å¼"
-#: builtin/clean.c:902
+#: builtin/clean.c:900
msgid "add <pattern> to ignore rules"
msgstr "添加 <模å¼> 到忽略规则"
-#: builtin/clean.c:903
+#: builtin/clean.c:901
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
-#: builtin/clean.c:905
+#: builtin/clean.c:903
msgid "remove only ignored files"
msgstr "åªåˆ é™¤å¿½ç•¥çš„文件"
-#: builtin/clean.c:923
+#: builtin/clean.c:921
msgid "-x and -X cannot be used together"
msgstr "-x å’Œ -X ä¸èƒ½åŒæ—¶ä½¿ç”¨"
-#: builtin/clean.c:927
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
"clean.requireForce 设置为 true 且未æä¾› -iã€-n 或 -f 选项,拒ç»æ‰§è¡Œæ¸…ç†åŠ¨ä½œ"
-#: builtin/clean.c:930
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -4539,16 +4589,11 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
-#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
-msgid "force progress reporting"
-msgstr "强制显示进度报告"
-
#: builtin/clone.c:59
msgid "don't create a checkout"
msgstr "ä¸åˆ›å»ºä¸€ä¸ªæ£€å‡º"
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
msgid "create a bare repository"
msgstr "创建一个纯仓库"
@@ -4572,15 +4617,15 @@ msgstr "设置为共享仓库"
msgid "initialize submodules in the clone"
msgstr "在克隆时åˆå§‹åŒ–å­æ¨¡ç»„"
-#: builtin/clone.c:75 builtin/init-db.c:501
+#: builtin/clone.c:75 builtin/init-db.c:466
msgid "template-directory"
msgstr "模æ¿ç›®å½•"
-#: builtin/clone.c:76 builtin/init-db.c:502
+#: builtin/clone.c:76 builtin/init-db.c:467
msgid "directory from which templates will be used"
msgstr "模æ¿ç›®å½•å°†è¢«ä½¿ç”¨"
-#: builtin/clone.c:78
+#: builtin/clone.c:78 builtin/submodule--helper.c:179
msgid "reference repository"
msgstr "å‚考仓库"
@@ -4604,7 +4649,7 @@ msgstr "检出 <分支> 而ä¸æ˜¯è¿œç¨‹ HEAD"
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
#: builtin/pull.c:186
msgid "depth"
msgstr "深度"
@@ -4617,11 +4662,11 @@ msgstr "创建一个指定深度的浅克隆"
msgid "clone only one branch, HEAD or --branch"
msgstr "åªå…‹éš†ä¸€ä¸ªåˆ†æ”¯ã€HEAD 或 --branch"
-#: builtin/clone.c:91 builtin/init-db.c:510
+#: builtin/clone.c:91 builtin/init-db.c:475
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:92 builtin/init-db.c:511
+#: builtin/clone.c:92 builtin/init-db.c:476
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
@@ -4633,52 +4678,57 @@ msgstr "key=value"
msgid "set config inside the new repository"
msgstr "在新仓库中设置é…置信æ¯"
-#: builtin/clone.c:298
+#: builtin/clone.c:300
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "å°šä¸æ”¯æŒå°†å‚考仓库 '%s' 作为一个链接检出。"
+
+#: builtin/clone.c:302
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "å‚考仓库 '%s' ä¸æ˜¯ä¸€ä¸ªæœ¬åœ°ä»“库。"
-#: builtin/clone.c:302
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "å‚考仓库 '%s' 是一个浅克隆"
-#: builtin/clone.c:305
+#: builtin/clone.c:310
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "å‚考仓库 '%s' 已被å«æŽ¥"
-#: builtin/clone.c:370 builtin/diff.c:84
+#: builtin/clone.c:375 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "无法枚举 '%s' 状æ€"
-#: builtin/clone.c:372
+#: builtin/clone.c:377
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且ä¸æ˜¯ä¸€ä¸ªç›®å½•"
-#: builtin/clone.c:386
+#: builtin/clone.c:391
#, c-format
msgid "failed to stat %s\n"
msgstr "无法枚举 %s 状æ€\n"
-#: builtin/clone.c:408
+#: builtin/clone.c:413
#, c-format
msgid "failed to create link '%s'"
msgstr "无法创建链接 '%s'"
-#: builtin/clone.c:412
+#: builtin/clone.c:417
#, c-format
msgid "failed to copy file to '%s'"
msgstr "无法拷è´æ–‡ä»¶è‡³ '%s'"
-#: builtin/clone.c:435 builtin/clone.c:619
+#: builtin/clone.c:442 builtin/clone.c:626
#, c-format
msgid "done.\n"
msgstr "完æˆã€‚\n"
-#: builtin/clone.c:447
+#: builtin/clone.c:454
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4688,121 +4738,117 @@ msgstr ""
"您å¯ä»¥é€šè¿‡ 'git status' 检查哪些已被检出,然åŽä½¿ç”¨å‘½ä»¤\n"
"'git checkout -f HEAD' é‡è¯•\n"
-#: builtin/clone.c:524
+#: builtin/clone.c:531
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "ä¸èƒ½å‘现è¦å…‹éš†çš„远程分支 %s。"
-#: builtin/clone.c:614
+#: builtin/clone.c:621
#, c-format
msgid "Checking connectivity... "
msgstr "检查连接... "
-#: builtin/clone.c:617
+#: builtin/clone.c:624
msgid "remote did not send all necessary objects"
msgstr "远程没有å‘é€æ‰€æœ‰å¿…须的对象"
-#: builtin/clone.c:681
+#: builtin/clone.c:688
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指å‘一个ä¸å­˜åœ¨çš„引用,无法检出。\n"
-#: builtin/clone.c:712
+#: builtin/clone.c:719
msgid "unable to checkout working tree"
msgstr "ä¸èƒ½æ£€å‡ºå·¥ä½œåŒº"
-#: builtin/clone.c:799
+#: builtin/clone.c:808
msgid "cannot repack to clean up"
msgstr "无法执行 repack æ¥æ¸…ç†"
-#: builtin/clone.c:801
+#: builtin/clone.c:810
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:831
+#: builtin/clone.c:842
msgid "Too many arguments."
msgstr "太多å‚数。"
-#: builtin/clone.c:835
+#: builtin/clone.c:846
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库æ¥å…‹éš†ã€‚"
-#: builtin/clone.c:846
+#: builtin/clone.c:857
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare å’Œ --origin %s 选项ä¸å…¼å®¹ã€‚"
-#: builtin/clone.c:849
+#: builtin/clone.c:860
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare å’Œ --separate-git-dir 选项ä¸å…¼å®¹ã€‚"
-#: builtin/clone.c:862
+#: builtin/clone.c:873
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' ä¸å­˜åœ¨"
-#: builtin/clone.c:868 builtin/fetch.c:1168
+#: builtin/clone.c:879 builtin/fetch.c:1166
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s ä¸æ˜¯ä¸€ä¸ªæ­£æ•°"
-#: builtin/clone.c:878
+#: builtin/clone.c:889
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' å·²ç»å­˜åœ¨ï¼Œå¹¶ä¸”ä¸æ˜¯ä¸€ä¸ªç©ºç›®å½•ã€‚"
-#: builtin/clone.c:888
+#: builtin/clone.c:899
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' å·²ç»å­˜åœ¨ã€‚"
-#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
-#: builtin/worktree.c:245
+#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
+#: builtin/worktree.c:221 builtin/worktree.c:248
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "ä¸èƒ½ä¸º '%s' 创建先导目录"
-#: builtin/clone.c:906
+#: builtin/clone.c:917
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "ä¸èƒ½åˆ›å»ºå·¥ä½œåŒºç›®å½• '%s'"
-#: builtin/clone.c:924
+#: builtin/clone.c:935
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:926
+#: builtin/clone.c:937
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:951
-msgid "--dissociate given, but there is no --reference"
-msgstr "æ供了å‚æ•° --dissociate,但未æä¾› --reference"
-
-#: builtin/clone.c:968
+#: builtin/clone.c:975
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆被忽略,改为 file:// å议试试。"
-#: builtin/clone.c:971
+#: builtin/clone.c:978
msgid "source repository is shallow, ignoring --local"
msgstr "æºä»“库是浅克隆,忽略 --local"
-#: builtin/clone.c:976
+#: builtin/clone.c:983
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:980
+#: builtin/clone.c:987
#, c-format
msgid "Don't know how to clone %s"
msgstr "ä¸çŸ¥é“如何克隆 %s"
-#: builtin/clone.c:1029 builtin/clone.c:1037
+#: builtin/clone.c:1036 builtin/clone.c:1044
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未å‘现"
-#: builtin/clone.c:1040
+#: builtin/clone.c:1047
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
@@ -4838,15 +4884,15 @@ msgstr "两列之间的填充空间"
msgid "--command must be the first argument"
msgstr "--command 必须是第一个å‚æ•°"
-#: builtin/commit.c:37
+#: builtin/commit.c:38
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<选项>] [--] <路径规格>..."
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<选项>] [--] <路径规格>..."
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4870,7 +4916,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:60
+#: builtin/commit.c:61
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4893,7 +4939,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:72
+#: builtin/commit.c:73
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"
@@ -4902,7 +4948,7 @@ msgstr ""
"您è¦ä¿®è¡¥æœ€è¿‘çš„æ交,但这么åšä¼šè®©å®ƒæˆä¸ºç©ºæ交。您å¯ä»¥é‡å¤æ‚¨çš„命令并带上\n"
"--allow-empty 选项,或者您å¯ç”¨å‘½ä»¤ \"git reset HEAD^\" 整个删除该æ交。\n"
-#: builtin/commit.c:77
+#: builtin/commit.c:78
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -4916,11 +4962,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:84
+#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
msgstr "å¦åˆ™ï¼Œè¯·ä½¿ç”¨å‘½ä»¤ 'git reset'\n"
-#: builtin/commit.c:87
+#: builtin/commit.c:88
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -4936,103 +4982,103 @@ msgstr ""
"然åŽæ‰§è¡Œ \"git cherry-pick --continue\" 继续对其余æ交执行拣选\n"
"æ“作。\n"
-#: builtin/commit.c:304
+#: builtin/commit.c:305
msgid "failed to unpack HEAD tree object"
msgstr "无法解包 HEAD 树对象"
-#: builtin/commit.c:345
+#: builtin/commit.c:346
msgid "unable to create temporary index"
msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶ç´¢å¼•"
-#: builtin/commit.c:351
+#: builtin/commit.c:352
msgid "interactive add failed"
msgstr "交互å¼æ·»åŠ å¤±è´¥"
-#: builtin/commit.c:364
+#: builtin/commit.c:365
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:366
+#: builtin/commit.c:367
msgid "Failed to update main cache tree"
msgstr "ä¸èƒ½æ›´æ–°æ ‘的主缓存"
-#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
+#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:444
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr "在åˆå¹¶è¿‡ç¨‹ä¸­ä¸èƒ½åšéƒ¨åˆ†æ交。"
-#: builtin/commit.c:446
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中ä¸èƒ½åšéƒ¨åˆ†æ交。"
-#: builtin/commit.c:455
+#: builtin/commit.c:456
msgid "cannot read the index"
msgstr "无法读å–索引"
-#: builtin/commit.c:474
+#: builtin/commit.c:475
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:579
+#: builtin/commit.c:580
#, c-format
msgid "commit '%s' lacks author header"
msgstr "æ交 '%s' 缺少作者信æ¯"
-#: builtin/commit.c:581
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "æ交 '%s' 有éžæ³•çš„作者信æ¯"
-#: builtin/commit.c:600
+#: builtin/commit.c:601
msgid "malformed --author parameter"
msgstr "éžæ³•çš„ --author å‚æ•°"
-#: builtin/commit.c:608
+#: builtin/commit.c:609
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格å¼ï¼š%s"
-#: builtin/commit.c:652
+#: builtin/commit.c:653
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "无法选择一个未被当å‰æ交说明使用的注释字符"
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr "ä¸èƒ½æŸ¥è¯¢æ交 %s"
-#: builtin/commit.c:701 builtin/shortlog.c:273
+#: builtin/commit.c:702 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(正从标准输入中读å–日志信æ¯ï¼‰\n"
-#: builtin/commit.c:703
+#: builtin/commit.c:704
msgid "could not read log from standard input"
msgstr "ä¸èƒ½ä»Žæ ‡å‡†è¾“入中读å–日志信æ¯"
-#: builtin/commit.c:707
+#: builtin/commit.c:708
#, c-format
msgid "could not read log file '%s'"
msgstr "ä¸èƒ½è¯»å–日志文件 '%s'"
-#: builtin/commit.c:729
+#: builtin/commit.c:730
msgid "could not read MERGE_MSG"
msgstr "ä¸èƒ½è¯»å– MERGE_MSG"
-#: builtin/commit.c:733
+#: builtin/commit.c:734
msgid "could not read SQUASH_MSG"
msgstr "ä¸èƒ½è¯»å– SQUASH_MSG"
-#: builtin/commit.c:784
+#: builtin/commit.c:785
msgid "could not write commit template"
msgstr "ä¸èƒ½å†™æ交模版"
-#: builtin/commit.c:802
+#: builtin/commit.c:803
#, c-format
msgid ""
"\n"
@@ -5046,7 +5092,7 @@ msgstr ""
"\t%s\n"
"然åŽé‡è¯•ã€‚\n"
-#: builtin/commit.c:807
+#: builtin/commit.c:808
#, c-format
msgid ""
"\n"
@@ -5060,7 +5106,7 @@ msgstr ""
"\t%s\n"
"然åŽé‡è¯•ã€‚\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5069,7 +5115,7 @@ msgstr ""
"请为您的å˜æ›´è¾“å…¥æ交说明。以 '%c' 开始的行将被忽略,而一个空的æ交\n"
"说明将会终止æ交。\n"
-#: builtin/commit.c:827
+#: builtin/commit.c:828
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5080,340 +5126,346 @@ msgstr ""
"也å¯ä»¥åˆ é™¤å®ƒä»¬ã€‚一个空的æ交说明将会终止æ交。\n"
# 译者:为ä¿è¯åœ¨è¾“出中对é½ï¼Œæ³¨æ„调整å¥ä¸­ç©ºæ ¼ï¼
-#: builtin/commit.c:847
+#: builtin/commit.c:848
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者: %.*s <%.*s>"
# 译者:为ä¿è¯åœ¨è¾“出中对é½ï¼Œæ³¨æ„调整å¥ä¸­ç©ºæ ¼ï¼
-#: builtin/commit.c:855
+#: builtin/commit.c:856
#, c-format
msgid "%sDate: %s"
msgstr "%s日期: %s"
# 译者:为ä¿è¯åœ¨è¾“出中对é½ï¼Œæ³¨æ„调整å¥ä¸­ç©ºæ ¼ï¼
-#: builtin/commit.c:862
+#: builtin/commit.c:863
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sæ交者:%.*s <%.*s>"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "Cannot read index"
msgstr "无法读å–索引"
-#: builtin/commit.c:937
+#: builtin/commit.c:938
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:952 builtin/tag.c:495
+#: builtin/commit.c:953 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项æä¾›æ交说明。\n"
-#: builtin/commit.c:1054
+#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' ä¸æ˜¯ 'Name <email>' æ ¼å¼ï¼Œä¸”未能在现有作者中找到匹é…"
-#: builtin/commit.c:1069 builtin/commit.c:1309
+#: builtin/commit.c:1070 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件å‚æ•° '%s'"
-#: builtin/commit.c:1106
+#: builtin/commit.c:1107
msgid "--long and -z are incompatible"
msgstr "--long å’Œ -z 选项ä¸å…¼å®¹"
-#: builtin/commit.c:1136
+#: builtin/commit.c:1137
msgid "Using both --reset-author and --author does not make sense"
msgstr "åŒæ—¶ä½¿ç”¨ --reset-author å’Œ --author 没有æ„义"
-#: builtin/commit.c:1145
+#: builtin/commit.c:1146
msgid "You have nothing to amend."
msgstr "您没有å¯ä¿®è¡¥çš„æ交。"
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个åˆå¹¶è¿‡ç¨‹ä¸­ -- 无法修补æ交。"
-#: builtin/commit.c:1150
+#: builtin/commit.c:1151
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补æ交。"
-#: builtin/commit.c:1153
+#: builtin/commit.c:1154
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash å’Œ --fixup ä¸èƒ½åŒæ—¶ä½¿ç”¨"
-#: builtin/commit.c:1163
+#: builtin/commit.c:1164
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "åªèƒ½ç”¨ä¸€ä¸ª -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "选项 -m ä¸èƒ½å’Œ -c/-C/-F/--fixup åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/commit.c:1173
+#: builtin/commit.c:1174
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author åªèƒ½å’Œ -Cã€-c 或 --amend åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/commit.c:1190
+#: builtin/commit.c:1191
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "åªèƒ½ç”¨ä¸€ä¸ª --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1192
+#: builtin/commit.c:1193
msgid "No paths with --include/--only does not make sense."
msgstr "å‚æ•° --include/--only ä¸è·Ÿè·¯å¾„没有æ„义。"
-#: builtin/commit.c:1194
+#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
msgstr "èªæ˜Ž... 用è„索引修补最åŽä¸€ä¸ªæ交。"
-#: builtin/commit.c:1196
+#: builtin/commit.c:1197
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
-#: builtin/commit.c:1208 builtin/tag.c:730
+#: builtin/commit.c:1209 builtin/tag.c:475
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清ç†æ¨¡å¼ %s"
-#: builtin/commit.c:1213
+#: builtin/commit.c:1214
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项åŒæ—¶ä½¿ç”¨æ²¡æœ‰æ„义。"
-#: builtin/commit.c:1323 builtin/commit.c:1602
+#: builtin/commit.c:1324 builtin/commit.c:1605
msgid "show status concisely"
msgstr "以简æ´çš„æ ¼å¼æ˜¾ç¤ºçŠ¶æ€"
-#: builtin/commit.c:1325 builtin/commit.c:1604
+#: builtin/commit.c:1326 builtin/commit.c:1607
msgid "show branch information"
msgstr "显示分支信æ¯"
-#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
+#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "机器å¯è¯»çš„输出"
-#: builtin/commit.c:1330 builtin/commit.c:1608
+#: builtin/commit.c:1331 builtin/commit.c:1611
msgid "show status in long format (default)"
msgstr "以长格å¼æ˜¾ç¤ºçŠ¶æ€ï¼ˆé»˜è®¤ï¼‰"
-#: builtin/commit.c:1333 builtin/commit.c:1611
+#: builtin/commit.c:1334 builtin/commit.c:1614
msgid "terminate entries with NUL"
msgstr "æ¡ç›®ä»¥ NUL 字符结尾"
-#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:604
+#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "模å¼"
-#: builtin/commit.c:1336 builtin/commit.c:1614
+#: builtin/commit.c:1337 builtin/commit.c:1617
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件,“模å¼â€çš„å¯é€‰å‚数:allã€normalã€no。(默认:all)"
-#: builtin/commit.c:1339
+#: builtin/commit.c:1340
msgid "show ignored files"
msgstr "显示忽略的文件"
-#: builtin/commit.c:1340 parse-options.h:155
+#: builtin/commit.c:1341 parse-options.h:155
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1341
+#: builtin/commit.c:1342
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略å­æ¨¡ç»„的更改,“何时â€çš„å¯é€‰å‚数:allã€dirtyã€untracked。(默认:all)"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1344
msgid "list untracked files in columns"
msgstr "以列的方å¼æ˜¾ç¤ºæœªè·Ÿè¸ªçš„文件"
-#: builtin/commit.c:1429
+#: builtin/commit.c:1430
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的æ交"
-#: builtin/commit.c:1431
+#: builtin/commit.c:1432
msgid "could not parse newly created commit"
msgstr "ä¸èƒ½è§£æžæ–°åˆ›å»ºçš„æ交"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1477
msgid "detached HEAD"
msgstr "分离头指针"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: builtin/commit.c:1479
+#: builtin/commit.c:1480
msgid " (root-commit)"
msgstr "(根æ交)"
-#: builtin/commit.c:1572
+#: builtin/commit.c:1575
msgid "suppress summary after successful commit"
msgstr "æ交æˆåŠŸåŽä¸æ˜¾ç¤ºæ¦‚è¿°ä¿¡æ¯"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1576
msgid "show diff in commit message template"
msgstr "在æ交说明模æ¿é‡Œæ˜¾ç¤ºå·®å¼‚"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1578
msgid "Commit message options"
msgstr "æ交说明选项"
-#: builtin/commit.c:1576 builtin/tag.c:602
+#: builtin/commit.c:1579 builtin/tag.c:351
msgid "read message from file"
msgstr "从文件中读å–æ交说明"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1577
+#: builtin/commit.c:1580
msgid "override author for commit"
msgstr "æ交时覆盖作者"
-#: builtin/commit.c:1578 builtin/gc.c:268
+#: builtin/commit.c:1581 builtin/gc.c:326
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1581
msgid "override date for commit"
msgstr "æ交时覆盖日期"
-#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
-#: builtin/notes.c:555 builtin/tag.c:600
+#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:349
msgid "message"
msgstr "说明"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1582
msgid "commit message"
msgstr "æ交说明"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
+#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+msgid "commit"
+msgstr "æ交"
+
+#: builtin/commit.c:1583
msgid "reuse and edit message from specified commit"
msgstr "é‡ç”¨å¹¶ç¼–辑指定æ交的æ交说明"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1584
msgid "reuse message from specified commit"
msgstr "é‡ç”¨æŒ‡å®šæ交的æ交说明"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1585
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以修正指定的æ交"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1586
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以压缩至指定的æ交"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1587
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该æ交的作者改为我(和 -C/-c/--amend å‚数共用)"
-#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: ç­¾å"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1589
msgid "use specified template file"
msgstr "使用指定的模æ¿æ–‡ä»¶"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1590
msgid "force edit of commit"
msgstr "强制编辑æ交"
# 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘(或是原文中笔误,应为 mode)
-#: builtin/commit.c:1588
+#: builtin/commit.c:1591
msgid "default"
msgstr "default"
-#: builtin/commit.c:1588 builtin/tag.c:605
+#: builtin/commit.c:1591 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除æ交说明里的空格和#注释"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1592
msgid "include status in commit message template"
msgstr "在æ交说明模æ¿é‡ŒåŒ…å«çŠ¶æ€ä¿¡æ¯"
-#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG æ交签å"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1597
msgid "Commit contents options"
msgstr "æ交内容选项"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1598
msgid "commit all changed files"
msgstr "æ交所有改动的文件"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1599
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待æ交"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1600
msgid "interactively add files"
msgstr "交互å¼æ·»åŠ æ–‡ä»¶"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1601
msgid "interactively add changes"
msgstr "交互å¼æ·»åŠ å˜æ›´"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1602
msgid "commit only specified files"
msgstr "åªæ交指定的文件"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1603
msgid "bypass pre-commit hook"
msgstr "绕过 pre-commit é’©å­"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1604
msgid "show what would be committed"
msgstr "显示将è¦æ交的内容"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1615
msgid "amend previous commit"
msgstr "修改先å‰çš„æ交"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1616
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite é’©å­"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1621
msgid "ok to record an empty change"
msgstr "å…许一个空æ交"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1623
msgid "ok to record a change with an empty message"
msgstr "å…许空的æ交说明"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1652
msgid "could not parse HEAD commit"
msgstr "ä¸èƒ½è§£æž HEAD æ交"
-#: builtin/commit.c:1695
+#: builtin/commit.c:1698
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "æŸåçš„ MERGE_HEAD 文件(%s)"
-#: builtin/commit.c:1702
+#: builtin/commit.c:1705
msgid "could not read MERGE_MODE"
msgstr "ä¸èƒ½è¯»å– MERGE_MODE"
-#: builtin/commit.c:1721
+#: builtin/commit.c:1724
#, c-format
msgid "could not read commit message: %s"
msgstr "ä¸èƒ½è¯»å–æ交说明:%s"
-#: builtin/commit.c:1732
+#: builtin/commit.c:1735
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止æ交;您未更改æ¥è‡ªæ¨¡ç‰ˆçš„æ交说明。\n"
-#: builtin/commit.c:1737
+#: builtin/commit.c:1740
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止æ交因为æ交说明为空。\n"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1788
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5550,11 +5602,11 @@ msgstr "åªæ˜¾ç¤ºå˜é‡å"
msgid "respect include directives on lookup"
msgstr "查询时å‚ç…§ include 指令递归查找"
-#: builtin/config.c:311
+#: builtin/config.c:303
msgid "unable to parse default color value"
msgstr "ä¸èƒ½è§£æžé»˜è®¤é¢œè‰²å€¼"
-#: builtin/config.c:449
+#: builtin/config.c:441
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5569,16 +5621,16 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:583
+#: builtin/config.c:575
#, c-format
msgid "cannot create configuration file %s"
msgstr "ä¸èƒ½åˆ›å»ºé…置文件 %s"
-#: builtin/count-objects.c:55
+#: builtin/count-objects.c:77
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:65
+#: builtin/count-objects.c:87
msgid "print sizes in human readable format"
msgstr "以用户å¯è¯»çš„æ ¼å¼æ˜¾ç¤ºå¤§å°"
@@ -5698,7 +5750,7 @@ msgstr "考虑最近 <n> 个标签(默认:10)"
msgid "only consider tags matching <pattern>"
msgstr "åªè€ƒè™‘åŒ¹é… <模å¼> 的标签"
-#: builtin/describe.c:410 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:314
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的æ交å·ä½œä¸ºåŽå¤‡"
@@ -5918,7 +5970,7 @@ msgstr "[最新]"
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (在当å‰åˆ†æ”¯ä¸‹ä¸èƒ½èŽ·å–)"
-#: builtin/fetch.c:478 builtin/fetch.c:564
+#: builtin/fetch.c:478 builtin/fetch.c:566
msgid "[rejected]"
msgstr "[已拒ç»]"
@@ -5943,39 +5995,39 @@ msgstr "[新分支]"
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "unable to update local ref"
msgstr "ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨"
-#: builtin/fetch.c:560
+#: builtin/fetch.c:561
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:566
+#: builtin/fetch.c:568
msgid "(non-fast-forward)"
msgstr "(éžå¿«è¿›å¼ï¼‰"
-#: builtin/fetch.c:600 builtin/fetch.c:842
+#: builtin/fetch.c:602 builtin/fetch.c:843
#, c-format
msgid "cannot open %s: %s\n"
msgstr "无法打开 %s:%s\n"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:611
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未å‘é€æ‰€æœ‰å¿…须的对象\n"
-#: builtin/fetch.c:627
+#: builtin/fetch.c:629
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "æ‹’ç» %s 因为浅克隆ä¸å…许被更新"
-#: builtin/fetch.c:715 builtin/fetch.c:807
+#: builtin/fetch.c:716 builtin/fetch.c:808
#, c-format
msgid "From %.*s\n"
msgstr "æ¥è‡ª %.*s\n"
-#: builtin/fetch.c:726
+#: builtin/fetch.c:727
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -5985,87 +6037,87 @@ msgstr ""
" 'git remote prune %s' æ¥åˆ é™¤æ—§çš„ã€æœ‰å†²çªçš„分支"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/fetch.c:778
+#: builtin/fetch.c:779
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s å°†æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰"
-#: builtin/fetch.c:811
+#: builtin/fetch.c:812
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:812 builtin/remote.c:1034
+#: builtin/fetch.c:813 builtin/remote.c:1040
msgid "(none)"
msgstr "(无)"
-#: builtin/fetch.c:832
+#: builtin/fetch.c:833
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "æ‹’ç»èŽ·å–到éžçº¯ä»“库的当å‰åˆ†æ”¯ %s"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:854
+#: builtin/fetch.c:855
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:910
+#: builtin/fetch.c:911
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "ä¸çŸ¥é“如何从 %s 获å–"
-#: builtin/fetch.c:1071
+#: builtin/fetch.c:1072
#, c-format
msgid "Fetching %s\n"
msgstr "æ­£åœ¨èŽ·å– %s\n"
-#: builtin/fetch.c:1073 builtin/remote.c:90
+#: builtin/fetch.c:1074 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "ä¸èƒ½èŽ·å– %s"
-#: builtin/fetch.c:1091
+#: builtin/fetch.c:1092
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程仓库。请通过一个 URL 或远程仓库å指定,用以获å–æ–°æ交。"
-#: builtin/fetch.c:1114
+#: builtin/fetch.c:1115
msgid "You need to specify a tag name."
msgstr "您需è¦æŒ‡å®šä¸€ä¸ªæ ‡ç­¾å称。"
-#: builtin/fetch.c:1156
+#: builtin/fetch.c:1157
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth å’Œ --unshallow ä¸èƒ½åŒæ—¶ä½¿ç”¨"
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1159
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库,å‚æ•° --unshallow 没有æ„义"
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1179
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all ä¸èƒ½å¸¦ä¸€ä¸ªä»“库å‚æ•°"
-#: builtin/fetch.c:1183
+#: builtin/fetch.c:1181
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何æ„义"
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1192
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组:%s"
-#: builtin/fetch.c:1202
+#: builtin/fetch.c:1200
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获å–组并指定引用规格没有æ„义"
@@ -6074,23 +6126,23 @@ msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:667
msgid "populate log with at most <n> entries from shortlog"
msgstr "å‘æ交说明中最多å¤åˆ¶æŒ‡å®šæ¡ç›®ï¼ˆåˆå¹¶è€Œæ¥çš„æ交)的简短说明"
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:670
msgid "alias for --log (deprecated)"
msgstr "å‚æ•° --log 的别å(已弃用)"
-#: builtin/fmt-merge-msg.c:676
+#: builtin/fmt-merge-msg.c:673
msgid "text"
msgstr "文本"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:674
msgid "use <text> as start of message"
msgstr "使用 <文本> 作为æ交说明的开始"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:675
msgid "file to read from"
msgstr "从文件中读å–"
@@ -6098,95 +6150,115 @@ msgstr "从文件中读å–"
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<选项>] [<模å¼>]"
-#: builtin/for-each-ref.c:24
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <对象>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
+msgstr "git for-each-ref [--contains [<对象>]]"
+
+#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr "引用å ä½ç¬¦é€‚用于 shells"
-#: builtin/for-each-ref.c:26
+#: builtin/for-each-ref.c:29
msgid "quote placeholders suitably for perl"
msgstr "引用å ä½ç¬¦é€‚用于 perl"
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:31
msgid "quote placeholders suitably for python"
msgstr "引用å ä½ç¬¦é€‚用于 python"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:33
msgid "quote placeholders suitably for Tcl"
msgstr "引用å ä½ç¬¦é€‚用于 Tcl"
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:36
msgid "show only <n> matched refs"
msgstr "åªæ˜¾ç¤º <n> 个匹é…的引用"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:37 builtin/tag.c:372
msgid "format to use for the output"
msgstr "输出格å¼"
-#: builtin/for-each-ref.c:35
-msgid "key"
-msgstr "key"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
+msgstr "åªæ‰“å°æŒ‡å‘给定对象的引用"
-#: builtin/for-each-ref.c:36
-msgid "field name to sort on"
-msgstr "排åºçš„字段å"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr "åªæ‰“å°å·²ç»åˆå¹¶çš„引用"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr "åªæ‰“å°æ²¡æœ‰åˆå¹¶çš„引用"
-#: builtin/fsck.c:163 builtin/prune.c:137
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr "åªæ‰“å°åŒ…å«è¯¥æ交的引用"
+
+#: builtin/fsck.c:156 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "检查连接中"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:486
msgid "Checking object directories"
msgstr "检查对象目录中"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:553
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:559
msgid "show unreachable objects"
msgstr "显示ä¸å¯è¾¾çš„对象"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:560
msgid "show dangling objects"
msgstr "显示摇摆的对象"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:561
msgid "report tags"
msgstr "报告标签"
-#: builtin/fsck.c:640
+#: builtin/fsck.c:562
msgid "report root nodes"
msgstr "报告根节点"
-#: builtin/fsck.c:641
+#: builtin/fsck.c:563
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
-#: builtin/fsck.c:642
+#: builtin/fsck.c:564
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点(默认)"
-#: builtin/fsck.c:643
+#: builtin/fsck.c:565
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
-#: builtin/fsck.c:644
+#: builtin/fsck.c:566
msgid "check only connectivity"
msgstr "仅检查连通性"
-#: builtin/fsck.c:645
+#: builtin/fsck.c:567
msgid "enable more strict checking"
msgstr "å¯ç”¨æ›´ä¸¥æ ¼çš„检查"
-#: builtin/fsck.c:647
+#: builtin/fsck.c:569
msgid "write dangling objects in .git/lost-found"
msgstr "将摇摆对象写入 .git/lost-found 中"
-#: builtin/fsck.c:648 builtin/prune.c:107
+#: builtin/fsck.c:570 builtin/prune.c:107
msgid "show progress"
msgstr "显示进度"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:631
msgid "Checking objects"
msgstr "检查对象中"
@@ -6194,55 +6266,69 @@ msgstr "检查对象中"
msgid "git gc [<options>]"
msgstr "git gc [<选项>]"
-#: builtin/gc.c:55
+#: builtin/gc.c:72
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s:'%s'"
-#: builtin/gc.c:100
+#: builtin/gc.c:139
#, c-format
msgid "insanely long object directory %.*s"
msgstr "ä¸æ­£å¸¸çš„长对象目录 %.*s"
-#: builtin/gc.c:269
+#: builtin/gc.c:290
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"最åŽä¸€æ¬¡ gc æ“作报告如下信æ¯ã€‚请检查原因并删除 %s。\n"
+"在该文件被删除之å‰ï¼Œè‡ªåŠ¨æ¸…ç†å°†ä¸ä¼šæ‰§è¡Œã€‚\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:327
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:271
+#: builtin/gc.c:329
msgid "be more thorough (increased runtime)"
msgstr "更彻底(增加è¿è¡Œæ—¶é—´ï¼‰"
-#: builtin/gc.c:272
+#: builtin/gc.c:330
msgid "enable auto-gc mode"
msgstr "å¯ç”¨è‡ªåŠ¨åžƒåœ¾å›žæ”¶æ¨¡å¼"
-#: builtin/gc.c:273
+#: builtin/gc.c:331
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc å³ä½¿å¦å¤–一个 gc 正在执行"
-#: builtin/gc.c:315
+#: builtin/gc.c:373
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在åŽå°æ‰§è¡Œä»“库打包以求最佳性能。\n"
-#: builtin/gc.c:317
+#: builtin/gc.c:375
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:318
+#: builtin/gc.c:376
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护å‚è§ \"git help gc\"。\n"
-#: builtin/gc.c:336
+#: builtin/gc.c:397
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"å·²ç»æœ‰ä¸€ä¸ª gc æ­£è¿è¡Œåœ¨æœºå™¨ '%s' pid %<PRIuMAX> (如果ä¸æ˜¯ï¼Œä½¿ç”¨ --force)"
-#: builtin/gc.c:364
+#: builtin/gc.c:441
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多ä¸å¯è¾¾çš„æ¾æ•£å¯¹è±¡ï¼Œè¿è¡Œ 'git prune' 删除它们。"
@@ -6276,200 +6362,196 @@ msgstr "开关 `%c' 期望一个数字值"
msgid "cannot open '%s'"
msgstr "ä¸èƒ½æ‰“å¼€ '%s'"
-#: builtin/grep.c:638
+#: builtin/grep.c:633
msgid "search in index instead of in the work tree"
msgstr "在索引区æœç´¢è€Œä¸æ˜¯åœ¨å·¥ä½œåŒº"
-#: builtin/grep.c:640
+#: builtin/grep.c:635
msgid "find in contents not managed by git"
msgstr "在未被 git 管ç†çš„内容中查找"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: builtin/grep.c:642
+#: builtin/grep.c:637
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中æœç´¢"
-#: builtin/grep.c:644
+#: builtin/grep.c:639
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包å«çš„文件"
-#: builtin/grep.c:647
+#: builtin/grep.c:642
msgid "show non-matching lines"
msgstr "显示未匹é…çš„è¡Œ"
-#: builtin/grep.c:649
+#: builtin/grep.c:644
msgid "case insensitive matching"
msgstr "ä¸åŒºåˆ†å¤§å°å†™åŒ¹é…"
-#: builtin/grep.c:651
+#: builtin/grep.c:646
msgid "match patterns only at word boundaries"
msgstr "åªåœ¨å•è¯è¾¹ç•ŒåŒ¹é…模å¼"
-#: builtin/grep.c:653
+#: builtin/grep.c:648
msgid "process binary files as text"
msgstr "把二进制文件当åšæ–‡æœ¬å¤„ç†"
-#: builtin/grep.c:655
+#: builtin/grep.c:650
msgid "don't match patterns in binary files"
msgstr "ä¸åœ¨äºŒè¿›åˆ¶æ–‡ä»¶ä¸­åŒ¹é…模å¼"
-#: builtin/grep.c:658
+#: builtin/grep.c:653
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处ç†äºŒè¿›åˆ¶æ–‡ä»¶"
-#: builtin/grep.c:660
+#: builtin/grep.c:655
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度å‘下寻找"
-#: builtin/grep.c:664
+#: builtin/grep.c:659
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达å¼"
-#: builtin/grep.c:667
+#: builtin/grep.c:662
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达å¼ï¼ˆé»˜è®¤ï¼‰"
-#: builtin/grep.c:670
+#: builtin/grep.c:665
msgid "interpret patterns as fixed strings"
msgstr "把模å¼è§£æžä¸ºå›ºå®šçš„字符串"
-#: builtin/grep.c:673
+#: builtin/grep.c:668
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达å¼"
-#: builtin/grep.c:676
+#: builtin/grep.c:671
msgid "show line numbers"
msgstr "显示行å·"
-#: builtin/grep.c:677
+#: builtin/grep.c:672
msgid "don't show filenames"
msgstr "ä¸æ˜¾ç¤ºæ–‡ä»¶å"
-#: builtin/grep.c:678
+#: builtin/grep.c:673
msgid "show filenames"
msgstr "显示文件å"
-#: builtin/grep.c:680
+#: builtin/grep.c:675
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件å"
-#: builtin/grep.c:682
+#: builtin/grep.c:677
msgid "show only filenames instead of matching lines"
msgstr "åªæ˜¾ç¤ºæ–‡ä»¶å而ä¸æ˜¾ç¤ºåŒ¹é…çš„è¡Œ"
-#: builtin/grep.c:684
+#: builtin/grep.c:679
msgid "synonym for --files-with-matches"
msgstr "å’Œ --files-with-matches åŒä¹‰"
-#: builtin/grep.c:687
+#: builtin/grep.c:682
msgid "show only the names of files without match"
msgstr "åªæ˜¾ç¤ºæœªåŒ¹é…的文件å"
-#: builtin/grep.c:689
+#: builtin/grep.c:684
msgid "print NUL after filenames"
msgstr "在文件ååŽè¾“出 NUL 字符"
-#: builtin/grep.c:691
+#: builtin/grep.c:686
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹é…行数,而ä¸æ˜¾ç¤ºåŒ¹é…çš„è¡Œ"
-#: builtin/grep.c:692
+#: builtin/grep.c:687
msgid "highlight matches"
msgstr "高亮显示匹é…项"
-#: builtin/grep.c:694
+#: builtin/grep.c:689
msgid "print empty line between matches from different files"
msgstr "在ä¸åŒæ–‡ä»¶çš„匹é…项之间打å°ç©ºè¡Œ"
-#: builtin/grep.c:696
+#: builtin/grep.c:691
msgid "show filename only once above matches from same file"
msgstr "åªåœ¨åŒä¸€æ–‡ä»¶çš„匹é…项的上é¢æ˜¾ç¤ºä¸€æ¬¡æ–‡ä»¶å"
-#: builtin/grep.c:699
+#: builtin/grep.c:694
msgid "show <n> context lines before and after matches"
msgstr "显示匹é…项å‰åŽçš„ <n> 行上下文"
-#: builtin/grep.c:702
+#: builtin/grep.c:697
msgid "show <n> context lines before matches"
msgstr "显示匹é…é¡¹å‰ <n> 行上下文"
-#: builtin/grep.c:704
+#: builtin/grep.c:699
msgid "show <n> context lines after matches"
msgstr "显示匹é…é¡¹åŽ <n> 行上下文"
-#: builtin/grep.c:705
+#: builtin/grep.c:700
msgid "shortcut for -C NUM"
msgstr "å¿«æ·é”® -C æ•°å­—"
-#: builtin/grep.c:708
+#: builtin/grep.c:703
msgid "show a line with the function name before matches"
msgstr "在匹é…çš„å‰é¢æ˜¾ç¤ºä¸€è¡Œå‡½æ•°å"
-#: builtin/grep.c:710
+#: builtin/grep.c:705
msgid "show the surrounding function"
msgstr "显示所在函数的å‰åŽå†…容"
-#: builtin/grep.c:713
+#: builtin/grep.c:708
msgid "read patterns from file"
msgstr "从文件读å–模å¼"
-#: builtin/grep.c:715
+#: builtin/grep.c:710
msgid "match <pattern>"
msgstr "åŒ¹é… <模å¼>"
-#: builtin/grep.c:717
+#: builtin/grep.c:712
msgid "combine patterns specified with -e"
msgstr "组åˆç”¨ -e å‚数设定的模å¼"
-#: builtin/grep.c:729
+#: builtin/grep.c:724
msgid "indicate hit with exit status without output"
msgstr "ä¸è¾“出,而用退出ç æ ‡è¯†å‘½ä¸­çŠ¶æ€"
-#: builtin/grep.c:731
+#: builtin/grep.c:726
msgid "show only matches from files that match all patterns"
msgstr "åªæ˜¾ç¤ºåŒ¹é…所有模å¼çš„文件中的匹é…"
-#: builtin/grep.c:733
+#: builtin/grep.c:728
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达å¼çš„解æžæ ‘"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:737
+#: builtin/grep.c:732
msgid "show matching files in the pager"
msgstr "分页显示匹é…的文件"
-#: builtin/grep.c:740
+#: builtin/grep.c:735
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "å…许调用 grep(1)(本次构建忽略)"
-#: builtin/grep.c:741 builtin/show-ref.c:189
-msgid "show usage"
-msgstr "显示用法"
-
-#: builtin/grep.c:808
+#: builtin/grep.c:793
msgid "no pattern given."
msgstr "未æ供模å¼åŒ¹é…。"
-#: builtin/grep.c:866
+#: builtin/grep.c:851
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:892
+#: builtin/grep.c:877
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached 或 --untracked ä¸èƒ½ä¸Ž --no-index åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/grep.c:897
+#: builtin/grep.c:882
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index 或 --untracked ä¸èƒ½å’Œç‰ˆæœ¬åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/grep.c:900
+#: builtin/grep.c:885
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard ä¸èƒ½ç”¨äºŽå·²è·Ÿè¸ªå†…容。"
-#: builtin/grep.c:908
+#: builtin/grep.c:893
msgid "both --cached and trees are given."
msgstr "åŒæ—¶ç»™å‡ºäº† --cached 和树对象。"
@@ -6482,10 +6564,10 @@ msgstr ""
"[--] <文件>..."
#: builtin/hash-object.c:81
-msgid "git hash-object --stdin-paths < <list-of-paths>"
-msgstr "git hash-object --stdin-paths < <路径列表>"
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:92 builtin/tag.c:614
+#: builtin/hash-object.c:92
msgid "type"
msgstr "类型"
@@ -6556,12 +6638,12 @@ msgstr "æ— æ³•è§£æž emacsclient 版本。"
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太è€ï¼ˆ< 22)。"
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
msgid "failed to exec '%s': %s"
msgstr "无法执行 '%s':%s"
-#: builtin/help.c:215
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -6570,7 +6652,7 @@ msgstr ""
"'%s':ä¸æ”¯æŒçš„ man 手册查看器的路径。\n"
"请使用 'man.<工具>.cmd'。"
-#: builtin/help.c:227
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -6579,61 +6661,61 @@ msgstr ""
"'%s': 支æŒçš„ man 手册查看器命令。\n"
"请使用 'man.<工具>.path'。"
-#: builtin/help.c:354
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s':未知的 man 查看器。"
-#: builtin/help.c:371
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr "没有 man 查看器处ç†æ­¤è¯·æ±‚"
-#: builtin/help.c:379
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处ç†æ­¤è¯·æ±‚"
-#: builtin/help.c:428
+#: builtin/help.c:411
msgid "Defining attributes per path"
msgstr "定义路径的属性"
-#: builtin/help.c:429
+#: builtin/help.c:412
msgid "Everyday Git With 20 Commands Or So"
msgstr "æ¯ä¸€å¤© Git 常用的约 20 æ¡å‘½ä»¤"
-#: builtin/help.c:430
+#: builtin/help.c:413
msgid "A Git glossary"
msgstr "Git è¯æ±‡è¡¨"
-#: builtin/help.c:431
+#: builtin/help.c:414
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未跟踪文件"
-#: builtin/help.c:432
+#: builtin/help.c:415
msgid "Defining submodule properties"
msgstr "定义å­æ¨¡ç»„属性"
-#: builtin/help.c:433
+#: builtin/help.c:416
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本范围"
-#: builtin/help.c:434
+#: builtin/help.c:417
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
-#: builtin/help.c:435
+#: builtin/help.c:418
msgid "An overview of recommended workflows with Git"
msgstr "Git 推è的工作æµæ¦‚览"
-#: builtin/help.c:447
+#: builtin/help.c:430
msgid "The common Git guides are:\n"
msgstr "最常用的 Git å‘导有:\n"
-#: builtin/help.c:468 builtin/help.c:485
+#: builtin/help.c:451 builtin/help.c:468
#, c-format
msgid "usage: %s%s"
msgstr "用法:%s%s"
-#: builtin/help.c:501
+#: builtin/help.c:484
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' 是 `%s' 的别å"
@@ -6926,87 +7008,62 @@ msgstr "包文件å '%s' 没有以 '.pack' 结尾"
msgid "--verify with no packfile name given"
msgstr "--verify 没有æ供包文件åå‚æ•°"
-#: builtin/init-db.c:36
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "ä¸èƒ½è®¾ç½® %s 为组å¯å†™"
-
-#: builtin/init-db.c:63
-#, c-format
-msgid "insanely long template name %s"
-msgstr "太长的模版å %s"
-
-#: builtin/init-db.c:68
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "ä¸èƒ½æžšä¸¾ '%s' 状æ€"
-#: builtin/init-db.c:74
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "ä¸èƒ½æžšä¸¾æ¨¡ç‰ˆ '%s' 状æ€"
-#: builtin/init-db.c:81
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "ä¸èƒ½æ‰“开目录 '%s'"
-#: builtin/init-db.c:98
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr "ä¸èƒ½è¯»å–链接 '%s'"
-#: builtin/init-db.c:100
-#, c-format
-msgid "insanely long symlink %s"
-msgstr "太长的符å·é“¾æŽ¥ %s"
-
-#: builtin/init-db.c:103
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "ä¸èƒ½è‡ª '%s' 到 '%s' 创建符å·é“¾æŽ¥"
-#: builtin/init-db.c:107
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "ä¸èƒ½æ‹·è´ '%s' 至 '%s'"
-#: builtin/init-db.c:111
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr "忽略模版 %s"
-#: builtin/init-db.c:137
-#, c-format
-msgid "insanely long template path %s"
-msgstr "太长的模版路径 %s"
-
-#: builtin/init-db.c:145
+#: builtin/init-db.c:118
#, c-format
msgid "templates not found %s"
msgstr "模版未找到 %s"
-#: builtin/init-db.c:158
+#: builtin/init-db.c:131
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr "没有从 '%2$s' å¤åˆ¶å¸¦æœ‰é”™è¯¯ç‰ˆæœ¬ %1$d 的模版"
-#: builtin/init-db.c:212
-#, c-format
-msgid "insane git directory %s"
-msgstr "ä¸æ­£å¸¸çš„ git 目录 %s"
-
-#: builtin/init-db.c:344 builtin/init-db.c:347
+#: builtin/init-db.c:309 builtin/init-db.c:312
#, c-format
msgid "%s already exists"
msgstr "%s å·²ç»å­˜åœ¨"
-#: builtin/init-db.c:375
+#: builtin/init-db.c:340
#, c-format
msgid "unable to handle file type %d"
msgstr "ä¸èƒ½å¤„ç† %d 类型的文件"
-#: builtin/init-db.c:378
+#: builtin/init-db.c:343
#, c-format
msgid "unable to move %s to %s"
msgstr "ä¸èƒ½ç§»åŠ¨ %s 至 %s"
@@ -7014,25 +7071,25 @@ msgstr "ä¸èƒ½ç§»åŠ¨ %s 至 %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:434
+#: builtin/init-db.c:399
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s Git 仓库于 %s%s\n"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Reinitialized existing"
msgstr "é‡æ–°åˆå§‹åŒ–现存的"
-#: builtin/init-db.c:435
+#: builtin/init-db.c:400
msgid "Initialized empty"
msgstr "åˆå§‹åŒ–空的"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: builtin/init-db.c:436
+#: builtin/init-db.c:401
msgid " shared"
msgstr "共享"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:448
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7040,32 +7097,32 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<模æ¿ç›®å½•>] [--shared[=<æƒé™>]] "
"[<目录>]"
-#: builtin/init-db.c:506
+#: builtin/init-db.c:471
msgid "permissions"
msgstr "æƒé™"
-#: builtin/init-db.c:507
+#: builtin/init-db.c:472
msgid "specify that the git repository is to be shared amongst several users"
msgstr "指定 git 仓库是多个用户之间共享的"
-#: builtin/init-db.c:541 builtin/init-db.c:546
+#: builtin/init-db.c:506 builtin/init-db.c:511
#, c-format
msgid "cannot mkdir %s"
msgstr "ä¸èƒ½åˆ›å»ºç›®å½• %s"
-#: builtin/init-db.c:550
+#: builtin/init-db.c:515
#, c-format
msgid "cannot chdir to %s"
msgstr "ä¸èƒ½åˆ‡æ¢ç›®å½•åˆ° %s"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:536
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr "ä¸å…许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
-#: builtin/init-db.c:599
+#: builtin/init-db.c:564
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "ä¸èƒ½è®¿é—®å·¥ä½œåŒº '%s'"
@@ -7151,33 +7208,33 @@ msgstr "format.headers 没有值"
msgid "name of output directory is too long"
msgstr "输出目录å太长"
-#: builtin/log.c:814
+#: builtin/log.c:813
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补ä¸æ–‡ä»¶ %s"
-#: builtin/log.c:828
+#: builtin/log.c:827
msgid "Need exactly one range."
msgstr "åªéœ€è¦ä¸€ä¸ªèŒƒå›´ã€‚"
-#: builtin/log.c:838
+#: builtin/log.c:837
msgid "Not a range."
msgstr "ä¸æ˜¯ä¸€ä¸ªèŒƒå›´ã€‚"
-#: builtin/log.c:944
+#: builtin/log.c:943
msgid "Cover letter needs email format"
msgstr "ä¿¡å°éœ€è¦é‚®ä»¶åœ°å€æ ¼å¼"
-#: builtin/log.c:1023
+#: builtin/log.c:1022
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ä¸æ­£å¸¸çš„ in-reply-to:%s"
-#: builtin/log.c:1051
+#: builtin/log.c:1050
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1096
+#: builtin/log.c:1095
msgid "Two output directories?"
msgstr "两个输出目录?"
@@ -7234,134 +7291,138 @@ msgid "don't output binary diffs"
msgstr "ä¸è¾“出二进制差异"
#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr "在 From 头信æ¯ä¸­è¾“出全为零的哈希值"
+
+#: builtin/log.c:1243
msgid "don't include a patch matching a commit upstream"
msgstr "ä¸åŒ…å«å·²åœ¨ä¸Šæ¸¸æ交中的补ä¸"
-#: builtin/log.c:1243
+#: builtin/log.c:1245
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补ä¸æ ¼å¼è€Œéžé»˜è®¤çš„(补ä¸+状æ€ï¼‰"
-#: builtin/log.c:1245
+#: builtin/log.c:1247
msgid "Messaging"
msgstr "邮件å‘é€"
-#: builtin/log.c:1246
+#: builtin/log.c:1248
msgid "header"
msgstr "header"
-#: builtin/log.c:1247
+#: builtin/log.c:1249
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1248 builtin/log.c:1250
+#: builtin/log.c:1250 builtin/log.c:1252
msgid "email"
msgstr "邮件地å€"
-#: builtin/log.c:1248
+#: builtin/log.c:1250
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1250
+#: builtin/log.c:1252
msgid "add Cc: header"
msgstr "添加抄é€"
-#: builtin/log.c:1252
+#: builtin/log.c:1254
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1253
+#: builtin/log.c:1255
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "å°† From 地å€è®¾ç½®ä¸º <标识>(如若ä¸æ供,则用æ交者 ID åšä¸ºåœ°å€ï¼‰"
-#: builtin/log.c:1255
+#: builtin/log.c:1257
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1256
+#: builtin/log.c:1258
msgid "make first mail a reply to <message-id>"
msgstr "使第一å°é‚®ä»¶ä½œä¸ºå¯¹ <邮件标识> 的回å¤"
-#: builtin/log.c:1257 builtin/log.c:1260
+#: builtin/log.c:1259 builtin/log.c:1262
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1258
+#: builtin/log.c:1260
msgid "attach the patch"
msgstr "附件方å¼æ·»åŠ è¡¥ä¸"
-#: builtin/log.c:1261
+#: builtin/log.c:1263
msgid "inline the patch"
msgstr "内è”显示补ä¸"
-#: builtin/log.c:1265
+#: builtin/log.c:1267
msgid "enable message threading, styles: shallow, deep"
msgstr "å¯ç”¨é‚®ä»¶çº¿ç´¢ï¼Œé£Žæ ¼ï¼šæµ…,深"
-#: builtin/log.c:1267
+#: builtin/log.c:1269
msgid "signature"
msgstr "ç­¾å"
-#: builtin/log.c:1268
+#: builtin/log.c:1270
msgid "add a signature"
msgstr "添加一个签å"
-#: builtin/log.c:1270
+#: builtin/log.c:1272
msgid "add a signature from a file"
msgstr "从文件添加一个签å"
-#: builtin/log.c:1271
+#: builtin/log.c:1273
msgid "don't print the patch filenames"
msgstr "ä¸è¦æ‰“å°è¡¥ä¸æ–‡ä»¶å"
-#: builtin/log.c:1360
+#: builtin/log.c:1362
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1362
+#: builtin/log.c:1364
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix 和 -k 互斥。"
-#: builtin/log.c:1370
+#: builtin/log.c:1372
msgid "--name-only does not make sense"
msgstr "--name-only æ— æ„义"
-#: builtin/log.c:1372
+#: builtin/log.c:1374
msgid "--name-status does not make sense"
msgstr "--name-status æ— æ„义"
-#: builtin/log.c:1374
+#: builtin/log.c:1376
msgid "--check does not make sense"
msgstr "--check æ— æ„义"
-#: builtin/log.c:1397
+#: builtin/log.c:1401
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录,哪一个?"
-#: builtin/log.c:1399
+#: builtin/log.c:1403
#, c-format
msgid "Could not create directory '%s'"
msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'"
-#: builtin/log.c:1496
+#: builtin/log.c:1500
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读å–ç­¾å文件 '%s'"
-#: builtin/log.c:1559
+#: builtin/log.c:1563
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1607
+#: builtin/log.c:1611
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<é™åˆ¶>]]]"
-#: builtin/log.c:1661
+#: builtin/log.c:1665
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "ä¸èƒ½æ‰¾åˆ°è·Ÿè¸ªçš„远程分支,请手工指定 <上游>。\n"
-#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
+#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr "未知æ交 %s"
@@ -7462,35 +7523,35 @@ msgstr "显示调试数æ®"
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<选项>] <树或æ交> [<路径>...]"
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "åªæ˜¾ç¤ºæ ‘"
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "递归到å­æ ‘"
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "当递归时显示树"
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "æ¡ç›®ä»¥ NUL 字符终止"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "包括对象大å°"
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "åªåˆ—出文件å"
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "使用文件的全路径"
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "列出整个树;ä¸ä»…仅当å‰ç›®å½•ï¼ˆéšå« --full-name)"
@@ -7720,16 +7781,16 @@ msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å®šä¹‰é»˜è®¤çš„上游分支。"
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有æ¥è‡ª %s 的远程跟踪分支"
-#: builtin/merge.c:1081
+#: builtin/merge.c:1079
#, c-format
msgid "could not close '%s'"
msgstr "ä¸èƒ½å…³é—­ '%s'"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1206
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有è¦ç»ˆæ­¢çš„åˆå¹¶ï¼ˆMERGE_HEAD 丢失)。"
-#: builtin/merge.c:1224
+#: builtin/merge.c:1222
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7737,7 +7798,7 @@ msgstr ""
"您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå­˜åœ¨ MERGE_HEAD)。\n"
"请在åˆå¹¶å‰å…ˆæ交您的修改。"
-#: builtin/merge.c:1231
+#: builtin/merge.c:1229
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7745,51 +7806,51 @@ msgstr ""
"您尚未结æŸæ‚¨çš„拣选(存在 CHERRY_PICK_HEAD)。\n"
"请在åˆå¹¶å‰å…ˆæ交您的修改。"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1232
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结æŸæ‚¨çš„拣选(存在 CHERRY_PICK_HEAD)。"
-#: builtin/merge.c:1243
+#: builtin/merge.c:1241
msgid "You cannot combine --squash with --no-ff."
msgstr "您ä¸èƒ½å°† --squash 与 --no-ff åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/merge.c:1251
+#: builtin/merge.c:1249
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定æ交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1268
+#: builtin/merge.c:1266
msgid "Squash commit into empty head not supported yet"
msgstr "å°šä¸æ”¯æŒåˆ°ç©ºåˆ†æ”¯çš„压缩æ交"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1268
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的éžå¿«è¿›å¼æ交没有æ„义"
-#: builtin/merge.c:1276
+#: builtin/merge.c:1274
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - ä¸èƒ½è¢«åˆå¹¶"
-#: builtin/merge.c:1278
+#: builtin/merge.c:1276
msgid "Can merge only exactly one commit into empty head"
msgstr "åªèƒ½å°†ä¸€ä¸ªæ交åˆå¹¶åˆ°ç©ºåˆ†æ”¯ä¸Š"
-#: builtin/merge.c:1333
+#: builtin/merge.c:1331
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "æ交 %s 有一个éžå¯ä¿¡çš„声称æ¥è‡ª %s çš„ GPG ç­¾å。"
-#: builtin/merge.c:1336
+#: builtin/merge.c:1334
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "æ交 %s 有一个错误的声称æ¥è‡ª %s çš„ GPG ç­¾å。"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1337
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "æ交 %s 没有一个 GPG ç­¾å。"
-#: builtin/merge.c:1342
+#: builtin/merge.c:1340
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "æ交 %s 有一个æ¥è‡ª %s 的好的 GPG ç­¾å。\n"
@@ -7799,46 +7860,46 @@ msgstr "æ交 %s 有一个æ¥è‡ª %s 的好的 GPG ç­¾å。\n"
msgid "Updating %s..%s\n"
msgstr "æ›´æ–° %s..%s\n"
-#: builtin/merge.c:1462
+#: builtin/merge.c:1460
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "å°è¯•éžå¸¸å°çš„索引内åˆå¹¶...\n"
-#: builtin/merge.c:1469
+#: builtin/merge.c:1467
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1501
+#: builtin/merge.c:1499
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进,终止。"
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状æ€...\n"
-#: builtin/merge.c:1528
+#: builtin/merge.c:1526
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "å°è¯•åˆå¹¶ç­–ç•¥ %s...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1592
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有åˆå¹¶ç­–略处ç†æ­¤åˆå¹¶ã€‚\n"
-#: builtin/merge.c:1596
+#: builtin/merge.c:1594
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s åˆå¹¶å¤±è´¥ã€‚\n"
-#: builtin/merge.c:1605
+#: builtin/merge.c:1603
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1617
+#: builtin/merge.c:1615
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动åˆå¹¶è¿›å±•é¡ºåˆ©ï¼ŒæŒ‰è¦æ±‚在æ交å‰åœæ­¢\n"
@@ -8026,48 +8087,48 @@ msgstr "%s,æº=%s,目标=%s"
msgid "Renaming %s to %s\n"
msgstr "é‡å‘½å %s 至 %s\n"
-#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "é‡å‘½å '%s' 失败"
-#: builtin/name-rev.c:255
+#: builtin/name-rev.c:251
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <æ交>..."
-#: builtin/name-rev.c:256
+#: builtin/name-rev.c:252
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:253
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<选项>] --stdin"
-#: builtin/name-rev.c:309
+#: builtin/name-rev.c:305
msgid "print only names (no SHA-1)"
msgstr "åªæ‰“å°å称(无 SHA-1)"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:306
msgid "only use tags to name the commits"
msgstr "åªä½¿ç”¨æ ‡ç­¾æ¥å‘½åæ交"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:308
msgid "only use refs matching <pattern>"
msgstr "åªä½¿ç”¨å’Œ <模å¼> 相匹é…的引用"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:310
msgid "list all commits reachable from all refs"
msgstr "列出å¯ä»¥ä»Žæ‰€æœ‰å¼•ç”¨è®¿é—®çš„æ交"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:311
msgid "read from stdin"
msgstr "从标准输入读å–"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:312
msgid "allow to print `undefined` names (default)"
msgstr "å…è®¸æ‰“å° `未定义` çš„å称(默认)"
-#: builtin/name-rev.c:322
+#: builtin/name-rev.c:318
msgid "dereference tags in the input (internal use)"
msgstr "åå‘解æžè¾“入中的标签(内部使用)"
@@ -8194,7 +8255,7 @@ msgstr "ä¸èƒ½è¯»å– 'show' 的输出"
msgid "failed to finish 'show' for object '%s'"
msgstr "无法为对象 '%s' å®Œæˆ 'show'"
-#: builtin/notes.c:174 builtin/tag.c:477
+#: builtin/notes.c:174 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "ä¸èƒ½åˆ›å»ºæ–‡ä»¶ '%s'"
@@ -8212,12 +8273,12 @@ msgstr "ä¸èƒ½å†™æ³¨è§£å¯¹è±¡"
msgid "The note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:232 builtin/tag.c:695
+#: builtin/notes.c:232 builtin/tag.c:440
#, c-format
msgid "cannot read '%s'"
msgstr "ä¸èƒ½è¯»å– '%s'"
-#: builtin/notes.c:234 builtin/tag.c:698
+#: builtin/notes.c:234 builtin/tag.c:443
#, c-format
msgid "could not open or read '%s'"
msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– '%s'"
@@ -8225,7 +8286,7 @@ msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– '%s'"
#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
-#: builtin/notes.c:877 builtin/tag.c:711
+#: builtin/notes.c:877 builtin/tag.c:456
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "æ— æ³•è§£æž '%s' 为一个有效引用。"
@@ -8259,11 +8320,6 @@ msgstr "注解内容作为一个字符串"
msgid "note contents in a file"
msgstr "注解内容到一个文件中"
-#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
-#: builtin/notes.c:564 builtin/tag.c:630
-msgid "object"
-msgstr "对象"
-
#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr "é‡ç”¨å’Œç¼–辑指定的注解对象"
@@ -8386,7 +8442,7 @@ msgstr "注解引用"
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1012 builtin/remote.c:1588
+#: builtin/notes.c:1012 builtin/remote.c:1647
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知å­å‘½ä»¤ï¼š%s"
@@ -8592,20 +8648,24 @@ msgstr "正在删除é‡å¤å¯¹è±¡"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
-#: builtin/prune.c:105 builtin/worktree.c:121
+#: builtin/prune.c:105 builtin/worktree.c:124
msgid "do not remove, show only"
msgstr "ä¸åˆ é™¤ï¼Œåªæ˜¾ç¤º"
-#: builtin/prune.c:106 builtin/worktree.c:122
+#: builtin/prune.c:106 builtin/worktree.c:125
msgid "report pruned objects"
msgstr "报告清除的对象"
-#: builtin/prune.c:109 builtin/worktree.c:124
+#: builtin/prune.c:109 builtin/worktree.c:127
msgid "expire objects older than <time>"
msgstr "使早于给定时间的对象过期"
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "ä¸èƒ½åœ¨çå“仓库中执行清ç†æ“作"
+
#: builtin/pull.c:69
-msgid "git pull [options] [<repository> [<refspec>...]]"
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
#: builtin/pull.c:113
@@ -8751,19 +8811,19 @@ msgstr "无法将多个分支åˆå¹¶åˆ°ç©ºåˆ†æ”¯ã€‚"
msgid "Cannot rebase onto multiple branches."
msgstr "无法å˜åŸºåˆ°å¤šä¸ªåˆ†æ”¯ã€‚"
-#: builtin/push.c:15
+#: builtin/push.c:16
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/push.c:86
+#: builtin/push.c:88
msgid "tag shorthand without <tag>"
msgstr "标签åŽé¢æœªæä¾› <标签> å‚æ•°"
-#: builtin/push.c:96
+#: builtin/push.c:98
msgid "--delete only accepts plain target ref names"
msgstr "--delete åªæŽ¥å—简å•çš„目标引用å"
-#: builtin/push.c:140
+#: builtin/push.c:142
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -8771,7 +8831,7 @@ msgstr ""
"\n"
"为了永久地选择任一选项,å‚è§ 'git help config' 中的 push.default。"
-#: builtin/push.c:143
+#: builtin/push.c:145
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -8795,7 +8855,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:158
+#: builtin/push.c:160
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -8809,7 +8869,7 @@ msgstr ""
"\n"
" git push %s HEAD:<远程分支åå­—>\n"
-#: builtin/push.c:172
+#: builtin/push.c:174
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -8822,12 +8882,12 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:180
+#: builtin/push.c:182
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "当å‰åˆ†æ”¯ %s 有多个上游分支,拒ç»æŽ¨é€ã€‚"
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -8838,7 +8898,7 @@ msgstr ""
"而没有告诉我è¦æŽ¨é€ä»€ä¹ˆã€æ›´æ–°å“ªä¸ªè¿œç¨‹åˆ†æ”¯ã€‚"
# 译者:字符串首行行首è¦æ·»åŠ â€œwarning: â€å­—串,故此首行è¦è¾ƒå…¶ä½™è¡ŒçŸ­
-#: builtin/push.c:206
+#: builtin/push.c:208
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -8881,12 +8941,12 @@ msgstr ""
"('simple' 模å¼ç”± Git 1.7.11 版本引入。如果您有时è¦ä½¿ç”¨è€ç‰ˆæœ¬çš„ Git,\n"
"为ä¿æŒå…¼å®¹ï¼Œè¯·ç”¨ 'current' 代替 'simple')"
-#: builtin/push.c:273
+#: builtin/push.c:275
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr "您没有为推é€æŒ‡å®šä»»ä½•å¼•ç”¨è§„格,并且 push.default 为 \"nothing\"。"
-#: builtin/push.c:280
+#: builtin/push.c:282
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -8897,7 +8957,7 @@ msgstr ""
"å†æ¬¡æŽ¨é€å‰ï¼Œå…ˆä¸Žè¿œç¨‹å˜æ›´åˆå¹¶ï¼ˆå¦‚ 'git pull ...')。详è§\n"
"'git push --help' 中的 'Note about fast-forwards' å°èŠ‚。"
-#: builtin/push.c:286
+#: builtin/push.c:288
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -8908,7 +8968,7 @@ msgstr ""
"检出该分支并整åˆè¿œç¨‹å˜æ›´ï¼ˆå¦‚ 'git pull ...'),然åŽå†æŽ¨é€ã€‚详è§\n"
"'git push --help' 中的 'Note about fast-forwards' å°èŠ‚。"
-#: builtin/push.c:292
+#: builtin/push.c:294
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -8921,11 +8981,11 @@ msgstr ""
"(如 'git pull ...')。\n"
"è¯¦è§ 'git push --help' 中的 'Note about fast-forwards' å°èŠ‚。"
-#: builtin/push.c:299
+#: builtin/push.c:301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "更新被拒ç»ï¼Œå› ä¸ºè¯¥æ ‡ç­¾åœ¨è¿œç¨‹å·²ç»å­˜åœ¨ã€‚"
-#: builtin/push.c:302
+#: builtin/push.c:304
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -8934,22 +8994,22 @@ msgstr ""
"如果ä¸ä½¿ç”¨ '--force' å‚数,您ä¸èƒ½æ›´æ–°ä¸€ä¸ªæŒ‡å‘éžæ交对象的远程引用,\n"
"也ä¸èƒ½æ›´æ–°è¿œç¨‹å¼•ç”¨è®©å…¶æŒ‡å‘一个éžæ交对象。\n"
-#: builtin/push.c:361
+#: builtin/push.c:363
#, c-format
msgid "Pushing to %s\n"
msgstr "推é€åˆ° %s\n"
-#: builtin/push.c:365
+#: builtin/push.c:367
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "无法推é€ä¸€äº›å¼•ç”¨åˆ° '%s'"
-#: builtin/push.c:395
+#: builtin/push.c:397
#, c-format
msgid "bad repository '%s'"
msgstr "å的仓库 '%s'"
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -8970,100 +9030,105 @@ msgstr ""
"\n"
" git push <å称>\n"
-#: builtin/push.c:411
+#: builtin/push.c:413
msgid "--all and --tags are incompatible"
msgstr "--all å’Œ --tags ä¸å…¼å®¹"
-#: builtin/push.c:412
+#: builtin/push.c:414
msgid "--all can't be combined with refspecs"
msgstr "--all ä¸èƒ½å’Œå¼•ç”¨è§„æ ¼åŒæ—¶ä½¿ç”¨"
-#: builtin/push.c:417
+#: builtin/push.c:419
msgid "--mirror and --tags are incompatible"
msgstr "--mirror å’Œ --tags ä¸å…¼å®¹"
-#: builtin/push.c:418
+#: builtin/push.c:420
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror ä¸èƒ½å’Œå¼•ç”¨è§„æ ¼åŒæ—¶ä½¿ç”¨"
-#: builtin/push.c:423
+#: builtin/push.c:425
msgid "--all and --mirror are incompatible"
msgstr "--all å’Œ --mirror ä¸å…¼å®¹"
-#: builtin/push.c:539
+#: builtin/push.c:537
msgid "repository"
msgstr "仓库"
-#: builtin/push.c:540 builtin/send-pack.c:161
+#: builtin/push.c:538 builtin/send-pack.c:161
msgid "push all refs"
msgstr "推é€æ‰€æœ‰å¼•ç”¨"
-#: builtin/push.c:541 builtin/send-pack.c:163
+#: builtin/push.c:539 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "é•œåƒæ‰€æœ‰å¼•ç”¨"
-#: builtin/push.c:543
+#: builtin/push.c:541
msgid "delete refs"
msgstr "删除引用"
-#: builtin/push.c:544
+#: builtin/push.c:542
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推é€æ ‡ç­¾ï¼ˆä¸èƒ½ä½¿ç”¨ --all or --mirror)"
-#: builtin/push.c:547 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:164
msgid "force updates"
msgstr "强制更新"
-#: builtin/push.c:549 builtin/send-pack.c:175
+#: builtin/push.c:547 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "引用å>:<期望值"
-#: builtin/push.c:550 builtin/send-pack.c:176
+#: builtin/push.c:548 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "è¦æ±‚引用旧的å–值为设定值"
-#: builtin/push.c:553
+# 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr "check|on-demand|no"
+
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr "控制å­æ¨¡ç»„的递归推é€"
-#: builtin/push.c:555 builtin/send-pack.c:169
+#: builtin/push.c:553 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "使用精简打包"
-#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
+#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "接收包程åº"
-#: builtin/push.c:558
+#: builtin/push.c:556
msgid "set upstream for git pull/status"
msgstr "设置 git pull/status 的上游"
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "prune locally removed refs"
msgstr "清除本地删除的引用"
-#: builtin/push.c:563
+#: builtin/push.c:561
msgid "bypass pre-push hook"
msgstr "绕过 pre-push é’©å­"
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "push missing but relevant tags"
msgstr "推é€ç¼ºå¤±ä½†æœ‰å…³çš„标签"
-#: builtin/push.c:567 builtin/send-pack.c:166
+#: builtin/push.c:565 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "用 GPG 为推é€ç­¾å"
-#: builtin/push.c:569 builtin/send-pack.c:170
+#: builtin/push.c:567 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "需è¦è¿œç«¯æ”¯æŒåŽŸå­äº‹åŠ¡"
-#: builtin/push.c:579
+#: builtin/push.c:577
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --allã€--mirror åŠ --tags ä¸å…¼å®¹"
-#: builtin/push.c:581
+#: builtin/push.c:579
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有æ„义"
@@ -9141,12 +9206,12 @@ msgstr "跳过应用稀ç–检出过滤器"
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
-#: builtin/reflog.c:432
+#: builtin/reflog.c:428
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„时间戳"
-#: builtin/reflog.c:549 builtin/reflog.c:554
+#: builtin/reflog.c:545 builtin/reflog.c:550
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„时间戳"
@@ -9163,15 +9228,15 @@ msgstr ""
"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <å称> <地å€>"
-#: builtin/remote.c:14 builtin/remote.c:33
+#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
msgstr "git remote rename <æ—§å称> <æ–°å称>"
-#: builtin/remote.c:15 builtin/remote.c:38
+#: builtin/remote.c:15 builtin/remote.c:39
msgid "git remote remove <name>"
msgstr "git remote remove <å称>"
-#: builtin/remote.c:16 builtin/remote.c:43
+#: builtin/remote.c:16 builtin/remote.c:44
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <å称> (-a | --auto | -d | --delete | <分支>)"
@@ -9192,48 +9257,52 @@ msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <å称> <分支>..."
-#: builtin/remote.c:21 builtin/remote.c:69
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <å称>"
+
+#: builtin/remote.c:22 builtin/remote.c:75
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <å称> <新的地å€> [<旧的地å€>]"
-#: builtin/remote.c:22 builtin/remote.c:70
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <å称> <新的地å€>"
-#: builtin/remote.c:23 builtin/remote.c:71
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <å称> <地å€>"
-#: builtin/remote.c:28
+#: builtin/remote.c:29
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<选项>] <å称> <地å€>"
-#: builtin/remote.c:48
+#: builtin/remote.c:49
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <å称> <分支>..."
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <å称> <分支>..."
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<选项>] <å称>"
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<选项>] <å称>"
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<选项>] [<组> | <远程>]..."
-#: builtin/remote.c:88
+#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
msgstr "更新 %s 中"
-#: builtin/remote.c:120
+#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -9241,96 +9310,96 @@ msgstr ""
"--mirror 选项å±é™©ä¸”过时,请使用 --mirror=fetch\n"
"\t 或 --mirror=push"
-#: builtin/remote.c:137
+#: builtin/remote.c:143
#, c-format
msgid "unknown mirror argument: %s"
msgstr "未知的镜åƒå‚数:%s"
-#: builtin/remote.c:153
+#: builtin/remote.c:159
msgid "fetch the remote branches"
msgstr "抓å–远程的分支"
-#: builtin/remote.c:155
+#: builtin/remote.c:161
msgid "import all tags and associated objects when fetching"
msgstr "抓å–时导入所有的标签和关è”对象"
-#: builtin/remote.c:158
+#: builtin/remote.c:164
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "或ä¸æŠ“å–任何标签(--no-tags)"
-#: builtin/remote.c:160
+#: builtin/remote.c:166
msgid "branch(es) to track"
msgstr "跟踪的分支"
-#: builtin/remote.c:161
+#: builtin/remote.c:167
msgid "master branch"
msgstr "主线分支"
-#: builtin/remote.c:162
+#: builtin/remote.c:168
msgid "push|fetch"
msgstr "push|fetch"
-#: builtin/remote.c:163
+#: builtin/remote.c:169
msgid "set up remote as a mirror to push to or fetch from"
msgstr "把远程设置为用以推é€æˆ–抓å–çš„é•œåƒ"
-#: builtin/remote.c:175
+#: builtin/remote.c:181
msgid "specifying a master branch makes no sense with --mirror"
msgstr "指定一个 master 分支并使用 --mirror 选项没有æ„义"
-#: builtin/remote.c:177
+#: builtin/remote.c:183
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定è¦è·Ÿè¸ªçš„分支åªåœ¨ä¸ŽèŽ·å–é•œåƒåŒæ—¶ä½¿ç”¨æ‰æœ‰æ„义"
-#: builtin/remote.c:187 builtin/remote.c:637
+#: builtin/remote.c:193 builtin/remote.c:643
#, c-format
msgid "remote %s already exists."
msgstr "远程 %s å·²ç»å­˜åœ¨ã€‚"
-#: builtin/remote.c:191 builtin/remote.c:641
+#: builtin/remote.c:197 builtin/remote.c:647
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„远程å称"
-#: builtin/remote.c:235
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "无法设置 master '%s'"
-#: builtin/remote.c:335
+#: builtin/remote.c:341
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "无法得到引用规格 %s 的获å–列表"
-#: builtin/remote.c:436 builtin/remote.c:444
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr "(匹é…)"
-#: builtin/remote.c:448
+#: builtin/remote.c:454
msgid "(delete)"
msgstr "(删除)"
-#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
+#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "ä¸èƒ½æ·»åŠ  '%s' 至 '%s'"
-#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
#, c-format
msgid "No such remote: %s"
msgstr "没有这样的远程:%s"
-#: builtin/remote.c:647
+#: builtin/remote.c:653
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "ä¸èƒ½é‡å‘½åé…ç½®å°èŠ‚ '%s' 到 '%s'"
-#: builtin/remote.c:653 builtin/remote.c:821
+#: builtin/remote.c:659 builtin/remote.c:827
#, c-format
msgid "Could not remove config section '%s'"
msgstr "ä¸èƒ½ç§»é™¤é…ç½®å°èŠ‚ '%s'"
-#: builtin/remote.c:668
+#: builtin/remote.c:674
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9341,27 +9410,27 @@ msgstr ""
"\t%s\n"
"\t如果必è¦è¯·æ‰‹åŠ¨æ›´æ–°é…置。"
-#: builtin/remote.c:674
+#: builtin/remote.c:680
#, c-format
msgid "Could not append '%s'"
msgstr "ä¸èƒ½è¿½åŠ  '%s'"
-#: builtin/remote.c:685
+#: builtin/remote.c:691
#, c-format
msgid "Could not set '%s'"
msgstr "ä¸èƒ½è®¾ç½® '%s'"
-#: builtin/remote.c:707
+#: builtin/remote.c:713
#, c-format
msgid "deleting '%s' failed"
msgstr "删除 '%s' 失败"
-#: builtin/remote.c:741
+#: builtin/remote.c:747
#, c-format
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:807
+#: builtin/remote.c:813
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9371,126 +9440,126 @@ msgid_plural ""
msgstr[0] "注æ„:ref/remotes 层级之外的一个分支未被移除。è¦åˆ é™¤å®ƒï¼Œä½¿ç”¨ï¼š"
msgstr[1] "注æ„:ref/remotes 层级之外的一些分支未被移除。è¦åˆ é™¤å®ƒä»¬ï¼Œä½¿ç”¨ï¼š"
-#: builtin/remote.c:922
+#: builtin/remote.c:928
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的(下一次获å–将存储于 remotes/%s)"
-#: builtin/remote.c:925
+#: builtin/remote.c:931
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:927
+#: builtin/remote.c:933
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时(使用 'git remote prune' æ¥ç§»é™¤ï¼‰"
-#: builtin/remote.c:929
+#: builtin/remote.c:935
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:970
+#: builtin/remote.c:976
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge,ä¸èƒ½å˜åŸºåˆ°ä¸€ä¸ªä»¥ä¸Šçš„分支"
-#: builtin/remote.c:977
+#: builtin/remote.c:983
#, c-format
msgid "rebases onto remote %s"
msgstr "å˜åŸºåˆ°è¿œç¨‹ %s"
-#: builtin/remote.c:980
+#: builtin/remote.c:986
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s åˆå¹¶"
-#: builtin/remote.c:981
+#: builtin/remote.c:987
msgid " and with remote"
msgstr " 且有远程"
-#: builtin/remote.c:983
+#: builtin/remote.c:989
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s åˆå¹¶"
-#: builtin/remote.c:984
+#: builtin/remote.c:990
msgid " and with remote"
msgstr " 且有远程"
-#: builtin/remote.c:1030
+#: builtin/remote.c:1036
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1033
+#: builtin/remote.c:1039
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1037
+#: builtin/remote.c:1043
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1040
+#: builtin/remote.c:1046
msgid "fast-forwardable"
msgstr "å¯å¿«è¿›"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1049
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推é€è‡³ %-*s (%s)"
-#: builtin/remote.c:1053
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推é€è‡³ %-*s (%s)"
-#: builtin/remote.c:1057
+#: builtin/remote.c:1063
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推é€è‡³ %s"
-#: builtin/remote.c:1060
+#: builtin/remote.c:1066
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推é€è‡³ %s"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
msgid "do not query remotes"
msgstr "ä¸æŸ¥è¯¢è¿œç¨‹"
-#: builtin/remote.c:1155
+#: builtin/remote.c:1161
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1162
#, c-format
msgid " Fetch URL: %s"
msgstr " 获å–地å€ï¼š%s"
-#: builtin/remote.c:1157 builtin/remote.c:1308
+#: builtin/remote.c:1163 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(æ—  URL)"
-#: builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr " 推é€åœ°å€ï¼š%s"
-#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支:%s"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1182
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支(远程 HEAD 模糊,å¯èƒ½æ˜¯ä¸‹åˆ—中的一个):\n"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -9498,138 +9567,151 @@ msgstr[0] " 远程分支:%s"
msgstr[1] " 远程分支:%s"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: builtin/remote.c:1191 builtin/remote.c:1218
+#: builtin/remote.c:1197 builtin/remote.c:1224
msgid " (status not queried)"
msgstr "(状æ€æœªæŸ¥è¯¢ï¼‰"
-#: builtin/remote.c:1200
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 为 'git pull' é…置的本地分支:"
msgstr[1] " 为 'git pull' é…置的本地分支:"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜åƒ"
-#: builtin/remote.c:1215
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 为 'git push' é…置的本地引用%s:"
msgstr[1] " 为 'git push' é…置的本地引用%s:"
-#: builtin/remote.c:1236
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "æ ¹æ®è¿œç¨‹è®¾ç½® refs/remotes/<å称>/HEAD"
-#: builtin/remote.c:1238
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<å称>/HEAD"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1273
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¼•ç”¨ï¼š%s"
-#: builtin/remote.c:1275
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "ä¸èƒ½è®¾ç½® %s"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/remote.c:1293
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s å°†æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/remote.c:1294
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼"
-#: builtin/remote.c:1304
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1305
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: builtin/remote.c:1321
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1369
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "抓å–åŽæ¸…除远程"
-#: builtin/remote.c:1435 builtin/remote.c:1509
+#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1455
+#: builtin/remote.c:1461
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1462
+#: builtin/remote.c:1468
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1484
+#: builtin/remote.c:1485
+msgid "query push URLs rather than fetch URLs"
+msgstr "æŸ¥è¯¢æŽ¨é€ URL 地å€ï¼Œè€ŒéžèŽ·å– URL 地å€"
+
+#: builtin/remote.c:1487
+msgid "return all URLs"
+msgstr "返回所有 URL 地å€"
+
+#: builtin/remote.c:1515
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "没有给远程仓库 '%s' 设定 URL"
+
+#: builtin/remote.c:1541
msgid "manipulate push URLs"
msgstr "æ“ä½œæŽ¨é€ URLS"
-#: builtin/remote.c:1486
+#: builtin/remote.c:1543
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1488
+#: builtin/remote.c:1545
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1552
msgid "--add --delete doesn't make sense"
msgstr "--add --delete æ— æ„义"
-#: builtin/remote.c:1535
+#: builtin/remote.c:1592
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹é…模版:%s"
-#: builtin/remote.c:1543
+#: builtin/remote.c:1600
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL:%s"
-#: builtin/remote.c:1545
+#: builtin/remote.c:1602
msgid "Will not delete all non-push URLs"
msgstr "å°†ä¸ä¼šåˆ é™¤æ‰€æœ‰éžæŽ¨é€ URL 地å€"
-#: builtin/remote.c:1559
+#: builtin/remote.c:1616
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出;必须置于å­å‘½ä»¤ä¹‹å‰"
@@ -9701,7 +9783,11 @@ msgstr "æ¯ä¸ªåŒ…文件的最大尺寸"
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象é‡æ–°æ‰“包"
-#: builtin/repack.c:378
+#: builtin/repack.c:197
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "ä¸èƒ½åˆ é™¤çå“仓库中的打包文件"
+
+#: builtin/repack.c:381
#, c-format
msgid "removing '%s' failed"
msgstr "删除 '%s' 失败"
@@ -9794,7 +9880,7 @@ msgstr "使用此格å¼"
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:57
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "在索引中注册干净的解决方案"
@@ -9930,23 +10016,23 @@ msgstr "ä¸èƒ½å†™å…¥æ–°çš„索引文件。"
msgid "rev-list does not support display of notes"
msgstr "rev-list ä¸æ”¯æŒæ˜¾ç¤ºæ³¨è§£"
-#: builtin/rev-parse.c:361
+#: builtin/rev-parse.c:358
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<选项>] -- [<å‚æ•°>...]"
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
msgstr "ä¿æŒ `--` 作为一个å‚数传递"
-#: builtin/rev-parse.c:368
+#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
msgstr "é‡åˆ°ç¬¬ä¸€ä¸ªéžé€‰é¡¹å‚æ•°åŽåœæ­¢è§£æž"
-#: builtin/rev-parse.c:371
+#: builtin/rev-parse.c:368
msgid "output in stuck long form"
msgstr "以固定长格å¼è¾“出"
-#: builtin/rev-parse.c:502
+#: builtin/rev-parse.c:499
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -10195,7 +10281,7 @@ msgstr "w[,i1[,i2]]"
msgid "Linewrap output"
msgstr "折行输出"
-#: builtin/show-branch.c:9
+#: builtin/show-branch.c:10
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -10207,71 +10293,71 @@ msgstr ""
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通é…符>)...]"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
msgstr "显示远程跟踪的和本地的分支"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
msgstr "显示远程跟踪的分支"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
msgstr "ç€è‰² '*!+-' 到相应的分支"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:646
msgid "show <n> more commits after the common ancestor"
msgstr "显示共åŒç¥–å…ˆåŽçš„ <n> 个æ交"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:648
msgid "synonym to more=-1"
msgstr "å’Œ more=-1 åŒä¹‰"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:649
msgid "suppress naming strings"
msgstr "ä¸æ˜¾ç¤ºå­—符串命å"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:651
msgid "include the current branch"
msgstr "包括当å‰åˆ†æ”¯"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:653
msgid "name commits with their object names"
msgstr "以对象å字命åæ交"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:655
msgid "show possible merge bases"
msgstr "显示å¯èƒ½åˆå¹¶çš„基线"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
msgstr "显示没有任何引用的的引用"
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:659
msgid "show commits in topological order"
msgstr "以拓扑顺åºæ˜¾ç¤ºæ交"
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:662
msgid "show only commits not on the first branch"
msgstr "åªæ˜¾ç¤ºä¸åœ¨ç¬¬ä¸€ä¸ªåˆ†æ”¯ä¸Šçš„æ交"
-#: builtin/show-branch.c:683
+#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支å¯è®¿é—®çš„åˆå¹¶æ交"
-#: builtin/show-branch.c:685
+#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
msgstr "拓扑方å¼æŽ’åºï¼Œå¹¶å°½å¯èƒ½åœ°ä¿æŒæ—¥æœŸé¡ºåº"
-#: builtin/show-branch.c:688
+#: builtin/show-branch.c:669
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:689
+#: builtin/show-branch.c:670
msgid "show <n> most recent ref-log entries starting at base"
msgstr "显示从 base 开始的 <n> æ¡æœ€è¿‘的引用日志记录"
@@ -10284,41 +10370,133 @@ msgstr ""
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模å¼>...]"
#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"
-msgstr "git show-ref --exclude-existing[=<模å¼>] < <引用列表>"
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<模å¼>]"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
msgstr "åªæ˜¾ç¤ºæ ‡ç­¾ï¼ˆå¯ä»¥å’Œå¤´å…±ç”¨ï¼‰"
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
msgstr "åªæ˜¾ç¤ºå¤´ï¼ˆå¯ä»¥å’Œæ ‡ç­¾å…±ç”¨ï¼‰"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
msgstr "更严格的引用检测,需è¦ç²¾ç¡®çš„引用路径"
-#: builtin/show-ref.c:175 builtin/show-ref.c:177
+#: builtin/show-ref.c:170 builtin/show-ref.c:172
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "显示 HEAD 引用,å³ä½¿è¢«è¿‡æ»¤æŽ‰"
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:174
msgid "dereference tags into object IDs"
msgstr "转æ¢æ ‡ç­¾åˆ°å¯¹è±¡ ID"
-#: builtin/show-ref.c:181
+#: builtin/show-ref.c:176
msgid "only show SHA1 hash using <n> digits"
msgstr "åªæ˜¾ç¤ºä½¿ç”¨ <n> 个数字的 SHA1 哈希"
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:180
msgid "do not print results to stdout (useful with --verify)"
msgstr "ä¸æ‰“å°ç»“果到标准输出(例如与 --verify å‚数共用)"
-#: builtin/show-ref.c:187
+#: builtin/show-ref.c:182
msgid "show refs from stdin that aren't in local repository"
msgstr "显示从标准输入中读入的ä¸åœ¨æœ¬åœ°ä»“库中的引用"
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr "跳过和移除所有的注释行"
+
+#: builtin/stripspace.c:38
+msgid "prepend comment character and blank to each line"
+msgstr "为æ¯ä¸€è¡Œçš„行首添加注释符和空格"
+
+#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+msgid "alternative anchor for relative paths"
+msgstr "相对路径的替代锚记(anchor)"
+
+#: builtin/submodule--helper.c:84
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
+
+#: builtin/submodule--helper.c:114
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <路径>"
+
+#: builtin/submodule--helper.c:120
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "在 .gitmodules 中没有å‘现路径 '%s' çš„å­æ¨¡ç»„映射"
+
+#: builtin/submodule--helper.c:170
+msgid "where the new submodule will be cloned to"
+msgstr "æ–°çš„å­æ¨¡ç»„å°†è¦å…‹éš†çš„路径"
+
+#: builtin/submodule--helper.c:173
+msgid "name of the new submodule"
+msgstr "æ–°å­æ¨¡ç»„çš„å称"
+
+#: builtin/submodule--helper.c:176
+msgid "url where to clone the submodule from"
+msgstr "克隆å­æ¨¡ç»„çš„ url 地å€"
+
+#: builtin/submodule--helper.c:182
+msgid "depth for shallow clones"
+msgstr "浅克隆的深度"
+
+#: builtin/submodule--helper.c:188
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+msgstr ""
+"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
+"[--name <åå­—>] [--url <地å€>][--depth <深度>] [--] [<路径>...]"
+
+#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
+#: builtin/submodule--helper.c:216
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'"
+
+#: builtin/submodule--helper.c:204
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "无法克隆 '%s' 到å­æ¨¡ç»„路径 '%s'"
+
+#: builtin/submodule--helper.c:227
+#, c-format
+msgid "cannot open file '%s'"
+msgstr "无法打开文件 '%s'"
+
+#: builtin/submodule--helper.c:232
+#, c-format
+msgid "could not close file %s"
+msgstr "无法关闭文件 %s"
+
+#: builtin/submodule--helper.c:247
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "无法得到 '%s' çš„å­æ¨¡ç»„目录"
+
+#: builtin/submodule--helper.c:273
+msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+msgstr "严é‡é”™è¯¯ï¼šsubmodule-helper å­å‘½ä»¤å¿…须由å¦å¤–çš„å­å‘½ä»¤è°ƒç”¨"
+
+#: builtin/submodule--helper.c:280
+#, c-format
+msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgstr "严é‡é”™è¯¯ï¼š'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ submodule--helper å­å‘½ä»¤"
+
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<选项>] <å称> [<引用>]"
@@ -10347,54 +10525,50 @@ msgstr "原因"
msgid "reason of the update"
msgstr "更新的原因"
-#: builtin/tag.c:22
+#: builtin/tag.c:23
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签å> [<头>]"
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid "git tag -d <tagname>..."
msgstr "git tag -d <标签å>..."
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[<pattern>...]"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-"git tag -l [-n[<æ•°å­—>]] [--contains <æ交>] [--points-at <对象>] [<模å¼>...]"
+"git tag -l [-n[<æ•°å­—>]] [--contains <æ交>] [--points-at <对象>]\n"
+"\t\t[--format=<æ ¼å¼>] [--[no-]merged [<æ交>]] [<模å¼>...]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -v <tagname>..."
msgstr "git tag -v <标签å>..."
-#: builtin/tag.c:69
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "éžæ³•çš„对象于 '%s'"
-
-#: builtin/tag.c:301
+#: builtin/tag.c:80
#, c-format
msgid "tag name too long: %.*s..."
msgstr "标签å称太长:%.*s..."
-#: builtin/tag.c:306
+#: builtin/tag.c:85
#, c-format
msgid "tag '%s' not found."
msgstr "未å‘现标签 '%s'。"
-#: builtin/tag.c:321
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'(曾为 %s)\n"
-#: builtin/tag.c:333
+#: builtin/tag.c:112
#, c-format
msgid "could not verify the tag '%s'"
msgstr "ä¸èƒ½æ ¡éªŒè¯¥æ ‡ç­¾ '%s'"
-#: builtin/tag.c:343
+#: builtin/tag.c:122
#, c-format
msgid ""
"\n"
@@ -10407,7 +10581,7 @@ msgstr ""
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:347
+#: builtin/tag.c:126
#, c-format
msgid ""
"\n"
@@ -10421,153 +10595,138 @@ msgstr ""
" %s\n"
"以 '%c' 开头的行将被ä¿ç•™ï¼Œå¦‚果您愿æ„也å¯ä»¥åˆ é™¤å®ƒä»¬ã€‚\n"
-#: builtin/tag.c:371
-#, c-format
-msgid "unsupported sort specification '%s'"
-msgstr "ä¸æ”¯æŒçš„排åºè§„æ ¼ '%s'"
-
-#: builtin/tag.c:373
-#, c-format
-msgid "unsupported sort specification '%s' in variable '%s'"
-msgstr "ä¸æ”¯æŒå˜é‡ '%2$s' 的排åºè§„æ ¼ '%1$s'"
-
-#: builtin/tag.c:428
+#: builtin/tag.c:199
msgid "unable to sign the tag"
msgstr "无法签署标签"
-#: builtin/tag.c:430
+#: builtin/tag.c:201
msgid "unable to write tag file"
msgstr "无法写标签文件"
-#: builtin/tag.c:455
+#: builtin/tag.c:226
msgid "bad object type."
msgstr "å的对象类型。"
-#: builtin/tag.c:468
+#: builtin/tag.c:239
msgid "tag header too big."
msgstr "标签头信æ¯å¤ªå¤§ã€‚"
-#: builtin/tag.c:504
+#: builtin/tag.c:275
msgid "no tag message?"
msgstr "无标签说明?"
-#: builtin/tag.c:510
+#: builtin/tag.c:281
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被ä¿ç•™åœ¨ %s\n"
-#: builtin/tag.c:559
-msgid "switch 'points-at' requires an object"
-msgstr "开关 'points-at' 需è¦ä¸€ä¸ªå¯¹è±¡"
-
-#: builtin/tag.c:561
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "éžæ³•çš„对象å '%s'"
-
-#: builtin/tag.c:590
+#: builtin/tag.c:339
msgid "list tag names"
msgstr "列出标签å称"
-#: builtin/tag.c:592
+#: builtin/tag.c:341
msgid "print <n> lines of each tag message"
msgstr "æ¯ä¸ªæ ‡ç­¾ä¿¡æ¯æ‰“å° <n> è¡Œ"
-#: builtin/tag.c:594
+#: builtin/tag.c:343
msgid "delete tags"
msgstr "删除标签"
-#: builtin/tag.c:595
+#: builtin/tag.c:344
msgid "verify tags"
msgstr "验è¯æ ‡ç­¾"
-#: builtin/tag.c:597
+#: builtin/tag.c:346
msgid "Tag creation options"
msgstr "标签创建选项"
-#: builtin/tag.c:599
+#: builtin/tag.c:348
msgid "annotated tag, needs a message"
msgstr "附注标签,需è¦ä¸€ä¸ªè¯´æ˜Ž"
-#: builtin/tag.c:601
+#: builtin/tag.c:350
msgid "tag message"
msgstr "标签说明"
-#: builtin/tag.c:603
+#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG ç­¾å的标签"
-#: builtin/tag.c:607
+#: builtin/tag.c:356
msgid "use another key to sign the tag"
msgstr "使用å¦å¤–çš„ç§é’¥ç­¾å该标签"
-#: builtin/tag.c:608
+#: builtin/tag.c:357
msgid "replace the tag if exists"
msgstr "如果存在,替æ¢çŽ°æœ‰çš„标签"
-#: builtin/tag.c:609 builtin/update-ref.c:368
+#: builtin/tag.c:358 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "创建引用日志"
-#: builtin/tag.c:611
+#: builtin/tag.c:360
msgid "Tag listing options"
msgstr "标签列表选项"
-#: builtin/tag.c:612
+#: builtin/tag.c:361
msgid "show tag list in columns"
msgstr "以列的方å¼æ˜¾ç¤ºæ ‡ç­¾åˆ—表"
-#: builtin/tag.c:614
-msgid "sort tags"
-msgstr "排åºæ ‡ç­¾"
-
-#: builtin/tag.c:619 builtin/tag.c:625
+#: builtin/tag.c:362 builtin/tag.c:363
msgid "print only tags that contain the commit"
msgstr "åªæ‰“å°åŒ…å«æ交的标签"
-#: builtin/tag.c:631
+#: builtin/tag.c:364
+msgid "print only tags that are merged"
+msgstr "åªæ‰“å°å·²ç»åˆå¹¶çš„标签"
+
+#: builtin/tag.c:365
+msgid "print only tags that are not merged"
+msgstr "åªæ‰“å°å°šæœªåˆå¹¶çš„标签"
+
+#: builtin/tag.c:370
msgid "print only tags of the object"
msgstr "åªæ‰“å°å¯¹è±¡çš„标签"
-#: builtin/tag.c:657
+#: builtin/tag.c:399
msgid "--column and -n are incompatible"
msgstr "--column å’Œ -n ä¸å…¼å®¹"
-#: builtin/tag.c:669
-msgid "--sort and -n are incompatible"
-msgstr "--sort å’Œ -n ä¸å…¼å®¹"
-
-#: builtin/tag.c:676
+#: builtin/tag.c:419
msgid "-n option is only allowed with -l."
msgstr "-n 选项åªå…许和 -l åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/tag.c:678
+#: builtin/tag.c:421
msgid "--contains option is only allowed with -l."
msgstr "--contains 选项åªå…许和 -l åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/tag.c:680
+#: builtin/tag.c:423
msgid "--points-at option is only allowed with -l."
msgstr "--points-at 选项åªå…许和 -l åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/tag.c:688
+#: builtin/tag.c:425
+msgid "--merged and --no-merged option are only allowed with -l"
+msgstr "选项 --merged å’Œ --no-merged åªèƒ½å’Œ -l 共用"
+
+#: builtin/tag.c:433
msgid "only one -F or -m option is allowed."
msgstr "åªå…许一个 -F 或 -m 选项。"
-#: builtin/tag.c:708
+#: builtin/tag.c:453
msgid "too many params"
msgstr "太多å‚æ•°"
-#: builtin/tag.c:714
+#: builtin/tag.c:459
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„标签å称。"
-#: builtin/tag.c:719
+#: builtin/tag.c:464
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:744
+#: builtin/tag.c:489
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'(曾为 %s)\n"
@@ -10826,76 +10985,80 @@ msgstr "git verify-tag [-v | --verbose] <标签>..."
msgid "print tag contents"
msgstr "打å°æ ‡ç­¾å†…容"
-#: builtin/worktree.c:13
-msgid "git worktree add [<options>] <path> <branch>"
-msgstr "git worktree add [<选项>] <路径> <分支>"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<选项>] <路径> [<分支>]"
-#: builtin/worktree.c:14
+#: builtin/worktree.c:16
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<选项>]"
-#: builtin/worktree.c:36
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<选项>]"
+
+#: builtin/worktree.c:39
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s:ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„目录"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:45
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s:gitdir 文件ä¸å­˜åœ¨"
-#: builtin/worktree.c:47
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%sï¼šæ— æ³•è¯»å– gitdir 文件 (%s)"
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s:无效的 gitdir 文件"
-#: builtin/worktree.c:74
+#: builtin/worktree.c:77
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%s:gitdir 文件的指å‘ä¸å­˜åœ¨"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:112
#, c-format
msgid "failed to remove: %s"
msgstr "无法删除:%s"
-#: builtin/worktree.c:198
+#: builtin/worktree.c:201
#, c-format
msgid "'%s' already exists"
msgstr "'%s' å·²ç»å­˜åœ¨"
-#: builtin/worktree.c:232
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'"
-#: builtin/worktree.c:268
+#: builtin/worktree.c:271
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "准备 %s (标识符 %s)"
-#: builtin/worktree.c:316
+#: builtin/worktree.c:319
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出分支 <branch> å³ä½¿å·²ç»è¢«æ£€å‡ºåˆ°å…¶å®ƒå·¥ä½œåŒº"
-#: builtin/worktree.c:318
+#: builtin/worktree.c:321
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:320
+#: builtin/worktree.c:323
msgid "create or reset a branch"
msgstr "创建或é‡ç½®ä¸€ä¸ªåˆ†æ”¯"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:324
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的æ交分离"
-#: builtin/worktree.c:328
+#: builtin/worktree.c:331
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-bã€-B å’Œ --detach 是互斥的"
@@ -11041,23 +11204,23 @@ msgstr "到期时间"
msgid "no-op (backward compatibility)"
msgstr "空æ“作(å‘åŽå…¼å®¹ï¼‰"
-#: parse-options.h:236
+#: parse-options.h:237
msgid "be more verbose"
msgstr "更加详细"
-#: parse-options.h:238
+#: parse-options.h:239
msgid "be more quiet"
msgstr "更加安é™"
-#: parse-options.h:244
+#: parse-options.h:245
msgid "use <n> digits to display SHA-1s"
msgstr "用 <n> ä½æ•°å­—显示 SHA-1 哈希值"
-#: rerere.h:28
+#: rerere.h:38
msgid "update the index with reused conflict resolution if possible"
msgstr "如果å¯èƒ½ï¼Œé‡ç”¨å†²çªè§£å†³æ›´æ–°ç´¢å¼•"
-#: git-bisect.sh:50
+#: git-bisect.sh:55
msgid "You need to start by \"git bisect start\""
msgstr "您需è¦æ‰§è¡Œ \"git bisect start\" æ¥å¼€å§‹"
@@ -11065,63 +11228,63 @@ msgstr "您需è¦æ‰§è¡Œ \"git bisect start\" æ¥å¼€å§‹"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:56
+#: git-bisect.sh:61
msgid "Do you want me to do it for you [Y/n]? "
msgstr "您想让我为您这样åšä¹ˆ[Y/n]? "
-#: git-bisect.sh:99
+#: git-bisect.sh:122
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "未能识别的选项:'$arg'"
-#: git-bisect.sh:103
+#: git-bisect.sh:126
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' 看起æ¥ä¸åƒæ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„版本"
-#: git-bisect.sh:132
+#: git-bisect.sh:155
msgid "Bad HEAD - I need a HEAD"
msgstr "åçš„ HEAD - 我需è¦ä¸€ä¸ª HEAD"
-#: git-bisect.sh:145
+#: git-bisect.sh:168
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr "检出 '$start_head' 失败。å°è¯• 'git bisect reset <有效分支>'。"
-#: git-bisect.sh:155
+#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
msgstr "ä¸ä¼šåœ¨åšäº† cg-seek 的树上åšäºŒåˆ†æŸ¥æ‰¾"
-#: git-bisect.sh:159
+#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
msgstr "åçš„ HEAD - 奇怪的符å·å¼•ç”¨"
-#: git-bisect.sh:211
+#: git-bisect.sh:234
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "åçš„ bisect_write å‚数:$state"
-#: git-bisect.sh:240
+#: git-bisect.sh:263
#, sh-format
msgid "Bad rev input: $arg"
msgstr "输入å的版本:$arg"
-#: git-bisect.sh:255
+#: git-bisect.sh:278
msgid "Please call 'bisect_state' with at least one argument."
msgstr "请在调用 'bisect_state' 时跟至少一个å‚数。"
-#: git-bisect.sh:267
+#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
msgstr "输入å的版本:$rev"
-#: git-bisect.sh:276
+#: git-bisect.sh:299
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' åªèƒ½å¸¦ä¸€ä¸ªå‚数。"
-#: git-bisect.sh:299
+#: git-bisect.sh:322
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "警告:在仅有一个å($TERM_BAD)æ交下进行二分查找。"
@@ -11130,11 +11293,11 @@ msgstr "警告:在仅有一个å($TERM_BAD)æ交下进行二分查找。
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:305
+#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
msgstr "您确认么[Y/n]? "
-#: git-bisect.sh:317
+#: git-bisect.sh:340
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -11143,7 +11306,7 @@ msgstr ""
"您需è¦ç»™æˆ‘至少一个好版本和一个å版本。\n"
"(为此您å¯ä»¥ç”¨ \"git bisect $bad_syn\" å’Œ \"git bisect $good_syn\" 命令。)"
-#: git-bisect.sh:320
+#: git-bisect.sh:343
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11154,16 +11317,16 @@ msgstr ""
"然åŽéœ€è¦æ供我至少一个好版本和一个å版本。\n"
"(为此您å¯ä»¥ç”¨ \"git bisect $bad_syn\" å’Œ \"git bisect $good_syn\" 命令。)"
-#: git-bisect.sh:391 git-bisect.sh:521
+#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
msgstr "我们没有在二分查找。"
-#: git-bisect.sh:398
+#: git-bisect.sh:421
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ交"
-#: git-bisect.sh:407
+#: git-bisect.sh:430
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -11172,25 +11335,25 @@ msgstr ""
"ä¸èƒ½æ£€å‡ºåŽŸå§‹ HEAD '$branch'。\n"
"å°è¯• 'git bisect reset <æ交>'。"
-#: git-bisect.sh:435
+#: git-bisect.sh:458
msgid "No logfile given"
msgstr "未æ供日志文件"
-#: git-bisect.sh:436
+#: git-bisect.sh:459
#, sh-format
msgid "cannot read $file for replaying"
msgstr "ä¸èƒ½è¯»å– $file æ¥é‡æ”¾"
-#: git-bisect.sh:455
+#: git-bisect.sh:480
msgid "?? what are you talking about?"
msgstr "?? 您在说什么?"
-#: git-bisect.sh:467
+#: git-bisect.sh:492
#, sh-format
msgid "running $command"
msgstr "è¿è¡Œ $command"
-#: git-bisect.sh:474
+#: git-bisect.sh:499
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11199,11 +11362,11 @@ msgstr ""
"二分查找è¿è¡Œå¤±è´¥ï¼š\n"
"命令 '$command' çš„é€€å‡ºç  $res å°äºŽ 0 或大于等于 128"
-#: git-bisect.sh:500
+#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
msgstr "二分查找ä¸èƒ½ç»§ç»­è¿è¡Œ"
-#: git-bisect.sh:506
+#: git-bisect.sh:531
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -11212,15 +11375,47 @@ msgstr ""
"二分查找è¿è¡Œå¤±è´¥ï¼š\n"
"'bisect_state $state' 退出ç ä¸º $res"
-#: git-bisect.sh:513
+#: git-bisect.sh:538
msgid "bisect run success"
msgstr "二分查找è¿è¡ŒæˆåŠŸ"
-#: git-bisect.sh:548
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "请使用两个ä¸åŒçš„术语"
+
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "'$term' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„å称"
+
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr "ä¸èƒ½ä½¿ç”¨å†…置命令 '$term' 作为术语"
+
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "ä¸èƒ½ä¿®æ”¹æœ¯è¯­ '$term' çš„å«ä¹‰"
+
+#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr "无效的命令:您当å‰æ­£å¤„于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "未定义术语"
+
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"å‚æ•° $arg 对命令 'git bisect terms' 无效。\n"
+"支æŒçš„选项有:--term-good|--term-old å’Œ --term-bad|--term-new。"
+
#: git-rebase.sh:57
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
@@ -11259,23 +11454,23 @@ msgstr "é’©å­ pre-rebase æ‹’ç»å˜åŸºæ“作。"
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "似乎正处于在 git-am 的执行过程中。无法å˜åŸºã€‚"
-#: git-rebase.sh:351
+#: git-rebase.sh:354
msgid "The --exec option must be used with the --interactive option"
msgstr "选项 --exec 必须和选项 --interactive åŒæ—¶ä½¿ç”¨"
-#: git-rebase.sh:356
+#: git-rebase.sh:359
msgid "No rebase in progress?"
msgstr "没有正在进行的å˜åŸºï¼Ÿ"
-#: git-rebase.sh:367
+#: git-rebase.sh:370
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo åªèƒ½ç”¨åœ¨äº¤äº’å¼å˜åŸºè¿‡ç¨‹ä¸­ã€‚"
-#: git-rebase.sh:374
+#: git-rebase.sh:377
msgid "Cannot read HEAD"
msgstr "ä¸èƒ½è¯»å– HEAD"
-#: git-rebase.sh:377
+#: git-rebase.sh:380
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11283,12 +11478,12 @@ msgstr ""
"您必须编辑所有的åˆå¹¶å†²çªï¼Œç„¶åŽé€šè¿‡ git add\n"
"命令将它们标记为已解决"
-#: git-rebase.sh:395
+#: git-rebase.sh:398
#, sh-format
msgid "Could not move back to $head_name"
msgstr "无法移回 $head_name"
-#: git-rebase.sh:414
+#: git-rebase.sh:417
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11307,64 +11502,64 @@ msgstr ""
"\t$cmd_clear_stale_rebase\n"
"然åŽå†é‡æ–°æ‰§è¡Œå˜åŸºæ“作。 为é¿å…丢失é‡è¦æ•°æ®ï¼Œæˆ‘å·²ç»åœæ­¢å½“å‰æ“作。"
-#: git-rebase.sh:465
+#: git-rebase.sh:468
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "无效的上游 $upstream_name"
-#: git-rebase.sh:489
+#: git-rebase.sh:492
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 有一个以上的åˆå¹¶åŸºå‡†"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:495 git-rebase.sh:499
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 没有åˆå¹¶åŸºå‡†"
-#: git-rebase.sh:501
+#: git-rebase.sh:504
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "没有指å‘一个有效的æ交:$onto_name"
-#: git-rebase.sh:524
+#: git-rebase.sh:527
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "严é‡é”™è¯¯ï¼šæ— æ­¤åˆ†æ”¯ï¼š$branch_name"
-#: git-rebase.sh:557
+#: git-rebase.sh:560
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: git-rebase.sh:562
+#: git-rebase.sh:565
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "创建了 autostash: $stash_abbrev"
-#: git-rebase.sh:566
+#: git-rebase.sh:569
msgid "Please commit or stash them."
msgstr "请æ交或为它们ä¿å­˜è¿›åº¦ã€‚"
-#: git-rebase.sh:586
+#: git-rebase.sh:589
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "当å‰åˆ†æ”¯ $branch_name 是最新的。"
-#: git-rebase.sh:590
+#: git-rebase.sh:593
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "当å‰åˆ†æ”¯ $branch_name 是最新的,强制å˜åŸºã€‚"
-#: git-rebase.sh:601
+#: git-rebase.sh:604
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "å˜æ›´ä»Ž $mb 到 $onto:"
-#: git-rebase.sh:610
+#: git-rebase.sh:613
msgid "First, rewinding head to replay your work on top of it..."
msgstr "首先,回退分支以便在上é¢é‡æ”¾æ‚¨çš„工作..."
-#: git-rebase.sh:620
+#: git-rebase.sh:623
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "快进 $branch_name 至 $onto_name。"
@@ -11437,112 +11632,97 @@ msgstr "无法ä¿å­˜å½“å‰çŠ¶æ€"
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区å˜æ›´"
-#: git-stash.sh:387
+#: git-stash.sh:405
#, sh-format
msgid "unknown option: $opt"
msgstr "未知选项: $opt"
-#: git-stash.sh:397
+#: git-stash.sh:415
msgid "No stash found."
msgstr "未å‘现 stash。"
-#: git-stash.sh:404
+#: git-stash.sh:422
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本:$REV"
-#: git-stash.sh:410
+#: git-stash.sh:428
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„引用"
-#: git-stash.sh:438
+#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' ä¸æ˜¯ stash æ ·æ交"
-#: git-stash.sh:449
+#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' ä¸æ˜¯ä¸€ä¸ª stash 引用"
-#: git-stash.sh:457
+#: git-stash.sh:475
msgid "unable to refresh index"
msgstr "无法刷新索引"
-#: git-stash.sh:461
+#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在åˆå¹¶è¿‡ç¨‹ä¸­æ¢å¤è¿›åº¦"
-#: git-stash.sh:469
+#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲çªã€‚å°è¯•ä¸ä½¿ç”¨ --index。"
-#: git-stash.sh:471
+#: git-stash.sh:489
msgid "Could not save index tree"
msgstr "ä¸èƒ½ä¿å­˜ç´¢å¼•æ ‘"
-#: git-stash.sh:505
+#: git-stash.sh:523
msgid "Cannot unstage modified files"
msgstr "无法将修改的文件å–消暂存"
-#: git-stash.sh:520
+#: git-stash.sh:538
msgid "Index was not unstashed."
msgstr "索引的进度没有被æ¢å¤ã€‚"
-#: git-stash.sh:543
+#: git-stash.sh:561
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
-#: git-stash.sh:544
+#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}:ä¸èƒ½ä¸¢å¼ƒè¿›åº¦æ¡ç›®"
-#: git-stash.sh:552
+#: git-stash.sh:570
msgid "No branch name specified"
msgstr "未指定分支å"
-#: git-stash.sh:624
+#: git-stash.sh:642
msgid "(To restore them type \"git stash apply\")"
msgstr "(为æ¢å¤æ•°æ®è¾“å…¥ \"git stash apply\")"
-#: git-submodule.sh:95
+#: git-submodule.sh:104
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "无法从 url '$remoteurl' 剥离一个组件"
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr "未在 .gitmodules 中å‘现路径 '$sm_path' çš„å­æ¨¡ç»„映射"
-
-#: git-submodule.sh:287
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr "无法克隆 '$url' 到å­æ¨¡ç»„路径 '$sm_path'"
-
-#: git-submodule.sh:296
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr "Gitdir '$a' 在å­æ¨¡ç»„路径 '$b' 之下或相å"
-
-#: git-submodule.sh:406
+#: git-submodule.sh:281
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "åªèƒ½åœ¨å·¥ä½œåŒºçš„顶级目录中使用相对路径"
-#: git-submodule.sh:416
+#: git-submodule.sh:291
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "仓库 URL:'$repo' 必须是ç»å¯¹è·¯å¾„或以 ./|../ 起始"
-#: git-submodule.sh:433
+#: git-submodule.sh:308
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' å·²ç»å­˜åœ¨äºŽç´¢å¼•ä¸­"
-#: git-submodule.sh:437
+#: git-submodule.sh:312
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11553,134 +11733,134 @@ msgstr ""
"$sm_path\n"
"如果您确实想添加它,使用 -f å‚数。"
-#: git-submodule.sh:455
+#: git-submodule.sh:330
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加ä½äºŽ '$sm_path' 的现存仓库到索引"
-#: git-submodule.sh:457
+#: git-submodule.sh:332
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ git 仓库"
-#: git-submodule.sh:465
+#: git-submodule.sh:340
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本地å‘现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
-#: git-submodule.sh:467
+#: git-submodule.sh:342
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr "如果您想é‡ç”¨æ­¤æœ¬åœ° git 目录而ä¸æ˜¯é‡æ–°å…‹éš†è‡ª"
-#: git-submodule.sh:469
+#: git-submodule.sh:344
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr "使用 '--force' å‚数。如果本地 git 目录ä¸æ˜¯æ­£ç¡®çš„仓库"
-#: git-submodule.sh:470
+#: git-submodule.sh:345
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr "或者您ä¸ç¡®å®šå…¶ä¸­å«ä¹‰ä½¿ç”¨ '--name' å‚数选择å¦å¤–一个å称。"
-#: git-submodule.sh:472
+#: git-submodule.sh:347
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "激活本地 git 目录到å­æ¨¡ç»„ '$sm_name'。"
-#: git-submodule.sh:484
+#: git-submodule.sh:359
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "ä¸èƒ½æ£€å‡ºå­æ¨¡ç»„ '$sm_path'"
-#: git-submodule.sh:489
+#: git-submodule.sh:364
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加å­æ¨¡ç»„ '$sm_path'"
-#: git-submodule.sh:498
+#: git-submodule.sh:373
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册å­æ¨¡ç»„ '$sm_path'"
-#: git-submodule.sh:542
+#: git-submodule.sh:417
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr "正在进入 '$prefix$displaypath'"
-#: git-submodule.sh:562
+#: git-submodule.sh:437
#, sh-format
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
msgstr "åœæ­¢äºŽ '$prefix$displaypath',脚本返回éžé›¶å€¼ã€‚"
-#: git-submodule.sh:608
+#: git-submodule.sh:483
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr "在 .gitmodules 中未找到å­æ¨¡ç»„路径 '$displaypath' çš„ url"
-#: git-submodule.sh:617
+#: git-submodule.sh:492
#, sh-format
msgid "Failed to register url for submodule path '$displaypath'"
msgstr "无法为å­æ¨¡ç»„路径 '$displaypath' 注册 url"
-#: git-submodule.sh:619
+#: git-submodule.sh:494
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr "å­æ¨¡ç»„ '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-submodule.sh:636
+#: git-submodule.sh:511
#, sh-format
msgid "Failed to register update mode for submodule path '$displaypath'"
msgstr "无法为å­æ¨¡ç»„路径 '$displaypath' 注册更新模å¼"
-#: git-submodule.sh:674
+#: git-submodule.sh:549
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr "使用 '.' 如果您真的想è¦å¯¹æ‰€æœ‰å­æ¨¡ç»„å–消åˆå§‹åŒ–"
-#: git-submodule.sh:691
+#: git-submodule.sh:566
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr "å­æ¨¡ç»„工作区 '$displaypath' 包å«ä¸€ä¸ª .git 目录"
-#: git-submodule.sh:692
+#: git-submodule.sh:567
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr "(使用 'rm -rf' 命令如果您真的想删除它åŠå…¶å…¨éƒ¨åŽ†å²ï¼‰"
-#: git-submodule.sh:698
+#: git-submodule.sh:573
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr "å­æ¨¡ç»„工作区 '$displaypath' 包å«æœ¬åœ°ä¿®æ”¹ï¼›ä½¿ç”¨ '-f' 丢弃它们"
-#: git-submodule.sh:701
+#: git-submodule.sh:576
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "已清除目录 '$displaypath'"
-#: git-submodule.sh:702
+#: git-submodule.sh:577
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "无法移除å­æ¨¡ç»„工作区 '$displaypath'"
-#: git-submodule.sh:705
+#: git-submodule.sh:580
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "ä¸èƒ½åˆ›å»ºç©ºçš„å­æ¨¡ç»„目录 '$displaypath'"
-#: git-submodule.sh:714
+#: git-submodule.sh:589
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "å­æ¨¡ç»„ '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-submodule.sh:830
+#: git-submodule.sh:705
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
@@ -11689,108 +11869,159 @@ msgstr ""
"å­æ¨¡ç»„路径 '$displaypath' 没有åˆå§‹åŒ–\n"
"也许您想用 'update --init'?"
-#: git-submodule.sh:843
+#: git-submodule.sh:718
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在å­æ¨¡ç»„路径 '$displaypath' 中找到当å‰ç‰ˆæœ¬"
-#: git-submodule.sh:852
+#: git-submodule.sh:727
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在å­æ¨¡ç»„路径 '$sm_path' 中获å–"
-#: git-submodule.sh:876
+#: git-submodule.sh:751
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "无法在å­æ¨¡ç»„路径 '$displaypath' 中获å–"
-#: git-submodule.sh:890
+#: git-submodule.sh:765
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在å­æ¨¡ç»„路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:891
+#: git-submodule.sh:766
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "å­æ¨¡ç»„路径 '$displaypath':检出 '$sha1'"
-#: git-submodule.sh:895
+#: git-submodule.sh:770
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在å­æ¨¡ç»„路径 '$displaypath' 中å˜åŸº '$sha1'"
-#: git-submodule.sh:896
+#: git-submodule.sh:771
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "å­æ¨¡ç»„路径 '$displaypath':å˜åŸºè‡³ '$sha1'"
-#: git-submodule.sh:901
+#: git-submodule.sh:776
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法åˆå¹¶ '$sha1' 到å­æ¨¡ç»„路径 '$displaypath' 中"
-#: git-submodule.sh:902
+#: git-submodule.sh:777
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "å­æ¨¡ç»„路径 '$displaypath':已åˆå¹¶å…¥ '$sha1'"
-#: git-submodule.sh:907
+#: git-submodule.sh:782
#, sh-format
msgid ""
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
msgstr "在å­æ¨¡ç»„路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:908
+#: git-submodule.sh:783
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr "å­æ¨¡ç»„路径 '$prefix$sm_path': '$command $sha1'"
-#: git-submodule.sh:938
+#: git-submodule.sh:813
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进å­æ¨¡ç»„路径 '$displaypath'"
-#: git-submodule.sh:1046
+#: git-submodule.sh:921
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached ä¸èƒ½å’Œé€‰é¡¹ --files åŒæ—¶ä½¿ç”¨"
-#: git-submodule.sh:1098
+#: git-submodule.sh:973
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "æ„å¤–çš„æ¨¡å¼ $mod_dst"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: git-submodule.sh:1118
+#: git-submodule.sh:993
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告:$display_name 未包å«æ交 $sha1_src"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: git-submodule.sh:1121
+#: git-submodule.sh:996
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告:$display_name 未包å«æ交 $sha1_dst"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: git-submodule.sh:1124
+#: git-submodule.sh:999
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告:$display_name 未包å«æ交 $sha1_src å’Œ $sha1_dst"
-#: git-submodule.sh:1149
+#: git-submodule.sh:1024
msgid "blob"
msgstr "æ•°æ®å¯¹è±¡"
-#: git-submodule.sh:1267
+#: git-submodule.sh:1142
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进å­æ¨¡ç»„路径 '$sm_path'"
-#: git-submodule.sh:1331
+#: git-submodule.sh:1206
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "为 '$displaypath' åŒæ­¥å­æ¨¡ç»„ url"
+#~ msgid "unable to look up current user in the passwd file: %s"
+#~ msgstr "无法在å£ä»¤æ–‡ä»¶ä¸­æŸ¥è¯¢åˆ°å½“å‰ç”¨æˆ·ï¼š%s"
+
+#~ msgid "no such user"
+#~ msgstr "无此用户"
+
+#~ msgid "show usage"
+#~ msgstr "显示用法"
+
+#~ msgid "branch '%s' does not point at a commit"
+#~ msgstr "分支 '%s' 未指å‘一个æ交"
+
+#~ msgid "object '%s' does not point to a commit"
+#~ msgstr "对象 '%s' 没有指å‘一个æ交"
+
+#~ msgid "print only merged branches"
+#~ msgstr "åªæ‰“å°åˆå¹¶çš„分支"
+
+#~ msgid "--dissociate given, but there is no --reference"
+#~ msgstr "æ供了å‚æ•° --dissociate,但未æä¾› --reference"
+
+#~ msgid "insanely long template name %s"
+#~ msgstr "太长的模版å %s"
+
+#~ msgid "insanely long symlink %s"
+#~ msgstr "太长的符å·é“¾æŽ¥ %s"
+
+#~ msgid "insanely long template path %s"
+#~ msgstr "太长的模版路径 %s"
+
+#~ msgid "insane git directory %s"
+#~ msgstr "ä¸æ­£å¸¸çš„ git 目录 %s"
+
+#~ msgid "unsupported sort specification '%s'"
+#~ msgstr "ä¸æ”¯æŒçš„排åºè§„æ ¼ '%s'"
+
+#~ msgid "unsupported sort specification '%s' in variable '%s'"
+#~ msgstr "ä¸æ”¯æŒå˜é‡ '%2$s' 的排åºè§„æ ¼ '%1$s'"
+
+#~ msgid "switch 'points-at' requires an object"
+#~ msgstr "开关 'points-at' 需è¦ä¸€ä¸ªå¯¹è±¡"
+
+#~ msgid "sort tags"
+#~ msgstr "排åºæ ‡ç­¾"
+
+#~ msgid "--sort and -n are incompatible"
+#~ msgstr "--sort å’Œ -n ä¸å…¼å®¹"
+
+#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
+#~ msgstr "Gitdir '$a' 在å­æ¨¡ç»„路径 '$b' 之下或相å"
+
#~ msgid "false|true|preserve"
#~ msgstr "false|true|preserve"
diff --git a/read-cache.c b/read-cache.c
index 56614d5..d9fb78b 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -327,7 +327,7 @@ int ie_match_stat(const struct index_state *istate,
* by definition never matches what is in the work tree until it
* actually gets added.
*/
- if (ce->ce_flags & CE_INTENT_TO_ADD)
+ if (ce_intent_to_add(ce))
return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
changed = ce_match_stat_basic(ce, st);
@@ -1237,7 +1237,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
if (cache_errno == ENOENT)
fmt = deleted_fmt;
- else if (ce->ce_flags & CE_INTENT_TO_ADD)
+ else if (ce_intent_to_add(ce))
fmt = added_fmt; /* must be before other checks */
else if (changed & TYPE_CHANGED)
fmt = typechange_fmt;
diff --git a/ref-filter.c b/ref-filter.c
index 7bef7f8..f097176 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -763,6 +763,29 @@ static inline char *copy_advance(char *dst, const char *src)
return dst;
}
+static const char *strip_ref_components(const char *refname, const char *nr_arg)
+{
+ char *end;
+ long nr = strtol(nr_arg, &end, 10);
+ long remaining = nr;
+ const char *start = refname;
+
+ if (nr < 1 || *end != '\0')
+ die(":strip= requires a positive integer argument");
+
+ while (remaining) {
+ switch (*start++) {
+ case '\0':
+ die("ref '%s' does not have %ld components to :strip",
+ refname, nr);
+ case '/':
+ remaining--;
+ break;
+ }
+ }
+ return start;
+}
+
/*
* Parse the object referred by ref, and grab needed value.
*/
@@ -909,11 +932,14 @@ static void populate_value(struct ref_array_item *ref)
formatp = strchr(name, ':');
if (formatp) {
int num_ours, num_theirs;
+ const char *arg;
formatp++;
if (!strcmp(formatp, "short"))
refname = shorten_unambiguous_ref(refname,
warn_ambiguous_refs);
+ else if (skip_prefix(formatp, "strip=", &arg))
+ refname = strip_ref_components(refname, arg);
else if (!strcmp(formatp, "track") &&
(starts_with(name, "upstream") ||
starts_with(name, "push"))) {
diff --git a/reflog-walk.c b/reflog-walk.c
index 85b8a54..0ebd1da 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -221,6 +221,7 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
struct commit_info *commit_info =
get_commit_info(commit, &info->reflogs, 0);
struct commit_reflog *commit_reflog;
+ struct object *logobj;
struct reflog_info *reflog;
info->last_commit_reflog = NULL;
@@ -232,15 +233,20 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
commit->parents = NULL;
return;
}
-
- reflog = &commit_reflog->reflogs->items[commit_reflog->recno];
info->last_commit_reflog = commit_reflog;
- commit_reflog->recno--;
- commit_info->commit = (struct commit *)parse_object(reflog->osha1);
- if (!commit_info->commit) {
+
+ do {
+ reflog = &commit_reflog->reflogs->items[commit_reflog->recno];
+ commit_reflog->recno--;
+ logobj = parse_object(reflog->osha1);
+ } while (commit_reflog->recno && (logobj && logobj->type != OBJ_COMMIT));
+
+ if (!logobj || logobj->type != OBJ_COMMIT) {
+ commit_info->commit = NULL;
commit->parents = NULL;
return;
}
+ commit_info->commit = (struct commit *)logobj;
commit->parents = xcalloc(1, sizeof(struct commit_list));
commit->parents->item = commit_info->commit;
diff --git a/refs.h b/refs.h
index 7a04077..3c3da29 100644
--- a/refs.h
+++ b/refs.h
@@ -292,7 +292,7 @@ extern char *shorten_unambiguous_ref(const char *refname, int strict);
/** rename ref, return 0 on success **/
extern int rename_ref(const char *oldref, const char *newref, const char *logmsg);
-extern int create_symref(const char *ref, const char *refs_heads_master, const char *logmsg);
+extern int create_symref(const char *refname, const char *target, const char *logmsg);
enum action_on_err {
UPDATE_REFS_MSG_ON_ERR,
diff --git a/refs/files-backend.c b/refs/files-backend.c
index c648b5e..b569762 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -933,6 +933,10 @@ static void clear_loose_ref_cache(struct ref_cache *refs)
}
}
+/*
+ * Create a new submodule ref cache and add it to the internal
+ * set of caches.
+ */
static struct ref_cache *create_ref_cache(const char *submodule)
{
int len;
@@ -942,16 +946,12 @@ static struct ref_cache *create_ref_cache(const char *submodule)
len = strlen(submodule) + 1;
refs = xcalloc(1, sizeof(struct ref_cache) + len);
memcpy(refs->name, submodule, len);
+ refs->next = submodule_ref_caches;
+ submodule_ref_caches = refs;
return refs;
}
-/*
- * Return a pointer to a ref_cache for the specified submodule. For
- * the main repository, use submodule==NULL. The returned structure
- * will be allocated and initialized but not necessarily populated; it
- * should not be freed.
- */
-static struct ref_cache *get_ref_cache(const char *submodule)
+static struct ref_cache *lookup_ref_cache(const char *submodule)
{
struct ref_cache *refs;
@@ -961,10 +961,20 @@ static struct ref_cache *get_ref_cache(const char *submodule)
for (refs = submodule_ref_caches; refs; refs = refs->next)
if (!strcmp(submodule, refs->name))
return refs;
+ return NULL;
+}
- refs = create_ref_cache(submodule);
- refs->next = submodule_ref_caches;
- submodule_ref_caches = refs;
+/*
+ * Return a pointer to a ref_cache for the specified submodule. For
+ * the main repository, use submodule==NULL. The returned structure
+ * will be allocated and initialized but not necessarily populated; it
+ * should not be freed.
+ */
+static struct ref_cache *get_ref_cache(const char *submodule)
+{
+ struct ref_cache *refs = lookup_ref_cache(submodule);
+ if (!refs)
+ refs = create_ref_cache(submodule);
return refs;
}
@@ -1336,16 +1346,24 @@ static int resolve_gitlink_ref_recursive(struct ref_cache *refs,
int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sha1)
{
int len = strlen(path), retval;
- char *submodule;
+ struct strbuf submodule = STRBUF_INIT;
struct ref_cache *refs;
while (len && path[len-1] == '/')
len--;
if (!len)
return -1;
- submodule = xstrndup(path, len);
- refs = get_ref_cache(submodule);
- free(submodule);
+
+ strbuf_add(&submodule, path, len);
+ refs = lookup_ref_cache(submodule.buf);
+ if (!refs) {
+ if (!is_nonbare_repository_dir(&submodule)) {
+ strbuf_release(&submodule);
+ return -1;
+ }
+ refs = create_ref_cache(submodule.buf);
+ }
+ strbuf_release(&submodule);
retval = resolve_gitlink_ref_recursive(refs, refname, sha1, 0);
return retval;
@@ -1840,12 +1858,17 @@ static int verify_lock(struct ref_lock *lock,
if (read_ref_full(lock->ref_name,
mustexist ? RESOLVE_REF_READING : 0,
lock->old_oid.hash, NULL)) {
- int save_errno = errno;
- strbuf_addf(err, "can't verify ref %s", lock->ref_name);
- errno = save_errno;
- return -1;
+ if (old_sha1) {
+ int save_errno = errno;
+ strbuf_addf(err, "can't verify ref %s", lock->ref_name);
+ errno = save_errno;
+ return -1;
+ } else {
+ hashclr(lock->old_oid.hash);
+ return 0;
+ }
}
- if (hashcmp(lock->old_oid.hash, old_sha1)) {
+ if (old_sha1 && hashcmp(lock->old_oid.hash, old_sha1)) {
strbuf_addf(err, "ref %s is at %s but expected %s",
lock->ref_name,
sha1_to_hex(lock->old_oid.hash),
@@ -1882,7 +1905,8 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
const char *orig_refname = refname;
struct ref_lock *lock;
int last_errno = 0;
- int type, lflags;
+ int type;
+ int lflags = 0;
int mustexist = (old_sha1 && !is_null_sha1(old_sha1));
int resolve_flags = 0;
int attempts_remaining = 3;
@@ -1893,10 +1917,11 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
if (mustexist)
resolve_flags |= RESOLVE_REF_READING;
- if (flags & REF_DELETING) {
+ if (flags & REF_DELETING)
resolve_flags |= RESOLVE_REF_ALLOW_BAD_NAME;
- if (flags & REF_NODEREF)
- resolve_flags |= RESOLVE_REF_NO_RECURSE;
+ if (flags & REF_NODEREF) {
+ resolve_flags |= RESOLVE_REF_NO_RECURSE;
+ lflags |= LOCK_NO_DEREF;
}
refname = resolve_ref_unsafe(refname, resolve_flags,
@@ -1932,6 +1957,10 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
goto error_return;
}
+
+ if (flags & REF_NODEREF)
+ refname = orig_refname;
+
/*
* If the ref did not exist and we are creating it, make sure
* there is no existing packed ref whose name begins with our
@@ -1947,11 +1976,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
lock->lk = xcalloc(1, sizeof(struct lock_file));
- lflags = 0;
- if (flags & REF_NODEREF) {
- refname = orig_refname;
- lflags |= LOCK_NO_DEREF;
- }
lock->ref_name = xstrdup(refname);
lock->orig_ref_name = xstrdup(orig_refname);
strbuf_git_path(&ref_file, "%s", refname);
@@ -1985,7 +2009,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
goto error_return;
}
}
- if (old_sha1 && verify_lock(lock, old_sha1, mustexist, err)) {
+ if (verify_lock(lock, old_sha1, mustexist, err)) {
last_errno = errno;
goto error_return;
}
@@ -2811,73 +2835,72 @@ static int commit_ref_update(struct ref_lock *lock,
return 0;
}
-int create_symref(const char *ref_target, const char *refs_heads_master,
- const char *logmsg)
+static int create_ref_symlink(struct ref_lock *lock, const char *target)
{
- char *lockpath = NULL;
- char ref[1000];
- int fd, len, written;
- char *git_HEAD = git_pathdup("%s", ref_target);
- unsigned char old_sha1[20], new_sha1[20];
- struct strbuf err = STRBUF_INIT;
-
- if (logmsg && read_ref(ref_target, old_sha1))
- hashclr(old_sha1);
-
- if (safe_create_leading_directories(git_HEAD) < 0)
- return error("unable to create directory for %s", git_HEAD);
-
+ int ret = -1;
#ifndef NO_SYMLINK_HEAD
- if (prefer_symlink_refs) {
- unlink(git_HEAD);
- if (!symlink(refs_heads_master, git_HEAD))
- goto done;
+ char *ref_path = get_locked_file_path(lock->lk);
+ unlink(ref_path);
+ ret = symlink(target, ref_path);
+ free(ref_path);
+
+ if (ret)
fprintf(stderr, "no symlink - falling back to symbolic ref\n");
- }
#endif
+ return ret;
+}
- len = snprintf(ref, sizeof(ref), "ref: %s\n", refs_heads_master);
- if (sizeof(ref) <= len) {
- error("refname too long: %s", refs_heads_master);
- goto error_free_return;
- }
- lockpath = mkpathdup("%s.lock", git_HEAD);
- fd = open(lockpath, O_CREAT | O_EXCL | O_WRONLY, 0666);
- if (fd < 0) {
- error("Unable to open %s for writing", lockpath);
- goto error_free_return;
- }
- written = write_in_full(fd, ref, len);
- if (close(fd) != 0 || written != len) {
- error("Unable to write to %s", lockpath);
- goto error_unlink_return;
- }
- if (rename(lockpath, git_HEAD) < 0) {
- error("Unable to create %s", git_HEAD);
- goto error_unlink_return;
- }
- if (adjust_shared_perm(git_HEAD)) {
- error("Unable to fix permissions on %s", lockpath);
- error_unlink_return:
- unlink_or_warn(lockpath);
- error_free_return:
- free(lockpath);
- free(git_HEAD);
- return -1;
+static void update_symref_reflog(struct ref_lock *lock, const char *refname,
+ const char *target, const char *logmsg)
+{
+ struct strbuf err = STRBUF_INIT;
+ unsigned char new_sha1[20];
+ if (logmsg && !read_ref(target, new_sha1) &&
+ log_ref_write(refname, lock->old_oid.hash, new_sha1, logmsg, 0, &err)) {
+ error("%s", err.buf);
+ strbuf_release(&err);
}
- free(lockpath);
+}
-#ifndef NO_SYMLINK_HEAD
- done:
-#endif
- if (logmsg && !read_ref(refs_heads_master, new_sha1) &&
- log_ref_write(ref_target, old_sha1, new_sha1, logmsg, 0, &err)) {
+static int create_symref_locked(struct ref_lock *lock, const char *refname,
+ const char *target, const char *logmsg)
+{
+ if (prefer_symlink_refs && !create_ref_symlink(lock, target)) {
+ update_symref_reflog(lock, refname, target, logmsg);
+ return 0;
+ }
+
+ if (!fdopen_lock_file(lock->lk, "w"))
+ return error("unable to fdopen %s: %s",
+ lock->lk->tempfile.filename.buf, strerror(errno));
+
+ update_symref_reflog(lock, refname, target, logmsg);
+
+ /* no error check; commit_ref will check ferror */
+ fprintf(lock->lk->tempfile.fp, "ref: %s\n", target);
+ if (commit_ref(lock) < 0)
+ return error("unable to write symref for %s: %s", refname,
+ strerror(errno));
+ return 0;
+}
+
+int create_symref(const char *refname, const char *target, const char *logmsg)
+{
+ struct strbuf err = STRBUF_INIT;
+ struct ref_lock *lock;
+ int ret;
+
+ lock = lock_ref_sha1_basic(refname, NULL, NULL, NULL, REF_NODEREF, NULL,
+ &err);
+ if (!lock) {
error("%s", err.buf);
strbuf_release(&err);
+ return -1;
}
- free(git_HEAD);
- return 0;
+ ret = create_symref_locked(lock, refname, target, logmsg);
+ unlock_ref(lock);
+ return ret;
}
int reflog_exists(const char *refname)
diff --git a/remote-curl.c b/remote-curl.c
index f404faf..c704857 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -827,7 +827,7 @@ static void parse_fetch(struct strbuf *buf)
die("http transport does not support %s", buf->buf);
strbuf_reset(buf);
- if (strbuf_getline(buf, stdin, '\n') == EOF)
+ if (strbuf_getline_lf(buf, stdin) == EOF)
return;
if (!*buf->buf)
break;
@@ -940,7 +940,7 @@ static void parse_push(struct strbuf *buf)
die("http transport does not support %s", buf->buf);
strbuf_reset(buf);
- if (strbuf_getline(buf, stdin, '\n') == EOF)
+ if (strbuf_getline_lf(buf, stdin) == EOF)
goto free_specs;
if (!*buf->buf)
break;
@@ -990,7 +990,7 @@ int main(int argc, const char **argv)
do {
const char *arg;
- if (strbuf_getline(&buf, stdin, '\n') == EOF) {
+ if (strbuf_getline_lf(&buf, stdin) == EOF) {
if (ferror(stdin))
error("remote-curl: error reading command stream from git");
return 1;
diff --git a/remote-testsvn.c b/remote-testsvn.c
index f599c37..f05ff45 100644
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -154,7 +154,7 @@ static void check_or_regenerate_marks(int latestrev)
fclose(marksfile);
} else {
strbuf_addf(&sb, ":%d ", latestrev);
- while (strbuf_getline(&line, marksfile, '\n') != EOF) {
+ while (strbuf_getline_lf(&line, marksfile) != EOF) {
if (starts_with(line.buf, sb.buf)) {
found++;
break;
@@ -322,7 +322,7 @@ int main(int argc, char **argv)
marksfilename = marksfilename_sb.buf;
while (1) {
- if (strbuf_getline(&buf, stdin, '\n') == EOF) {
+ if (strbuf_getline_lf(&buf, stdin) == EOF) {
if (ferror(stdin))
die("Error reading command stream");
else
diff --git a/remote.c b/remote.c
index 9d34b5a..35940a5 100644
--- a/remote.c
+++ b/remote.c
@@ -256,7 +256,7 @@ static void read_remotes_file(struct remote *remote)
if (!f)
return;
remote->origin = REMOTE_REMOTES;
- while (strbuf_getline(&buf, f, '\n') != EOF) {
+ while (strbuf_getline(&buf, f) != EOF) {
const char *v;
strbuf_rtrim(&buf);
@@ -281,7 +281,7 @@ static void read_branches_file(struct remote *remote)
if (!f)
return;
- strbuf_getline(&buf, f, '\n');
+ strbuf_getline_lf(&buf, f);
fclose(f);
strbuf_trim(&buf);
if (!buf.len) {
@@ -428,6 +428,9 @@ static int handle_config(const char *key, const char *value, void *cb)
} else if (!strcmp(subkey, ".proxy")) {
return git_config_string((const char **)&remote->http_proxy,
key, value);
+ } else if (!strcmp(subkey, ".proxyauthmethod")) {
+ return git_config_string((const char **)&remote->http_proxy_authmethod,
+ key, value);
} else if (!strcmp(subkey, ".vcs")) {
return git_config_string(&remote->foreign_vcs, key, value);
}
diff --git a/remote.h b/remote.h
index 4a039ba..4fd7a0f 100644
--- a/remote.h
+++ b/remote.h
@@ -54,6 +54,7 @@ struct remote {
* for curl remotes only
*/
char *http_proxy;
+ char *http_proxy_authmethod;
};
struct remote *remote_get(const char *name);
diff --git a/revision.c b/revision.c
index 9404a05..f24ead5 100644
--- a/revision.c
+++ b/revision.c
@@ -294,9 +294,8 @@ static struct commit *handle_commit(struct rev_info *revs,
/*
* We'll handle the tagged object by looping or dropping
* through to the non-tag handlers below. Do not
- * propagate data from the tag's pending entry.
+ * propagate path data from the tag's pending entry.
*/
- name = "";
path = NULL;
mode = 0;
}
@@ -1636,10 +1635,7 @@ static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
struct cmdline_pathspec *prune)
{
- while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
- int len = sb->len;
- if (len && sb->buf[len - 1] == '\n')
- sb->buf[--len] = '\0';
+ while (strbuf_getline(sb, stdin) != EOF) {
ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
prune->path[prune->nr++] = xstrdup(sb->buf);
}
@@ -1656,10 +1652,8 @@ static void read_revisions_from_stdin(struct rev_info *revs,
warn_on_object_refname_ambiguity = 0;
strbuf_init(&sb, 1000);
- while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
+ while (strbuf_getline(&sb, stdin) != EOF) {
int len = sb.len;
- if (len && sb.buf[len - 1] == '\n')
- sb.buf[--len] = '\0';
if (!len)
break;
if (sb.buf[0] == '-') {
@@ -2050,7 +2044,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
} else if (!strcmp(arg, "--ignore-missing")) {
revs->ignore_missing = 1;
} else {
- int opts = diff_opt_parse(&revs->diffopt, argv, argc);
+ int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
if (!opts)
unkv[(*unkc)++] = arg;
return opts;
diff --git a/revision.h b/revision.h
index 5bc9686..23857c0 100644
--- a/revision.h
+++ b/revision.h
@@ -135,6 +135,7 @@ struct rev_info {
pretty_given:1,
abbrev_commit:1,
abbrev_commit_given:1,
+ zero_commit:1,
use_terminator:1,
missing_newline:1,
date_mode_explicit:1,
diff --git a/run-command.c b/run-command.c
index 13fa452..cdf0184 100644
--- a/run-command.c
+++ b/run-command.c
@@ -3,6 +3,8 @@
#include "exec_cmd.h"
#include "sigchain.h"
#include "argv-array.h"
+#include "thread-utils.h"
+#include "strbuf.h"
void child_process_init(struct child_process *child)
{
@@ -245,7 +247,7 @@ static int wait_or_whine(pid_t pid, const char *argv0, int in_signal)
error("waitpid is confused (%s)", argv0);
} else if (WIFSIGNALED(status)) {
code = WTERMSIG(status);
- if (code != SIGINT && code != SIGQUIT)
+ if (code != SIGINT && code != SIGQUIT && code != SIGPIPE)
error("%s died of signal %d", argv0, code);
/*
* This return value is chosen so that code & 0xff
@@ -865,3 +867,336 @@ int capture_command(struct child_process *cmd, struct strbuf *buf, size_t hint)
close(cmd->out);
return finish_command(cmd);
}
+
+enum child_state {
+ GIT_CP_FREE,
+ GIT_CP_WORKING,
+ GIT_CP_WAIT_CLEANUP,
+};
+
+struct parallel_processes {
+ void *data;
+
+ int max_processes;
+ int nr_processes;
+
+ get_next_task_fn get_next_task;
+ start_failure_fn start_failure;
+ task_finished_fn task_finished;
+
+ struct {
+ enum child_state state;
+ struct child_process process;
+ struct strbuf err;
+ void *data;
+ } *children;
+ /*
+ * The struct pollfd is logically part of *children,
+ * but the system call expects it as its own array.
+ */
+ struct pollfd *pfd;
+
+ unsigned shutdown : 1;
+
+ int output_owner;
+ struct strbuf buffered_output; /* of finished children */
+};
+
+static int default_start_failure(struct child_process *cp,
+ struct strbuf *err,
+ void *pp_cb,
+ void *pp_task_cb)
+{
+ int i;
+
+ strbuf_addstr(err, "Starting a child failed:");
+ for (i = 0; cp->argv[i]; i++)
+ strbuf_addf(err, " %s", cp->argv[i]);
+
+ return 0;
+}
+
+static int default_task_finished(int result,
+ struct child_process *cp,
+ struct strbuf *err,
+ void *pp_cb,
+ void *pp_task_cb)
+{
+ int i;
+
+ if (!result)
+ return 0;
+
+ strbuf_addf(err, "A child failed with return code %d:", result);
+ for (i = 0; cp->argv[i]; i++)
+ strbuf_addf(err, " %s", cp->argv[i]);
+
+ return 0;
+}
+
+static void kill_children(struct parallel_processes *pp, int signo)
+{
+ int i, n = pp->max_processes;
+
+ for (i = 0; i < n; i++)
+ if (pp->children[i].state == GIT_CP_WORKING)
+ kill(pp->children[i].process.pid, signo);
+}
+
+static struct parallel_processes *pp_for_signal;
+
+static void handle_children_on_signal(int signo)
+{
+ kill_children(pp_for_signal, signo);
+ sigchain_pop(signo);
+ raise(signo);
+}
+
+static void pp_init(struct parallel_processes *pp,
+ int n,
+ get_next_task_fn get_next_task,
+ start_failure_fn start_failure,
+ task_finished_fn task_finished,
+ void *data)
+{
+ int i;
+
+ if (n < 1)
+ n = online_cpus();
+
+ pp->max_processes = n;
+
+ trace_printf("run_processes_parallel: preparing to run up to %d tasks", n);
+
+ pp->data = data;
+ if (!get_next_task)
+ die("BUG: you need to specify a get_next_task function");
+ pp->get_next_task = get_next_task;
+
+ pp->start_failure = start_failure ? start_failure : default_start_failure;
+ pp->task_finished = task_finished ? task_finished : default_task_finished;
+
+ pp->nr_processes = 0;
+ pp->output_owner = 0;
+ pp->shutdown = 0;
+ pp->children = xcalloc(n, sizeof(*pp->children));
+ pp->pfd = xcalloc(n, sizeof(*pp->pfd));
+ strbuf_init(&pp->buffered_output, 0);
+
+ for (i = 0; i < n; i++) {
+ strbuf_init(&pp->children[i].err, 0);
+ child_process_init(&pp->children[i].process);
+ pp->pfd[i].events = POLLIN | POLLHUP;
+ pp->pfd[i].fd = -1;
+ }
+
+ pp_for_signal = pp;
+ sigchain_push_common(handle_children_on_signal);
+}
+
+static void pp_cleanup(struct parallel_processes *pp)
+{
+ int i;
+
+ trace_printf("run_processes_parallel: done");
+ for (i = 0; i < pp->max_processes; i++) {
+ strbuf_release(&pp->children[i].err);
+ child_process_clear(&pp->children[i].process);
+ }
+
+ free(pp->children);
+ free(pp->pfd);
+
+ /*
+ * When get_next_task added messages to the buffer in its last
+ * iteration, the buffered output is non empty.
+ */
+ fputs(pp->buffered_output.buf, stderr);
+ strbuf_release(&pp->buffered_output);
+
+ sigchain_pop_common();
+}
+
+/* returns
+ * 0 if a new task was started.
+ * 1 if no new jobs was started (get_next_task ran out of work, non critical
+ * problem with starting a new command)
+ * <0 no new job was started, user wishes to shutdown early. Use negative code
+ * to signal the children.
+ */
+static int pp_start_one(struct parallel_processes *pp)
+{
+ int i, code;
+
+ for (i = 0; i < pp->max_processes; i++)
+ if (pp->children[i].state == GIT_CP_FREE)
+ break;
+ if (i == pp->max_processes)
+ die("BUG: bookkeeping is hard");
+
+ code = pp->get_next_task(&pp->children[i].process,
+ &pp->children[i].err,
+ pp->data,
+ &pp->children[i].data);
+ if (!code) {
+ strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
+ strbuf_reset(&pp->children[i].err);
+ return 1;
+ }
+ pp->children[i].process.err = -1;
+ pp->children[i].process.stdout_to_stderr = 1;
+ pp->children[i].process.no_stdin = 1;
+
+ if (start_command(&pp->children[i].process)) {
+ code = pp->start_failure(&pp->children[i].process,
+ &pp->children[i].err,
+ pp->data,
+ &pp->children[i].data);
+ strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
+ strbuf_reset(&pp->children[i].err);
+ if (code)
+ pp->shutdown = 1;
+ return code;
+ }
+
+ pp->nr_processes++;
+ pp->children[i].state = GIT_CP_WORKING;
+ pp->pfd[i].fd = pp->children[i].process.err;
+ return 0;
+}
+
+static void pp_buffer_stderr(struct parallel_processes *pp, int output_timeout)
+{
+ int i;
+
+ while ((i = poll(pp->pfd, pp->max_processes, output_timeout)) < 0) {
+ if (errno == EINTR)
+ continue;
+ pp_cleanup(pp);
+ die_errno("poll");
+ }
+
+ /* Buffer output from all pipes. */
+ for (i = 0; i < pp->max_processes; i++) {
+ if (pp->children[i].state == GIT_CP_WORKING &&
+ pp->pfd[i].revents & (POLLIN | POLLHUP)) {
+ int n = strbuf_read_once(&pp->children[i].err,
+ pp->children[i].process.err, 0);
+ if (n == 0) {
+ close(pp->children[i].process.err);
+ pp->children[i].state = GIT_CP_WAIT_CLEANUP;
+ } else if (n < 0)
+ if (errno != EAGAIN)
+ die_errno("read");
+ }
+ }
+}
+
+static void pp_output(struct parallel_processes *pp)
+{
+ int i = pp->output_owner;
+ if (pp->children[i].state == GIT_CP_WORKING &&
+ pp->children[i].err.len) {
+ fputs(pp->children[i].err.buf, stderr);
+ strbuf_reset(&pp->children[i].err);
+ }
+}
+
+static int pp_collect_finished(struct parallel_processes *pp)
+{
+ int i, code;
+ int n = pp->max_processes;
+ int result = 0;
+
+ while (pp->nr_processes > 0) {
+ for (i = 0; i < pp->max_processes; i++)
+ if (pp->children[i].state == GIT_CP_WAIT_CLEANUP)
+ break;
+ if (i == pp->max_processes)
+ break;
+
+ code = finish_command(&pp->children[i].process);
+
+ code = pp->task_finished(code, &pp->children[i].process,
+ &pp->children[i].err, pp->data,
+ &pp->children[i].data);
+
+ if (code)
+ result = code;
+ if (code < 0)
+ break;
+
+ pp->nr_processes--;
+ pp->children[i].state = GIT_CP_FREE;
+ pp->pfd[i].fd = -1;
+ child_process_init(&pp->children[i].process);
+
+ if (i != pp->output_owner) {
+ strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
+ strbuf_reset(&pp->children[i].err);
+ } else {
+ fputs(pp->children[i].err.buf, stderr);
+ strbuf_reset(&pp->children[i].err);
+
+ /* Output all other finished child processes */
+ fputs(pp->buffered_output.buf, stderr);
+ strbuf_reset(&pp->buffered_output);
+
+ /*
+ * Pick next process to output live.
+ * NEEDSWORK:
+ * For now we pick it randomly by doing a round
+ * robin. Later we may want to pick the one with
+ * the most output or the longest or shortest
+ * running process time.
+ */
+ for (i = 0; i < n; i++)
+ if (pp->children[(pp->output_owner + i) % n].state == GIT_CP_WORKING)
+ break;
+ pp->output_owner = (pp->output_owner + i) % n;
+ }
+ }
+ return result;
+}
+
+int run_processes_parallel(int n,
+ get_next_task_fn get_next_task,
+ start_failure_fn start_failure,
+ task_finished_fn task_finished,
+ void *pp_cb)
+{
+ int i, code;
+ int output_timeout = 100;
+ int spawn_cap = 4;
+ struct parallel_processes pp;
+
+ pp_init(&pp, n, get_next_task, start_failure, task_finished, pp_cb);
+ while (1) {
+ for (i = 0;
+ i < spawn_cap && !pp.shutdown &&
+ pp.nr_processes < pp.max_processes;
+ i++) {
+ code = pp_start_one(&pp);
+ if (!code)
+ continue;
+ if (code < 0) {
+ pp.shutdown = 1;
+ kill_children(&pp, -code);
+ }
+ break;
+ }
+ if (!pp.nr_processes)
+ break;
+ pp_buffer_stderr(&pp, output_timeout);
+ pp_output(&pp);
+ code = pp_collect_finished(&pp);
+ if (code) {
+ pp.shutdown = 1;
+ if (code < 0)
+ kill_children(&pp, -code);
+ }
+ }
+
+ pp_cleanup(&pp);
+ return 0;
+}
diff --git a/run-command.h b/run-command.h
index 12bb26c..d5a57f9 100644
--- a/run-command.h
+++ b/run-command.h
@@ -122,4 +122,84 @@ int start_async(struct async *async);
int finish_async(struct async *async);
int in_async(void);
+/**
+ * This callback should initialize the child process and preload the
+ * error channel if desired. The preloading of is useful if you want to
+ * have a message printed directly before the output of the child process.
+ * pp_cb is the callback cookie as passed to run_processes_parallel.
+ * You can store a child process specific callback cookie in pp_task_cb.
+ *
+ * Even after returning 0 to indicate that there are no more processes,
+ * this function will be called again until there are no more running
+ * child processes.
+ *
+ * Return 1 if the next child is ready to run.
+ * Return 0 if there are currently no more tasks to be processed.
+ * To send a signal to other child processes for abortion,
+ * return the negative signal number.
+ */
+typedef int (*get_next_task_fn)(struct child_process *cp,
+ struct strbuf *err,
+ void *pp_cb,
+ void **pp_task_cb);
+
+/**
+ * This callback is called whenever there are problems starting
+ * a new process.
+ *
+ * You must not write to stdout or stderr in this function. Add your
+ * message to the strbuf err instead, which will be printed without
+ * messing up the output of the other parallel processes.
+ *
+ * pp_cb is the callback cookie as passed into run_processes_parallel,
+ * pp_task_cb is the callback cookie as passed into get_next_task_fn.
+ *
+ * Return 0 to continue the parallel processing. To abort return non zero.
+ * To send a signal to other child processes for abortion, return
+ * the negative signal number.
+ */
+typedef int (*start_failure_fn)(struct child_process *cp,
+ struct strbuf *err,
+ void *pp_cb,
+ void *pp_task_cb);
+
+/**
+ * This callback is called on every child process that finished processing.
+ *
+ * You must not write to stdout or stderr in this function. Add your
+ * message to the strbuf err instead, which will be printed without
+ * messing up the output of the other parallel processes.
+ *
+ * pp_cb is the callback cookie as passed into run_processes_parallel,
+ * pp_task_cb is the callback cookie as passed into get_next_task_fn.
+ *
+ * Return 0 to continue the parallel processing. To abort return non zero.
+ * To send a signal to other child processes for abortion, return
+ * the negative signal number.
+ */
+typedef int (*task_finished_fn)(int result,
+ struct child_process *cp,
+ struct strbuf *err,
+ void *pp_cb,
+ void *pp_task_cb);
+
+/**
+ * Runs up to n processes at the same time. Whenever a process can be
+ * started, the callback get_next_task_fn is called to obtain the data
+ * required to start another child process.
+ *
+ * The children started via this function run in parallel. Their output
+ * (both stdout and stderr) is routed to stderr in a manner that output
+ * from different tasks does not interleave.
+ *
+ * If start_failure_fn or task_finished_fn are NULL, default handlers
+ * will be used. The default handlers will print an error message on
+ * error without issuing an emergency stop.
+ */
+int run_processes_parallel(int n,
+ get_next_task_fn,
+ start_failure_fn,
+ task_finished_fn,
+ void *pp_cb);
+
#endif
diff --git a/sequencer.c b/sequencer.c
index 8c58fa2..8048786 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -886,7 +886,7 @@ static int sequencer_rollback(struct replay_opts *opts)
if (!f)
return error(_("cannot open %s: %s"), git_path_head_file(),
strerror(errno));
- if (strbuf_getline(&buf, f, '\n')) {
+ if (strbuf_getline_lf(&buf, f)) {
error(_("cannot read %s: %s"), git_path_head_file(),
ferror(f) ? strerror(errno) : _("unexpected end of file"));
fclose(f);
diff --git a/setup.c b/setup.c
index d343725..0deb022 100644
--- a/setup.c
+++ b/setup.c
@@ -312,6 +312,23 @@ done:
return ret;
}
+int is_nonbare_repository_dir(struct strbuf *path)
+{
+ int ret = 0;
+ int gitfile_error;
+ size_t orig_path_len = path->len;
+ assert(orig_path_len != 0);
+ strbuf_complete(path, '/');
+ strbuf_addstr(path, ".git");
+ if (read_gitfile_gently(path->buf, &gitfile_error) || is_git_directory(path->buf))
+ ret = 1;
+ if (gitfile_error == READ_GITFILE_ERR_OPEN_FAILED ||
+ gitfile_error == READ_GITFILE_ERR_READ_FAILED)
+ ret = 1;
+ strbuf_setlen(path, orig_path_len);
+ return ret;
+}
+
int is_inside_git_dir(void)
{
if (inside_git_dir < 0)
@@ -434,17 +451,6 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok)
return ret;
}
-static void update_linked_gitdir(const char *gitfile, const char *gitdir)
-{
- struct strbuf path = STRBUF_INIT;
- struct stat st;
-
- strbuf_addf(&path, "%s/gitdir", gitdir);
- if (stat(path.buf, &st) || st.st_mtime + 24 * 3600 < time(NULL))
- write_file(path.buf, "%s", gitfile);
- strbuf_release(&path);
-}
-
/*
* Try to read the location of the git directory from the .git file,
* return path to git directory if found.
@@ -514,7 +520,6 @@ const char *read_gitfile_gently(const char *path, int *return_error_code)
error_code = READ_GITFILE_ERR_NOT_A_REPO;
goto cleanup_return;
}
- update_linked_gitdir(path, dir);
path = real_path(dir);
cleanup_return:
diff --git a/sha1_file.c b/sha1_file.c
index 2c68766..aab1872 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -36,6 +36,7 @@
static inline uintmax_t sz_fmt(size_t s) { return s; }
const unsigned char null_sha1[20];
+const struct object_id null_oid;
/*
* This is meant to hold a *small* number of objects that you would
@@ -395,7 +396,7 @@ void add_to_alternates_file(const char *reference)
struct strbuf line = STRBUF_INIT;
int found = 0;
- while (strbuf_getline(&line, in, '\n') != EOF) {
+ while (strbuf_getline(&line, in) != EOF) {
if (!strcmp(reference, line.buf)) {
found = 1;
break;
diff --git a/shell.c b/shell.c
index ace62e4..c5439a6 100644
--- a/shell.c
+++ b/shell.c
@@ -88,7 +88,7 @@ static void run_shell(void)
int count;
fprintf(stderr, "git> ");
- if (strbuf_getline(&line, stdin, '\n') == EOF) {
+ if (strbuf_getline_lf(&line, stdin) == EOF) {
fprintf(stderr, "\n");
strbuf_release(&line);
break;
diff --git a/sigchain.c b/sigchain.c
index faa375d..2ac43bb 100644
--- a/sigchain.c
+++ b/sigchain.c
@@ -50,3 +50,12 @@ void sigchain_push_common(sigchain_fun f)
sigchain_push(SIGQUIT, f);
sigchain_push(SIGPIPE, f);
}
+
+void sigchain_pop_common(void)
+{
+ sigchain_pop(SIGPIPE);
+ sigchain_pop(SIGQUIT);
+ sigchain_pop(SIGTERM);
+ sigchain_pop(SIGHUP);
+ sigchain_pop(SIGINT);
+}
diff --git a/sigchain.h b/sigchain.h
index 618083b..138b20f 100644
--- a/sigchain.h
+++ b/sigchain.h
@@ -7,5 +7,6 @@ int sigchain_push(int sig, sigchain_fun f);
int sigchain_pop(int sig);
void sigchain_push_common(sigchain_fun f);
+void sigchain_pop_common(void);
#endif /* SIGCHAIN_H */
diff --git a/strbuf.c b/strbuf.c
index d76f0ae..bab316d 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -384,6 +384,17 @@ ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint)
return sb->len - oldlen;
}
+ssize_t strbuf_read_once(struct strbuf *sb, int fd, size_t hint)
+{
+ ssize_t cnt;
+
+ strbuf_grow(sb, hint ? hint : 8192);
+ cnt = xread(fd, sb->buf + sb->len, sb->alloc - sb->len - 1);
+ if (cnt > 0)
+ strbuf_setlen(sb, sb->len + cnt);
+ return cnt;
+}
+
#define STRBUF_MAXLINK (2*PATH_MAX)
int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint)
@@ -501,15 +512,37 @@ int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term)
}
#endif
-int strbuf_getline(struct strbuf *sb, FILE *fp, int term)
+static int strbuf_getdelim(struct strbuf *sb, FILE *fp, int term)
{
if (strbuf_getwholeline(sb, fp, term))
return EOF;
- if (sb->buf[sb->len-1] == term)
- strbuf_setlen(sb, sb->len-1);
+ if (sb->buf[sb->len - 1] == term)
+ strbuf_setlen(sb, sb->len - 1);
return 0;
}
+int strbuf_getline(struct strbuf *sb, FILE *fp)
+{
+ if (strbuf_getwholeline(sb, fp, '\n'))
+ return EOF;
+ if (sb->buf[sb->len - 1] == '\n') {
+ strbuf_setlen(sb, sb->len - 1);
+ if (sb->len && sb->buf[sb->len - 1] == '\r')
+ strbuf_setlen(sb, sb->len - 1);
+ }
+ return 0;
+}
+
+int strbuf_getline_lf(struct strbuf *sb, FILE *fp)
+{
+ return strbuf_getdelim(sb, fp, '\n');
+}
+
+int strbuf_getline_nul(struct strbuf *sb, FILE *fp)
+{
+ return strbuf_getdelim(sb, fp, '\0');
+}
+
int strbuf_getwholeline_fd(struct strbuf *sb, int fd, int term)
{
strbuf_reset(sb);
diff --git a/strbuf.h b/strbuf.h
index 7123fca..f72fd14 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -354,8 +354,8 @@ extern void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm
*
* NOTE: The buffer is rewound if the read fails. If -1 is returned,
* `errno` must be consulted, like you would do for `read(3)`.
- * `strbuf_read()`, `strbuf_read_file()` and `strbuf_getline()` has the
- * same behaviour as well.
+ * `strbuf_read()`, `strbuf_read_file()` and `strbuf_getline_*()`
+ * family of functions have the same behaviour as well.
*/
extern size_t strbuf_fread(struct strbuf *, size_t, FILE *);
@@ -367,6 +367,14 @@ extern size_t strbuf_fread(struct strbuf *, size_t, FILE *);
extern ssize_t strbuf_read(struct strbuf *, int fd, size_t hint);
/**
+ * Read the contents of a given file descriptor partially by using only one
+ * attempt of xread. The third argument can be used to give a hint about the
+ * file size, to avoid reallocs. Returns the number of new bytes appended to
+ * the sb.
+ */
+extern ssize_t strbuf_read_once(struct strbuf *, int fd, size_t hint);
+
+/**
* Read the contents of a file, specified by its path. The third argument
* can be used to give a hint about the file size, to avoid reallocs.
*/
@@ -379,14 +387,31 @@ extern ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint
extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint);
/**
- * Read a line from a FILE *, overwriting the existing contents
- * of the strbuf. The second argument specifies the line
- * terminator character, typically `'\n'`.
+ * Read a line from a FILE *, overwriting the existing contents of
+ * the strbuf. The strbuf_getline*() family of functions share
+ * this signature, but have different line termination conventions.
+ *
* Reading stops after the terminator or at EOF. The terminator
* is removed from the buffer before returning. Returns 0 unless
* there was nothing left before EOF, in which case it returns `EOF`.
*/
-extern int strbuf_getline(struct strbuf *, FILE *, int);
+typedef int (*strbuf_getline_fn)(struct strbuf *, FILE *);
+
+/* Uses LF as the line terminator */
+extern int strbuf_getline_lf(struct strbuf *sb, FILE *fp);
+
+/* Uses NUL as the line terminator */
+extern int strbuf_getline_nul(struct strbuf *sb, FILE *fp);
+
+/*
+ * Similar to strbuf_getline_lf(), but additionally treats a CR that
+ * comes immediately before the LF as part of the terminator.
+ * This is the most friendly version to be used to read "text" files
+ * that can come from platforms whose native text format is CRLF
+ * terminated.
+ */
+extern int strbuf_getline(struct strbuf *, FILE *);
+
/**
* Like `strbuf_getline`, but keeps the trailing terminator (if
diff --git a/submodule-config.c b/submodule-config.c
index afe0ea8..fe8ceab 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -228,6 +228,35 @@ int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg)
return parse_fetch_recurse(opt, arg, 1);
}
+static int parse_push_recurse(const char *opt, const char *arg,
+ int die_on_error)
+{
+ switch (git_config_maybe_bool(opt, arg)) {
+ case 1:
+ /* There's no simple "on" value when pushing */
+ if (die_on_error)
+ die("bad %s argument: %s", opt, arg);
+ else
+ return RECURSE_SUBMODULES_ERROR;
+ case 0:
+ return RECURSE_SUBMODULES_OFF;
+ default:
+ if (!strcmp(arg, "on-demand"))
+ return RECURSE_SUBMODULES_ON_DEMAND;
+ else if (!strcmp(arg, "check"))
+ return RECURSE_SUBMODULES_CHECK;
+ else if (die_on_error)
+ die("bad %s argument: %s", opt, arg);
+ else
+ return RECURSE_SUBMODULES_ERROR;
+ }
+}
+
+int parse_push_recurse_submodules_arg(const char *opt, const char *arg)
+{
+ return parse_push_recurse(opt, arg, 1);
+}
+
static void warn_multiple_config(const unsigned char *commit_sha1,
const char *name, const char *option)
{
diff --git a/submodule-config.h b/submodule-config.h
index 9061e4e..9bfa65a 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -19,6 +19,7 @@ struct submodule {
};
int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
+int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
int parse_submodule_config_option(const char *var, const char *value);
const struct submodule *submodule_from_name(const unsigned char *commit_sha1,
const char *name);
diff --git a/submodule.c b/submodule.c
index 14e7624..b83939c 100644
--- a/submodule.c
+++ b/submodule.c
@@ -12,6 +12,7 @@
#include "sha1-array.h"
#include "argv-array.h"
#include "blob.h"
+#include "thread-utils.h"
static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
static struct string_list changed_submodule_paths;
@@ -610,37 +611,28 @@ static void calculate_changed_submodule_paths(void)
initialized_fetch_ref_tips = 0;
}
-int fetch_populated_submodules(const struct argv_array *options,
- const char *prefix, int command_line_option,
- int quiet)
+struct submodule_parallel_fetch {
+ int count;
+ struct argv_array args;
+ const char *work_tree;
+ const char *prefix;
+ int command_line_option;
+ int quiet;
+ int result;
+};
+#define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0}
+
+static int get_next_submodule(struct child_process *cp,
+ struct strbuf *err, void *data, void **task_cb)
{
- int i, result = 0;
- struct child_process cp = CHILD_PROCESS_INIT;
- struct argv_array argv = ARGV_ARRAY_INIT;
- const char *work_tree = get_git_work_tree();
- if (!work_tree)
- goto out;
-
- if (read_cache() < 0)
- die("index file corrupt");
-
- argv_array_push(&argv, "fetch");
- for (i = 0; i < options->argc; i++)
- argv_array_push(&argv, options->argv[i]);
- argv_array_push(&argv, "--recurse-submodules-default");
- /* default value, "--submodule-prefix" and its value are added later */
-
- cp.env = local_repo_env;
- cp.git_cmd = 1;
- cp.no_stdin = 1;
-
- calculate_changed_submodule_paths();
+ int ret = 0;
+ struct submodule_parallel_fetch *spf = data;
- for (i = 0; i < active_nr; i++) {
+ for (; spf->count < active_nr; spf->count++) {
struct strbuf submodule_path = STRBUF_INIT;
struct strbuf submodule_git_dir = STRBUF_INIT;
struct strbuf submodule_prefix = STRBUF_INIT;
- const struct cache_entry *ce = active_cache[i];
+ const struct cache_entry *ce = active_cache[spf->count];
const char *git_dir, *default_argv;
const struct submodule *submodule;
@@ -652,7 +644,7 @@ int fetch_populated_submodules(const struct argv_array *options,
submodule = submodule_from_name(null_sha1, ce->name);
default_argv = "yes";
- if (command_line_option == RECURSE_SUBMODULES_DEFAULT) {
+ if (spf->command_line_option == RECURSE_SUBMODULES_DEFAULT) {
if (submodule &&
submodule->fetch_recurse !=
RECURSE_SUBMODULES_NONE) {
@@ -675,40 +667,101 @@ int fetch_populated_submodules(const struct argv_array *options,
default_argv = "on-demand";
}
}
- } else if (command_line_option == RECURSE_SUBMODULES_ON_DEMAND) {
+ } else if (spf->command_line_option == RECURSE_SUBMODULES_ON_DEMAND) {
if (!unsorted_string_list_lookup(&changed_submodule_paths, ce->name))
continue;
default_argv = "on-demand";
}
- strbuf_addf(&submodule_path, "%s/%s", work_tree, ce->name);
+ strbuf_addf(&submodule_path, "%s/%s", spf->work_tree, ce->name);
strbuf_addf(&submodule_git_dir, "%s/.git", submodule_path.buf);
- strbuf_addf(&submodule_prefix, "%s%s/", prefix, ce->name);
+ strbuf_addf(&submodule_prefix, "%s%s/", spf->prefix, ce->name);
git_dir = read_gitfile(submodule_git_dir.buf);
if (!git_dir)
git_dir = submodule_git_dir.buf;
if (is_directory(git_dir)) {
- if (!quiet)
- printf("Fetching submodule %s%s\n", prefix, ce->name);
- cp.dir = submodule_path.buf;
- argv_array_push(&argv, default_argv);
- argv_array_push(&argv, "--submodule-prefix");
- argv_array_push(&argv, submodule_prefix.buf);
- cp.argv = argv.argv;
- if (run_command(&cp))
- result = 1;
- argv_array_pop(&argv);
- argv_array_pop(&argv);
- argv_array_pop(&argv);
+ child_process_init(cp);
+ cp->dir = strbuf_detach(&submodule_path, NULL);
+ cp->env = local_repo_env;
+ cp->git_cmd = 1;
+ if (!spf->quiet)
+ strbuf_addf(err, "Fetching submodule %s%s\n",
+ spf->prefix, ce->name);
+ argv_array_init(&cp->args);
+ argv_array_pushv(&cp->args, spf->args.argv);
+ argv_array_push(&cp->args, default_argv);
+ argv_array_push(&cp->args, "--submodule-prefix");
+ argv_array_push(&cp->args, submodule_prefix.buf);
+ ret = 1;
}
strbuf_release(&submodule_path);
strbuf_release(&submodule_git_dir);
strbuf_release(&submodule_prefix);
+ if (ret) {
+ spf->count++;
+ return 1;
+ }
}
- argv_array_clear(&argv);
+ return 0;
+}
+
+static int fetch_start_failure(struct child_process *cp,
+ struct strbuf *err,
+ void *cb, void *task_cb)
+{
+ struct submodule_parallel_fetch *spf = cb;
+
+ spf->result = 1;
+
+ return 0;
+}
+
+static int fetch_finish(int retvalue, struct child_process *cp,
+ struct strbuf *err, void *cb, void *task_cb)
+{
+ struct submodule_parallel_fetch *spf = cb;
+
+ if (retvalue)
+ spf->result = 1;
+
+ return 0;
+}
+
+int fetch_populated_submodules(const struct argv_array *options,
+ const char *prefix, int command_line_option,
+ int quiet, int max_parallel_jobs)
+{
+ int i;
+ struct submodule_parallel_fetch spf = SPF_INIT;
+
+ spf.work_tree = get_git_work_tree();
+ spf.command_line_option = command_line_option;
+ spf.quiet = quiet;
+ spf.prefix = prefix;
+
+ if (!spf.work_tree)
+ goto out;
+
+ if (read_cache() < 0)
+ die("index file corrupt");
+
+ argv_array_push(&spf.args, "fetch");
+ for (i = 0; i < options->argc; i++)
+ argv_array_push(&spf.args, options->argv[i]);
+ argv_array_push(&spf.args, "--recurse-submodules-default");
+ /* default value, "--submodule-prefix" and its value are added later */
+
+ calculate_changed_submodule_paths();
+ run_processes_parallel(max_parallel_jobs,
+ get_next_submodule,
+ fetch_start_failure,
+ fetch_finish,
+ &spf);
+
+ argv_array_clear(&spf.args);
out:
string_list_clear(&changed_submodule_paths, 1);
- return result;
+ return spf.result;
}
unsigned is_submodule_modified(const char *path, int ignore_untracked)
diff --git a/submodule.h b/submodule.h
index 5507c3d..e06eaa5 100644
--- a/submodule.h
+++ b/submodule.h
@@ -5,6 +5,7 @@ struct diff_options;
struct argv_array;
enum {
+ RECURSE_SUBMODULES_CHECK = -4,
RECURSE_SUBMODULES_ERROR = -3,
RECURSE_SUBMODULES_NONE = -2,
RECURSE_SUBMODULES_ON_DEMAND = -1,
@@ -31,7 +32,7 @@ void set_config_fetch_recurse_submodules(int value);
void check_for_new_submodule_commits(unsigned char new_sha1[20]);
int fetch_populated_submodules(const struct argv_array *options,
const char *prefix, int command_line_option,
- int quiet);
+ int quiet, int max_parallel_jobs);
unsigned is_submodule_modified(const char *path, int ignore_untracked);
int submodule_uses_gitfile(const char *path);
int ok_to_remove_submodule(const char *path);
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index e971446..f9f3e5f 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -98,8 +98,8 @@ then
test_skip_or_die $GIT_TEST_HTTPD "no web server found at '$LIB_HTTPD_PATH'"
fi
-HTTPD_VERSION=`$LIB_HTTPD_PATH -v | \
- sed -n 's/^Server version: Apache\/\([0-9]*\)\..*$/\1/p; q'`
+HTTPD_VERSION=$($LIB_HTTPD_PATH -v | \
+ sed -n 's/^Server version: Apache\/\([0-9]*\)\..*$/\1/p; q')
if test -n "$HTTPD_VERSION"
then
diff --git a/t/perf/p7300-clean.sh b/t/perf/p7300-clean.sh
index ec94cdd..7c1888a 100755
--- a/t/perf/p7300-clean.sh
+++ b/t/perf/p7300-clean.sh
@@ -28,4 +28,8 @@ test_perf 'clean many untracked sub dirs, ignore nested git' '
git clean -n -q -f -f -d 100000_sub_dirs/
'
+test_perf 'ls-files -o' '
+ git ls-files -o
+'
+
test_done
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index f91bbcf..295aa59 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -87,6 +87,23 @@ test_expect_success 'plain nested in bare through aliased command' '
check_config bare-ancestor-aliased.git/plain-nested/.git false unset
'
+test_expect_success 'No extra GIT_* on alias scripts' '
+ (
+ env | sed -ne "/^GIT_/s/=.*//p" &&
+ echo GIT_PREFIX && # setup.c
+ echo GIT_TEXTDOMAINDIR # wrapper-for-bin.sh
+ ) | sort | uniq >expected &&
+ cat <<-\EOF >script &&
+ #!/bin/sh
+ env | sed -ne "/^GIT_/s/=.*//p" | sort >actual
+ exit 0
+ EOF
+ chmod 755 script &&
+ git config alias.script \!./script &&
+ ( mkdir sub && cd sub && git script ) &&
+ test_cmp expected actual
+'
+
test_expect_success 'plain with GIT_WORK_TREE' '
mkdir plain-wt &&
test_must_fail env GIT_WORK_TREE="$(pwd)/plain-wt" git init plain-wt
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index b343651..504e5a0 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -56,21 +56,16 @@ create_gitattributes () {
}
create_NNO_files () {
- lfname=$1
- crlfname=$2
- lfmixcrlf=$3
- lfmixcr=$4
- crlfnul=$5
for crlf in false true input
do
for attr in "" auto text -text lf crlf
do
pfx=NNO_${crlf}_attr_${attr} &&
- cp $lfname ${pfx}_LF.txt &&
- cp $crlfname ${pfx}_CRLF.txt &&
- cp $lfmixcrlf ${pfx}_CRLF_mix_LF.txt &&
- cp $lfmixcr ${pfx}_LF_mix_CR.txt &&
- cp $crlfnul ${pfx}_CRLF_nul.txt
+ cp CRLF_mix_LF ${pfx}_LF.txt &&
+ cp CRLF_mix_LF ${pfx}_CRLF.txt &&
+ cp CRLF_mix_LF ${pfx}_CRLF_mix_LF.txt &&
+ cp CRLF_mix_LF ${pfx}_LF_mix_CR.txt &&
+ cp CRLF_mix_LF ${pfx}_CRLF_nul.txt
done
done
}
@@ -96,7 +91,7 @@ commit_check_warn () {
crlfnul=$7
pfx=crlf_${crlf}_attr_${attr}
create_gitattributes "$attr" &&
- for f in LF CRLF repoMIX LF_mix_CR CRLF_mix_LF LF_nul CRLF_nul
+ for f in LF CRLF LF_mix_CR CRLF_mix_LF LF_nul CRLF_nul
do
fname=${pfx}_$f.txt &&
cp $f $fname &&
@@ -149,6 +144,27 @@ commit_chk_wrnNNO () {
'
}
+stats_ascii () {
+ case "$1" in
+ LF)
+ echo lf
+ ;;
+ CRLF)
+ echo crlf
+ ;;
+ CRLF_mix_LF)
+ echo mixed
+ ;;
+ LF_mix_CR|CRLF_nul|LF_nul|CRLF_mix_CR)
+ echo "-text"
+ ;;
+ *)
+ echo error_invalid $1
+ ;;
+ esac
+
+}
+
check_files_in_repo () {
crlf=$1
attr=$2
@@ -203,35 +219,83 @@ checkout_files () {
create_gitattributes $attr &&
git config core.autocrlf $crlf &&
pfx=eol_${eol}_crlf_${crlf}_attr_${attr}_ &&
- src=crlf_false_attr__ &&
for f in LF CRLF LF_mix_CR CRLF_mix_LF LF_nul
do
- rm $src$f.txt &&
+ rm crlf_false_attr__$f.txt &&
if test -z "$eol"; then
- git checkout $src$f.txt
+ git checkout crlf_false_attr__$f.txt
else
- git -c core.eol=$eol checkout $src$f.txt
+ git -c core.eol=$eol checkout crlf_false_attr__$f.txt
fi
done
+ test_expect_success "ls-files --eol $lfname ${pfx}LF.txt" '
+ test_when_finished "rm expect actual" &&
+ sort <<-EOF >expect &&
+ i/crlf w/$(stats_ascii $crlfname) crlf_false_attr__CRLF.txt
+ i/mixed w/$(stats_ascii $lfmixcrlf) crlf_false_attr__CRLF_mix_LF.txt
+ i/lf w/$(stats_ascii $lfname) crlf_false_attr__LF.txt
+ i/-text w/$(stats_ascii $lfmixcr) crlf_false_attr__LF_mix_CR.txt
+ i/-text w/$(stats_ascii $crlfnul) crlf_false_attr__CRLF_nul.txt
+ i/-text w/$(stats_ascii $crlfnul) crlf_false_attr__LF_nul.txt
+ EOF
+ git ls-files --eol crlf_false_attr__* |
+ sed -e "s!attr/[^ ]*!!g" -e "s/ / /g" -e "s/ */ /g" |
+ sort >actual &&
+ test_cmp expect actual
+ '
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=LF" "
- compare_ws_file $pfx $lfname ${src}LF.txt
+ compare_ws_file $pfx $lfname crlf_false_attr__LF.txt
"
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=CRLF" "
- compare_ws_file $pfx $crlfname ${src}CRLF.txt
+ compare_ws_file $pfx $crlfname crlf_false_attr__CRLF.txt
"
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=CRLF_mix_LF" "
- compare_ws_file $pfx $lfmixcrlf ${src}CRLF_mix_LF.txt
+ compare_ws_file $pfx $lfmixcrlf crlf_false_attr__CRLF_mix_LF.txt
"
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=LF_mix_CR" "
- compare_ws_file $pfx $lfmixcr ${src}LF_mix_CR.txt
+ compare_ws_file $pfx $lfmixcr crlf_false_attr__LF_mix_CR.txt
"
test_expect_success "checkout core.eol=$eol core.autocrlf=$crlf gitattributes=$attr file=LF_nul" "
- compare_ws_file $pfx $crlfnul ${src}LF_nul.txt
+ compare_ws_file $pfx $crlfnul crlf_false_attr__LF_nul.txt
"
}
-#######
+# Test control characters
+# NUL SOH CR EOF==^Z
+test_expect_success 'ls-files --eol -o Text/Binary' '
+ test_when_finished "rm expect actual TeBi_*" &&
+ STRT=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA &&
+ STR=$STRT$STRT$STRT$STRT &&
+ printf "${STR}BBB\001" >TeBi_127_S &&
+ printf "${STR}BBBB\001">TeBi_128_S &&
+ printf "${STR}BBB\032" >TeBi_127_E &&
+ printf "\032${STR}BBB" >TeBi_E_127 &&
+ printf "${STR}BBBB\000">TeBi_128_N &&
+ printf "${STR}BBB\012">TeBi_128_L &&
+ printf "${STR}BBB\015">TeBi_127_C &&
+ printf "${STR}BB\015\012" >TeBi_126_CL &&
+ printf "${STR}BB\015\012\015" >TeBi_126_CLC &&
+ sort <<-\EOF >expect &&
+ i/ w/-text TeBi_127_S
+ i/ w/none TeBi_128_S
+ i/ w/none TeBi_127_E
+ i/ w/-text TeBi_E_127
+ i/ w/-text TeBi_128_N
+ i/ w/lf TeBi_128_L
+ i/ w/-text TeBi_127_C
+ i/ w/crlf TeBi_126_CL
+ i/ w/-text TeBi_126_CLC
+ EOF
+ git ls-files --eol -o |
+ sed -n -e "/TeBi_/{s!attr/[ ]*!!g
+ s! ! !g
+ s! *! !g
+ p
+ }" | sort >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'setup master' '
echo >.gitattributes &&
git checkout -b master &&
@@ -480,4 +544,19 @@ checkout_files native true "lf" LF CRLF CRLF_mix_LF LF_mix_CR
checkout_files native false "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
checkout_files native true "crlf" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
+# Should be the last test case: remove some files from the worktree
+test_expect_success 'ls-files --eol -d -z' '
+ rm crlf_false_attr__CRLF.txt crlf_false_attr__CRLF_mix_LF.txt crlf_false_attr__LF.txt .gitattributes &&
+ cat >expect <<-\EOF &&
+ i/crlf w/ crlf_false_attr__CRLF.txt
+ i/lf w/ .gitattributes
+ i/lf w/ crlf_false_attr__LF.txt
+ i/mixed w/ crlf_false_attr__CRLF_mix_LF.txt
+ EOF
+ git ls-files --eol -d |
+ sed -e "s!attr/[^ ]*!!g" -e "s/ / /g" -e "s/ */ /g" |
+ sort >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 627ef85..f0152a7 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -59,6 +59,9 @@ case $(uname -s) in
;;
esac
+test_expect_success basename 'test-path-utils basename'
+test_expect_success dirname 'test-path-utils dirname'
+
norm_path "" ""
norm_path . ""
norm_path ./ ""
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index 9acf628..12228b4 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -47,4 +47,57 @@ test_expect_success POSIXPERM,SANITY 'unreadable directory in PATH' '
test_cmp expect actual
'
+cat >expect <<-EOF
+preloaded output of a child
+Hello
+World
+preloaded output of a child
+Hello
+World
+preloaded output of a child
+Hello
+World
+preloaded output of a child
+Hello
+World
+EOF
+
+test_expect_success 'run_command runs in parallel with more jobs available than tasks' '
+ test-run-command run-command-parallel 5 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'run_command runs in parallel with as many jobs as tasks' '
+ test-run-command run-command-parallel 4 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'run_command runs in parallel with more tasks than jobs available' '
+ test-run-command run-command-parallel 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
+ test_cmp expect actual
+'
+
+cat >expect <<-EOF
+preloaded output of a child
+asking for a quick stop
+preloaded output of a child
+asking for a quick stop
+preloaded output of a child
+asking for a quick stop
+EOF
+
+test_expect_success 'run_command is asked to abort gracefully' '
+ test-run-command run-command-abort 3 false 2>actual &&
+ test_cmp expect actual
+'
+
+cat >expect <<-EOF
+no further jobs available
+EOF
+
+test_expect_success 'run_command outputs ' '
+ test-run-command run-command-no-jobs 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t1100-commit-tree-options.sh b/t/t1100-commit-tree-options.sh
index f8457f9..b7e9b4fc 100755
--- a/t/t1100-commit-tree-options.sh
+++ b/t/t1100-commit-tree-options.sh
@@ -35,11 +35,11 @@ test_expect_success \
GIT_COMMITTER_NAME="Committer Name" \
GIT_COMMITTER_EMAIL="committer@email" \
GIT_COMMITTER_DATE="2005-05-26 23:30" \
- TZ=GMT git commit-tree `cat treeid` >commitid 2>/dev/null'
+ TZ=GMT git commit-tree $(cat treeid) >commitid 2>/dev/null'
test_expect_success \
'read commit' \
- 'git cat-file commit `cat commitid` >commit'
+ 'git cat-file commit $(cat commitid) >commit'
test_expect_success \
'compare commit' \
diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh
index 20b022a..417eecc 100755
--- a/t/t1401-symbolic-ref.sh
+++ b/t/t1401-symbolic-ref.sh
@@ -29,7 +29,7 @@ reset_to_sane
test_expect_success 'symbolic-ref refuses bare sha1' '
echo content >file && git add file && git commit -m one &&
- test_must_fail git symbolic-ref HEAD `git rev-parse HEAD`
+ test_must_fail git symbolic-ref HEAD $(git rev-parse HEAD)
'
reset_to_sane
@@ -92,4 +92,41 @@ test_expect_success LONG_REF 'we can parse long symbolic ref' '
test_cmp expect actual
'
+test_expect_success 'symbolic-ref reports failure in exit code' '
+ test_when_finished "rm -f .git/HEAD.lock" &&
+ >.git/HEAD.lock &&
+ test_must_fail git symbolic-ref HEAD refs/heads/whatever
+'
+
+test_expect_success 'symbolic-ref writes reflog entry' '
+ git checkout -b log1 &&
+ test_commit one &&
+ git checkout -b log2 &&
+ test_commit two &&
+ git checkout --orphan orphan &&
+ git symbolic-ref -m create HEAD refs/heads/log1 &&
+ git symbolic-ref -m update HEAD refs/heads/log2 &&
+ cat >expect <<-\EOF &&
+ update
+ create
+ EOF
+ git log --format=%gs -g >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'symbolic-ref does not create ref d/f conflicts' '
+ git checkout -b df &&
+ test_commit df &&
+ test_must_fail git symbolic-ref refs/heads/df/conflict refs/heads/df &&
+ git pack-refs --all --prune &&
+ test_must_fail git symbolic-ref refs/heads/df/conflict refs/heads/df
+'
+
+test_expect_success 'symbolic-ref handles existing pointer to invalid name' '
+ head=$(git rev-parse HEAD) &&
+ git symbolic-ref HEAD refs/heads/outer &&
+ git update-ref refs/heads/outer/inner $head &&
+ git symbolic-ref HEAD refs/heads/unrelated
+'
+
test_done
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index b79049f..c623824 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -62,18 +62,18 @@ test_expect_success setup '
git add . &&
test_tick && git commit -m rabbit &&
- H=`git rev-parse --verify HEAD` &&
- A=`git rev-parse --verify HEAD:A` &&
- B=`git rev-parse --verify HEAD:A/B` &&
- C=`git rev-parse --verify HEAD:C` &&
- D=`git rev-parse --verify HEAD:A/D` &&
- E=`git rev-parse --verify HEAD:A/B/E` &&
+ H=$(git rev-parse --verify HEAD) &&
+ A=$(git rev-parse --verify HEAD:A) &&
+ B=$(git rev-parse --verify HEAD:A/B) &&
+ C=$(git rev-parse --verify HEAD:C) &&
+ D=$(git rev-parse --verify HEAD:A/D) &&
+ E=$(git rev-parse --verify HEAD:A/B/E) &&
check_fsck &&
test_chmod +x C &&
git add C &&
test_tick && git commit -m dragon &&
- L=`git rev-parse --verify HEAD` &&
+ L=$(git rev-parse --verify HEAD) &&
check_fsck &&
rm -f C A/B/E &&
@@ -81,15 +81,15 @@ test_expect_success setup '
echo horse >A/G &&
git add F A/G &&
test_tick && git commit -a -m sheep &&
- F=`git rev-parse --verify HEAD:F` &&
- G=`git rev-parse --verify HEAD:A/G` &&
- I=`git rev-parse --verify HEAD:A` &&
- J=`git rev-parse --verify HEAD` &&
+ F=$(git rev-parse --verify HEAD:F) &&
+ G=$(git rev-parse --verify HEAD:A/G) &&
+ I=$(git rev-parse --verify HEAD:A) &&
+ J=$(git rev-parse --verify HEAD) &&
check_fsck &&
rm -f A/G &&
test_tick && git commit -a -m monkey &&
- K=`git rev-parse --verify HEAD` &&
+ K=$(git rev-parse --verify HEAD) &&
check_fsck &&
check_have A B C D E F G H I J K L &&
@@ -325,4 +325,17 @@ test_expect_success 'parsing reverse reflogs at BUFSIZ boundaries' '
test_cmp expect actual
'
+test_expect_success 'no segfaults for reflog containing non-commit sha1s' '
+ git update-ref --create-reflog -m "Creating ref" \
+ refs/tests/tree-in-reflog HEAD &&
+ git update-ref -m "Forcing tree" refs/tests/tree-in-reflog HEAD^{tree} &&
+ git update-ref -m "Restoring to commit" refs/tests/tree-in-reflog HEAD &&
+ git reflog refs/tests/tree-in-reflog
+'
+
+test_expect_failure 'reflog with non-commit entries displays all entries' '
+ git reflog refs/tests/tree-in-reflog >actual &&
+ test_line_count = 3 actual
+'
+
test_done
diff --git a/t/t1511-rev-parse-caret.sh b/t/t1511-rev-parse-caret.sh
index 15973f2..7043ba7 100755
--- a/t/t1511-rev-parse-caret.sh
+++ b/t/t1511-rev-parse-caret.sh
@@ -6,11 +6,11 @@ test_description='tests for ref^{stuff}'
test_expect_success 'setup' '
echo blob >a-blob &&
- git tag -a -m blob blob-tag `git hash-object -w a-blob` &&
+ git tag -a -m blob blob-tag $(git hash-object -w a-blob) &&
mkdir a-tree &&
echo moreblobs >a-tree/another-blob &&
git add . &&
- TREE_SHA1=`git write-tree` &&
+ TREE_SHA1=$(git write-tree) &&
git tag -a -m tree tree-tag "$TREE_SHA1" &&
git commit -m Initial &&
git tag -a -m commit commit-tag &&
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 4a155c8..e221167 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -275,19 +275,19 @@ test_expect_success 'rev-parse --disambiguate' '
test_expect_success 'ambiguous 40-hex ref' '
TREE=$(git mktree </dev/null) &&
- REF=`git rev-parse HEAD` &&
+ REF=$(git rev-parse HEAD) &&
VAL=$(git commit-tree $TREE </dev/null) &&
git update-ref refs/heads/$REF $VAL &&
- test `git rev-parse $REF 2>err` = $REF &&
+ test $(git rev-parse $REF 2>err) = $REF &&
grep "refname.*${REF}.*ambiguous" err
'
test_expect_success 'ambiguous short sha1 ref' '
TREE=$(git mktree </dev/null) &&
- REF=`git rev-parse --short HEAD` &&
+ REF=$(git rev-parse --short HEAD) &&
VAL=$(git commit-tree $TREE </dev/null) &&
git update-ref refs/heads/$REF $VAL &&
- test `git rev-parse $REF 2>err` = $VAL &&
+ test $(git rev-parse $REF 2>err) = $VAL &&
grep "refname.*${REF}.*ambiguous" err
'
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 193d55c..8aef49f 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -55,7 +55,7 @@ test_expect_success 'disable split index' '
EOF
test_cmp ls-files.expect ls-files.actual &&
- BASE=`test-dump-split-index .git/index | grep "^own" | sed "s/own/base/"` &&
+ BASE=$(test-dump-split-index .git/index | grep "^own" | sed "s/own/base/") &&
test-dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<EOF &&
not a split index
diff --git a/t/t2011-checkout-invalid-head.sh b/t/t2011-checkout-invalid-head.sh
index 300f8bf..c5501b0 100755
--- a/t/t2011-checkout-invalid-head.sh
+++ b/t/t2011-checkout-invalid-head.sh
@@ -19,4 +19,43 @@ test_expect_success 'checkout master from invalid HEAD' '
git checkout master --
'
+test_expect_success 'checkout notices failure to lock HEAD' '
+ test_when_finished "rm -f .git/HEAD.lock" &&
+ >.git/HEAD.lock &&
+ test_must_fail git checkout -b other
+'
+
+test_expect_success 'create ref directory/file conflict scenario' '
+ git update-ref refs/heads/outer/inner master &&
+
+ # do not rely on symbolic-ref to get a known state,
+ # as it may use the same code we are testing
+ reset_to_df () {
+ echo "ref: refs/heads/outer" >.git/HEAD
+ }
+'
+
+test_expect_success 'checkout away from d/f HEAD (unpacked, to branch)' '
+ reset_to_df &&
+ git checkout master
+'
+
+test_expect_success 'checkout away from d/f HEAD (unpacked, to detached)' '
+ reset_to_df &&
+ git checkout --detach master
+'
+
+test_expect_success 'pack refs' '
+ git pack-refs --all --prune
+'
+
+test_expect_success 'checkout away from d/f HEAD (packed, to branch)' '
+ reset_to_df &&
+ git checkout master
+'
+
+test_expect_success 'checkout away from d/f HEAD (packed, to detached)' '
+ reset_to_df &&
+ git checkout --detach master
+'
test_done
diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
index 3694174..0a804da 100755
--- a/t/t2025-worktree-add.sh
+++ b/t/t2025-worktree-add.sh
@@ -123,10 +123,10 @@ test_expect_success 'checkout from a bare repo without "add"' '
test_expect_success 'checkout with grafts' '
test_when_finished rm .git/info/grafts &&
test_commit abc &&
- SHA1=`git rev-parse HEAD` &&
+ SHA1=$(git rev-parse HEAD) &&
test_commit def &&
test_commit xyz &&
- echo "`git rev-parse HEAD` $SHA1" >.git/info/grafts &&
+ echo "$(git rev-parse HEAD) $SHA1" >.git/info/grafts &&
cat >expected <<-\EOF &&
xyz
abc
diff --git a/t/t2102-update-index-symlinks.sh b/t/t2102-update-index-symlinks.sh
index 4d0d0a3..22f2c73 100755
--- a/t/t2102-update-index-symlinks.sh
+++ b/t/t2102-update-index-symlinks.sh
@@ -23,7 +23,7 @@ git update-index symlink'
test_expect_success \
'the index entry must still be a symbolic link' '
-case "`git ls-files --stage --cached symlink`" in
+case "$(git ls-files --stage --cached symlink)" in
120000" "*symlink) echo pass;;
*) echo fail; git ls-files --stage --cached symlink; (exit 1);;
esac'
diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index 88be904..c525656 100755
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -65,6 +65,13 @@ test_expect_success '--no-empty-directory hides empty directory' '
test_cmp expected3 output
'
+test_expect_success 'ls-files --others handles non-submodule .git' '
+ mkdir not-a-submodule &&
+ echo foo >not-a-submodule/.git &&
+ git ls-files -o >output &&
+ test_cmp expected1 output
+'
+
test_expect_success SYMLINKS 'ls-files --others with symlinked submodule' '
git init super &&
git init sub &&
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index da257c0..3fc484e 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -305,29 +305,4 @@ test_expect_success 'ls-files with "**" patterns and no slashes' '
test_cmp expect actual
'
-test_expect_success 'negative patterns' '
- git init reinclude &&
- (
- cd reinclude &&
- cat >.gitignore <<-\EOF &&
- /fooo
- /foo
- !foo/bar/bar
- EOF
- mkdir fooo &&
- cat >fooo/.gitignore <<-\EOF &&
- !/*
- EOF
- mkdir -p foo/bar &&
- touch abc foo/def foo/bar/ghi foo/bar/bar &&
- git ls-files -o --exclude-standard >../actual &&
- cat >../expected <<-\EOF &&
- .gitignore
- abc
- foo/bar/bar
- EOF
- test_cmp ../expected ../actual
- )
-'
-
test_done
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index 6224187..f7b0e59 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -263,7 +263,7 @@ test_expect_success 'setup 8' '
test_ln_s_add e a &&
test_tick &&
git commit -m "rename a->e, symlink a->e" &&
- oln=`printf e | git hash-object --stdin`
+ oln=$(printf e | git hash-object --stdin)
'
test_expect_success 'setup 9' '
diff --git a/t/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh
index eb73c06..325114f 100755
--- a/t/t3100-ls-tree-restrict.sh
+++ b/t/t3100-ls-tree-restrict.sh
@@ -28,7 +28,7 @@ test_expect_success \
echo Mi >path2/baz/b &&
find path? \( -type f -o -type l \) -print |
xargs git update-index --add &&
- tree=`git write-tree` &&
+ tree=$(git write-tree) &&
echo $tree'
test_output () {
diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh
index 026f9f8..425d858 100755
--- a/t/t3101-ls-tree-dirname.sh
+++ b/t/t3101-ls-tree-dirname.sh
@@ -35,7 +35,7 @@ test_expect_success 'setup' '
echo 222 >path3/2.txt &&
find *.txt path* \( -type f -o -type l \) -print |
xargs git update-index --add &&
- tree=`git write-tree` &&
+ tree=$(git write-tree) &&
echo $tree
'
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index d3913f9..4261403 100755
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -176,4 +176,12 @@ test_expect_success 'git branch --points-at option' '
test_cmp expect actual
'
+test_expect_success 'ambiguous branch/tag not marked' '
+ git tag ambiguous &&
+ git branch ambiguous &&
+ echo " ambiguous" >expect &&
+ git branch --list ambiguous >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index db244d2..9b182a0 100755
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -27,7 +27,7 @@ SHA1=
test_expect_success \
'see if git show-ref works as expected' \
'git branch a &&
- SHA1=`cat .git/refs/heads/a` &&
+ SHA1=$(cat .git/refs/heads/a) &&
echo "$SHA1 refs/heads/a" >expect &&
git show-ref a >result &&
test_cmp expect result'
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index cd70274..2d200fd 100755
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -83,6 +83,16 @@ test_expect_success 'edit existing notes' '
test_must_fail git notes show HEAD^
'
+test_expect_success 'show notes from treeish' '
+ test "b3" = "$(git notes --ref commits^{tree} show)" &&
+ test "b4" = "$(git notes --ref commits@{1} show)"
+'
+
+test_expect_success 'cannot edit notes from non-ref' '
+ test_must_fail git notes --ref commits^{tree} edit &&
+ test_must_fail git notes --ref commits@{1} edit
+'
+
test_expect_success 'cannot "git notes add -m" where notes already exists' '
test_must_fail git notes add -m "b2" &&
test_path_is_missing .git/NOTES_EDITMSG &&
diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh
index 24d82b4..19aed7e 100755
--- a/t/t3308-notes-merge.sh
+++ b/t/t3308-notes-merge.sh
@@ -18,7 +18,9 @@ test_expect_success setup '
git notes add -m "Notes on 1st commit" 1st &&
git notes add -m "Notes on 2nd commit" 2nd &&
git notes add -m "Notes on 3rd commit" 3rd &&
- git notes add -m "Notes on 4th commit" 4th
+ git notes add -m "Notes on 4th commit" 4th &&
+ # Copy notes to remote-notes
+ git fetch . refs/notes/*:refs/remote-notes/origin/*
'
commit_sha1=$(git rev-parse 1st^{commit})
@@ -66,7 +68,9 @@ test_expect_success 'verify initial notes (x)' '
'
cp expect_notes_x expect_notes_y
+cp expect_notes_x expect_notes_v
cp expect_log_x expect_log_y
+cp expect_log_x expect_log_v
test_expect_success 'fail to merge empty notes ref into empty notes ref (z => y)' '
test_must_fail git -c "core.notesRef=refs/notes/y" notes merge z
@@ -84,16 +88,12 @@ test_expect_success 'fail to merge into various non-notes refs' '
test_must_fail git -c "core.notesRef=refs/notes/foo^{bar" notes merge x
'
-test_expect_success 'fail to merge various non-note-trees' '
- git config core.notesRef refs/notes/y &&
- test_must_fail git notes merge refs/notes &&
- test_must_fail git notes merge refs/notes/ &&
- test_must_fail git notes merge refs/notes/dir &&
- test_must_fail git notes merge refs/notes/dir/ &&
- test_must_fail git notes merge refs/heads/master &&
- test_must_fail git notes merge x: &&
- test_must_fail git notes merge x:foo &&
- test_must_fail git notes merge foo^{bar
+test_expect_success 'merge non-notes ref into empty notes ref (remote-notes/origin/x => v)' '
+ git config core.notesRef refs/notes/v &&
+ git notes merge refs/remote-notes/origin/x &&
+ verify_notes v &&
+ # refs/remote-notes/origin/x and v should point to the same notes commit
+ test "$(git rev-parse refs/remote-notes/origin/x)" = "$(git rev-parse refs/notes/v)"
'
test_expect_success 'merge notes into empty notes ref (x => y)' '
diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index 3968020..1f5122b 100755
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -67,7 +67,7 @@ test_expect_success 'rebase --skip with --merge' '
'
test_expect_success 'merge and reference trees equal' '
- test -z "`git diff-tree skip-merge skip-reference`"
+ test -z "$(git diff-tree skip-merge skip-reference)"
'
test_expect_success 'moved back to branch correctly' '
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 9067e02..544f9ad 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1006,6 +1006,22 @@ test_expect_success 'rebase -i with --strategy and -X' '
test $(cat file1) = Z
'
+test_expect_success 'interrupted rebase -i with --strategy and -X' '
+ git checkout -b conflict-merge-use-theirs-interrupted conflict-branch &&
+ git reset --hard HEAD^ &&
+ >breakpoint &&
+ git add breakpoint &&
+ git commit -m "breakpoint for interactive mode" &&
+ echo five >conflict &&
+ echo Z >file1 &&
+ git commit -a -m "one file conflict" &&
+ set_fake_editor &&
+ FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive -Xours conflict-branch &&
+ git rebase --continue &&
+ test $(git show conflict-branch:conflict) = $(cat conflict) &&
+ test $(cat file1) = Z
+'
+
test_expect_success 'rebase -i error on commits with \ in message' '
current_head=$(git rev-parse HEAD) &&
test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
diff --git a/t/t3511-cherry-pick-x.sh b/t/t3511-cherry-pick-x.sh
index b7dff09..9cce5ae 100755
--- a/t/t3511-cherry-pick-x.sh
+++ b/t/t3511-cherry-pick-x.sh
@@ -77,7 +77,7 @@ test_expect_success setup '
test_expect_success 'cherry-pick -x inserts blank line after one line subject' '
pristine_detach initial &&
- sha1=`git rev-parse mesg-one-line^0` &&
+ sha1=$(git rev-parse mesg-one-line^0) &&
git cherry-pick -x mesg-one-line &&
cat <<-EOF >expect &&
$mesg_one_line
@@ -114,7 +114,7 @@ test_expect_success 'cherry-pick -s inserts blank line after non-conforming foot
test_expect_success 'cherry-pick -x inserts blank line when conforming footer not found' '
pristine_detach initial &&
- sha1=`git rev-parse mesg-no-footer^0` &&
+ sha1=$(git rev-parse mesg-no-footer^0) &&
git cherry-pick -x mesg-no-footer &&
cat <<-EOF >expect &&
$mesg_no_footer
@@ -139,7 +139,7 @@ test_expect_success 'cherry-pick -s inserts blank line when conforming footer no
test_expect_success 'cherry-pick -x -s inserts blank line when conforming footer not found' '
pristine_detach initial &&
- sha1=`git rev-parse mesg-no-footer^0` &&
+ sha1=$(git rev-parse mesg-no-footer^0) &&
git cherry-pick -x -s mesg-no-footer &&
cat <<-EOF >expect &&
$mesg_no_footer
@@ -164,7 +164,7 @@ test_expect_success 'cherry-pick -s adds sob when last sob doesnt match committe
test_expect_success 'cherry-pick -x -s adds sob when last sob doesnt match committer' '
pristine_detach initial &&
- sha1=`git rev-parse mesg-with-footer^0` &&
+ sha1=$(git rev-parse mesg-with-footer^0) &&
git cherry-pick -x -s mesg-with-footer &&
cat <<-EOF >expect &&
$mesg_with_footer
@@ -187,7 +187,7 @@ test_expect_success 'cherry-pick -s refrains from adding duplicate trailing sob'
test_expect_success 'cherry-pick -x -s adds sob even when trailing sob exists for committer' '
pristine_detach initial &&
- sha1=`git rev-parse mesg-with-footer-sob^0` &&
+ sha1=$(git rev-parse mesg-with-footer-sob^0) &&
git cherry-pick -x -s mesg-with-footer-sob &&
cat <<-EOF >expect &&
$mesg_with_footer_sob
@@ -200,7 +200,7 @@ test_expect_success 'cherry-pick -x -s adds sob even when trailing sob exists fo
test_expect_success 'cherry-pick -x treats "(cherry picked from..." line as part of footer' '
pristine_detach initial &&
- sha1=`git rev-parse mesg-with-cherry-footer^0` &&
+ sha1=$(git rev-parse mesg-with-cherry-footer^0) &&
git cherry-pick -x mesg-with-cherry-footer &&
cat <<-EOF >expect &&
$mesg_with_cherry_footer
@@ -223,7 +223,7 @@ test_expect_success 'cherry-pick -s treats "(cherry picked from..." line as part
test_expect_success 'cherry-pick -x -s treats "(cherry picked from..." line as part of footer' '
pristine_detach initial &&
- sha1=`git rev-parse mesg-with-cherry-footer^0` &&
+ sha1=$(git rev-parse mesg-with-cherry-footer^0) &&
git cherry-pick -x -s mesg-with-cherry-footer &&
cat <<-EOF >expect &&
$mesg_with_cherry_footer
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 9d90d2c..2e47a2b 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -115,7 +115,7 @@ test_expect_success '"rm" command printed' '
git add test-file &&
git commit -m "add file for rm test" &&
git rm test-file > rm-output &&
- test `grep "^rm " rm-output | wc -l` = 1 &&
+ test $(grep "^rm " rm-output | wc -l) = 1 &&
rm -f test-file rm-output &&
git commit -m "remove file from rm test"
'
@@ -125,7 +125,7 @@ test_expect_success '"rm" command suppressed with --quiet' '
git add test-file &&
git commit -m "add file for rm --quiet test" &&
git rm --quiet test-file > rm-output &&
- test `wc -l < rm-output` = 0 &&
+ test $(wc -l < rm-output) = 0 &&
rm -f test-file rm-output &&
git commit -m "remove file from rm --quiet test"
'
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index f7ff1f5..f14a665 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -25,7 +25,7 @@ test_expect_success \
echo foo >xfoo1 &&
chmod 755 xfoo1 &&
git add xfoo1 &&
- case "`git ls-files --stage xfoo1`" in
+ case "$(git ls-files --stage xfoo1)" in
100644" "*xfoo1) echo pass;;
*) echo fail; git ls-files --stage xfoo1; (exit 1);;
esac'
@@ -33,7 +33,7 @@ test_expect_success \
test_expect_success 'git add: filemode=0 should not get confused by symlink' '
rm -f xfoo1 &&
test_ln_s_add foo xfoo1 &&
- case "`git ls-files --stage xfoo1`" in
+ case "$(git ls-files --stage xfoo1)" in
120000" "*xfoo1) echo pass;;
*) echo fail; git ls-files --stage xfoo1; (exit 1);;
esac
@@ -45,7 +45,7 @@ test_expect_success \
echo foo >xfoo2 &&
chmod 755 xfoo2 &&
git update-index --add xfoo2 &&
- case "`git ls-files --stage xfoo2`" in
+ case "$(git ls-files --stage xfoo2)" in
100644" "*xfoo2) echo pass;;
*) echo fail; git ls-files --stage xfoo2; (exit 1);;
esac'
@@ -53,7 +53,7 @@ test_expect_success \
test_expect_success 'git add: filemode=0 should not get confused by symlink' '
rm -f xfoo2 &&
test_ln_s_add foo xfoo2 &&
- case "`git ls-files --stage xfoo2`" in
+ case "$(git ls-files --stage xfoo2)" in
120000" "*xfoo2) echo pass;;
*) echo fail; git ls-files --stage xfoo2; (exit 1);;
esac
@@ -63,7 +63,7 @@ test_expect_success \
'git update-index --add: Test that executable bit is not used...' \
'git config core.filemode 0 &&
test_ln_s_add xfoo2 xfoo3 && # runs git update-index --add
- case "`git ls-files --stage xfoo3`" in
+ case "$(git ls-files --stage xfoo3)" in
120000" "*xfoo3) echo pass;;
*) echo fail; git ls-files --stage xfoo3; (exit 1);;
esac'
@@ -173,14 +173,14 @@ test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over st
test_expect_success 'git add --refresh' '
>foo && git add foo && git commit -a -m "commit all" &&
- test -z "`git diff-index HEAD -- foo`" &&
+ test -z "$(git diff-index HEAD -- foo)" &&
git read-tree HEAD &&
- case "`git diff-index HEAD -- foo`" in
+ case "$(git diff-index HEAD -- foo)" in
:100644" "*"M foo") echo pass;;
*) echo fail; (exit 1);;
esac &&
git add --refresh -- foo &&
- test -z "`git diff-index HEAD -- foo`"
+ test -z "$(git diff-index HEAD -- foo)"
'
test_expect_success 'git add --refresh with pathspec' '
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 890db11..3b99434 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -1431,4 +1431,33 @@ test_expect_success 'cover letter auto user override' '
test_line_count = 2 list
'
+test_expect_success 'format-patch --zero-commit' '
+ git format-patch --zero-commit --stdout v2..v1 >patch2 &&
+ grep "^From " patch2 | sort | uniq >actual &&
+ echo "From $_z40 Mon Sep 17 00:00:00 2001" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'From line has expected format' '
+ git format-patch --stdout v2..v1 >patch2 &&
+ grep "^From " patch2 >from &&
+ grep "^From $_x40 Mon Sep 17 00:00:00 2001$" patch2 >filtered &&
+ test_cmp from filtered
+'
+
+test_expect_success 'format-patch format.outputDirectory option' '
+ test_config format.outputDirectory patches &&
+ rm -fr patches &&
+ git format-patch master..side &&
+ test $(git rev-list master..side | wc -l) -eq $(ls patches | wc -l)
+'
+
+test_expect_success 'format-patch -o overrides format.outputDirectory' '
+ test_config format.outputDirectory patches &&
+ rm -fr patches patchset &&
+ git format-patch master..side -o patchset &&
+ test_path_is_missing patches &&
+ test_path_is_dir patchset
+'
+
test_done
diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh
index c0460bb..43dd474 100755
--- a/t/t4056-diff-order.sh
+++ b/t/t4056-diff-order.sh
@@ -68,6 +68,12 @@ test_expect_success POSIXPERM,SANITY 'unreadable orderfile' '
test_must_fail git diff -Ounreadable_file --name-only HEAD^..HEAD
'
+test_expect_success "orderfile using option from subdir with --output" '
+ mkdir subdir &&
+ git -C subdir diff -O../order_file_1 --output ../actual --name-only HEAD^..HEAD &&
+ test_cmp expect_1 actual
+'
+
for i in 1 2
do
test_expect_success "orderfile using option ($i)" '
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 7600a3e..f5e6367 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -120,6 +120,12 @@ test_expect_success !MINGW 'shortlog from non-git directory' '
test_cmp expect out
'
+test_expect_success !MINGW 'shortlog can read --format=raw output' '
+ git log --format=raw HEAD >log &&
+ GIT_DIR=non-existing git shortlog -w <log >out &&
+ test_cmp expect out
+'
+
test_expect_success 'shortlog should add newline when input line matches wraplen' '
cat >expect <<\EOF &&
A U Thor (2):
@@ -172,22 +178,6 @@ test_expect_success !MINGW 'shortlog encoding' '
git shortlog HEAD~2.. > out &&
test_cmp expect out'
-test_expect_success 'shortlog ignores commits with missing authors' '
- git commit --allow-empty -m normal &&
- git commit --allow-empty -m soon-to-be-broken &&
- git cat-file commit HEAD >commit.tmp &&
- sed "/^author/d" commit.tmp >broken.tmp &&
- commit=$(git hash-object -w -t commit --stdin <broken.tmp) &&
- git update-ref HEAD $commit &&
- cat >expect <<-\EOF &&
- A U Thor (1):
- normal
-
- EOF
- git shortlog HEAD~2.. >actual &&
- test_cmp expect actual
-'
-
test_expect_success 'shortlog with revision pseudo options' '
git shortlog --all &&
git shortlog --branches &&
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 6ede069..cb82eb7 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -908,4 +908,33 @@ test_expect_success 'log diagnoses bogus HEAD' '
test_i18ngrep broken stderr
'
+test_expect_success 'set up --source tests' '
+ git checkout --orphan source-a &&
+ test_commit one &&
+ test_commit two &&
+ git checkout -b source-b HEAD^ &&
+ test_commit three
+'
+
+test_expect_success 'log --source paints branch names' '
+ cat >expect <<-\EOF &&
+ 09e12a9 source-b three
+ 8e393e1 source-a two
+ 1ac6c77 source-b one
+ EOF
+ git log --oneline --source source-a source-b >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'log --source paints tag names' '
+ git tag -m tagged source-tag &&
+ cat >expect <<-\EOF &&
+ 09e12a9 source-tag three
+ 8e393e1 source-a two
+ 1ac6c77 source-tag one
+ EOF
+ git log --oneline --source source-tag source-a >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index e97cfb2..85b3df5 100755
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -9,9 +9,9 @@ test_description='git mailinfo and git mailsplit test'
test_expect_success 'split sample box' \
'git mailsplit -o. "$TEST_DIRECTORY"/t5100/sample.mbox >last &&
- last=`cat last` &&
+ last=$(cat last) &&
echo total is $last &&
- test `cat last` = 17'
+ test $(cat last) = 17'
check_mailinfo () {
mail=$1 opt=$2
@@ -23,7 +23,7 @@ check_mailinfo () {
}
-for mail in `echo 00*`
+for mail in 00*
do
test_expect_success "mailinfo $mail" '
check_mailinfo $mail "" &&
@@ -47,11 +47,11 @@ test_expect_success 'split box with rfc2047 samples' \
'mkdir rfc2047 &&
git mailsplit -orfc2047 "$TEST_DIRECTORY"/t5100/rfc2047-samples.mbox \
>rfc2047/last &&
- last=`cat rfc2047/last` &&
+ last=$(cat rfc2047/last) &&
echo total is $last &&
- test `cat rfc2047/last` = 11'
+ test $(cat rfc2047/last) = 11'
-for mail in `echo rfc2047/00*`
+for mail in rfc2047/00*
do
test_expect_success "mailinfo $mail" '
git mailinfo -u $mail-msg $mail-patch <$mail >$mail-info &&
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 20c1961..fc2be63 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -8,7 +8,7 @@ test_description='git pack-object
'
. ./test-lib.sh
-TRASH=`pwd`
+TRASH=$(pwd)
test_expect_success \
'setup' \
@@ -20,8 +20,8 @@ test_expect_success \
test-genrandom "seed b" 2097152 > b_big &&
git update-index --add a a_big b b_big c &&
cat c >d && echo foo >>d && git update-index --add d &&
- tree=`git write-tree` &&
- commit=`git commit-tree $tree </dev/null` && {
+ tree=$(git write-tree) &&
+ commit=$(git commit-tree $tree </dev/null) && {
echo $tree &&
echo $commit &&
git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
@@ -29,7 +29,7 @@ test_expect_success \
git diff-tree --root -p $commit &&
while read object
do
- t=`git cat-file -t $object` &&
+ t=$(git cat-file -t $object) &&
git cat-file $t $object || return 1
done <obj-list
} >expect'
@@ -147,7 +147,7 @@ test_expect_success \
git diff-tree --root -p $commit &&
while read object
do
- t=`git cat-file -t $object` &&
+ t=$(git cat-file -t $object) &&
git cat-file $t $object || return 1
done <obj-list
} >current &&
@@ -162,7 +162,7 @@ test_expect_success \
git diff-tree --root -p $commit &&
while read object
do
- t=`git cat-file -t $object` &&
+ t=$(git cat-file -t $object) &&
git cat-file $t $object || return 1
done <obj-list
} >current &&
@@ -177,7 +177,7 @@ test_expect_success \
git diff-tree --root -p $commit &&
while read object
do
- t=`git cat-file -t $object` &&
+ t=$(git cat-file -t $object) &&
git cat-file $t $object || return 1
done <obj-list
} >current &&
@@ -252,8 +252,8 @@ test_expect_success \
test_expect_success \
'verify-pack catches a corrupted sum of the index file itself' \
- 'l=`wc -c <test-3.idx` &&
- l=`expr $l - 20` &&
+ 'l=$(wc -c <test-3.idx) &&
+ l=$(expr $l - 20) &&
cat test-1-${packname_1}.pack >test-3.pack &&
printf "%20s" "" | dd of=test-3.idx count=20 bs=1 conv=notrunc seek=$l &&
if git verify-pack test-3.pack
diff --git a/t/t5301-sliding-window.sh b/t/t5301-sliding-window.sh
index 2fc5af6..cae8c2e 100755
--- a/t/t5301-sliding-window.sh
+++ b/t/t5301-sliding-window.sh
@@ -16,12 +16,12 @@ test_expect_success \
git update-index --add $i || return 1
done &&
echo d >d && cat c >>d && git update-index --add d &&
- tree=`git write-tree` &&
- commit1=`git commit-tree $tree </dev/null` &&
+ tree=$(git write-tree) &&
+ commit1=$(git commit-tree $tree </dev/null) &&
git update-ref HEAD $commit1 &&
git repack -a -d &&
- test "`git count-objects`" = "0 objects, 0 kilobytes" &&
- pack1=`ls .git/objects/pack/*.pack` &&
+ test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
+ pack1=$(ls .git/objects/pack/*.pack) &&
test -f "$pack1"'
test_expect_success \
@@ -43,11 +43,11 @@ test_expect_success \
'repack -a -d, packedGit{WindowSize,Limit} == 1 page' \
'git config core.packedGitWindowSize 512 &&
git config core.packedGitLimit 512 &&
- commit2=`git commit-tree $tree -p $commit1 </dev/null` &&
+ commit2=$(git commit-tree $tree -p $commit1 </dev/null) &&
git update-ref HEAD $commit2 &&
git repack -a -d &&
- test "`git count-objects`" = "0 objects, 0 kilobytes" &&
- pack2=`ls .git/objects/pack/*.pack` &&
+ test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
+ pack2=$(ls .git/objects/pack/*.pack) &&
test -f "$pack2" &&
test "$pack1" \!= "$pack2"'
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index 3dc5ec4..c2fc584 100755
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -14,21 +14,21 @@ test_expect_success \
i=1 &&
while test $i -le 100
do
- iii=`printf '%03i' $i`
+ iii=$(printf '%03i' $i)
test-genrandom "bar" 200 > wide_delta_$iii &&
test-genrandom "baz $iii" 50 >> wide_delta_$iii &&
test-genrandom "foo"$i 100 > deep_delta_$iii &&
- test-genrandom "foo"`expr $i + 1` 100 >> deep_delta_$iii &&
- test-genrandom "foo"`expr $i + 2` 100 >> deep_delta_$iii &&
+ test-genrandom "foo"$(expr $i + 1) 100 >> deep_delta_$iii &&
+ test-genrandom "foo"$(expr $i + 2) 100 >> deep_delta_$iii &&
echo $iii >file_$iii &&
test-genrandom "$iii" 8192 >>file_$iii &&
git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
- i=`expr $i + 1` || return 1
+ i=$(expr $i + 1) || return 1
done &&
{ echo 101 && test-genrandom 100 8192; } >file_101 &&
git update-index --add file_101 &&
- tree=`git write-tree` &&
- commit=`git commit-tree $tree </dev/null` && {
+ tree=$(git write-tree) &&
+ commit=$(git commit-tree $tree </dev/null) && {
echo $tree &&
git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
} >obj-list &&
@@ -152,10 +152,10 @@ test_expect_success \
'[index v1] 2) create a stealth corruption in a delta base reference' \
'# This test assumes file_101 is a delta smaller than 16 bytes.
# It should be against file_100 but we substitute its base for file_099
- sha1_101=`git hash-object file_101` &&
- sha1_099=`git hash-object file_099` &&
- offs_101=`index_obj_offset 1.idx $sha1_101` &&
- nr_099=`index_obj_nr 1.idx $sha1_099` &&
+ sha1_101=$(git hash-object file_101) &&
+ sha1_099=$(git hash-object file_099) &&
+ offs_101=$(index_obj_offset 1.idx $sha1_101) &&
+ nr_099=$(index_obj_nr 1.idx $sha1_099) &&
chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
if=".git/objects/pack/pack-${pack1}.idx" \
@@ -193,10 +193,10 @@ test_expect_success \
'[index v2] 2) create a stealth corruption in a delta base reference' \
'# This test assumes file_101 is a delta smaller than 16 bytes.
# It should be against file_100 but we substitute its base for file_099
- sha1_101=`git hash-object file_101` &&
- sha1_099=`git hash-object file_099` &&
- offs_101=`index_obj_offset 1.idx $sha1_101` &&
- nr_099=`index_obj_nr 1.idx $sha1_099` &&
+ sha1_101=$(git hash-object file_101) &&
+ sha1_099=$(git hash-object file_099) &&
+ offs_101=$(index_obj_offset 1.idx $sha1_101) &&
+ nr_099=$(index_obj_nr 1.idx $sha1_099) &&
chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
if=".git/objects/pack/pack-${pack1}.idx" \
@@ -222,11 +222,11 @@ test_expect_success \
'rm -f .git/objects/pack/* &&
git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
- obj=`git hash-object file_001` &&
- nr=`index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj` &&
+ obj=$(git hash-object file_001) &&
+ nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) &&
chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
- bs=1 count=4 seek=$((8 + 256 * 4 + `wc -l <obj-list` * 20 + $nr * 4)) &&
+ bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * 20 + $nr * 4)) &&
( while read obj
do git cat-file -p $obj >/dev/null || exit 1
done <obj-list ) &&
diff --git a/t/t5303-pack-corruption-resilience.sh b/t/t5303-pack-corruption-resilience.sh
index 663b02b..5940ce2 100755
--- a/t/t5303-pack-corruption-resilience.sh
+++ b/t/t5303-pack-corruption-resilience.sh
@@ -32,23 +32,23 @@ create_test_files() {
create_new_pack() {
rm -rf .git &&
git init &&
- blob_1=`git hash-object -t blob -w file_1` &&
- blob_2=`git hash-object -t blob -w file_2` &&
- blob_3=`git hash-object -t blob -w file_3` &&
- pack=`printf "$blob_1\n$blob_2\n$blob_3\n" |
- git pack-objects $@ .git/objects/pack/pack` &&
+ blob_1=$(git hash-object -t blob -w file_1) &&
+ blob_2=$(git hash-object -t blob -w file_2) &&
+ blob_3=$(git hash-object -t blob -w file_3) &&
+ pack=$(printf "$blob_1\n$blob_2\n$blob_3\n" |
+ git pack-objects $@ .git/objects/pack/pack) &&
pack=".git/objects/pack/pack-${pack}" &&
git verify-pack -v ${pack}.pack
}
do_repack() {
- pack=`printf "$blob_1\n$blob_2\n$blob_3\n" |
- git pack-objects $@ .git/objects/pack/pack` &&
+ pack=$(printf "$blob_1\n$blob_2\n$blob_3\n" |
+ git pack-objects $@ .git/objects/pack/pack) &&
pack=".git/objects/pack/pack-${pack}"
}
do_corrupt_object() {
- ofs=`git show-index < ${pack}.idx | grep $1 | cut -f1 -d" "` &&
+ ofs=$(git show-index < ${pack}.idx | grep $1 | cut -f1 -d" ") &&
ofs=$(($ofs + $2)) &&
chmod +w ${pack}.pack &&
dd of=${pack}.pack bs=1 conv=notrunc seek=$ofs &&
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index def203c..133b584 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -266,7 +266,7 @@ EOF
'
test_expect_success 'prune .git/shallow' '
- SHA1=`echo hi|git commit-tree HEAD^{tree}` &&
+ SHA1=$(echo hi|git commit-tree HEAD^{tree}) &&
echo $SHA1 >.git/shallow &&
git prune --dry-run >out &&
grep $SHA1 .git/shallow &&
diff --git a/t/t5305-include-tag.sh b/t/t5305-include-tag.sh
index 21517c7..f314ad5 100755
--- a/t/t5305-include-tag.sh
+++ b/t/t5305-include-tag.sh
@@ -3,20 +3,20 @@
test_description='git pack-object --include-tag'
. ./test-lib.sh
-TRASH=`pwd`
+TRASH=$(pwd)
test_expect_success setup '
echo c >d &&
git update-index --add d &&
- tree=`git write-tree` &&
- commit=`git commit-tree $tree </dev/null` &&
+ tree=$(git write-tree) &&
+ commit=$(git commit-tree $tree </dev/null) &&
echo "object $commit" >sig &&
echo "type commit" >>sig &&
echo "tag mytag" >>sig &&
echo "tagger $(git var GIT_COMMITTER_IDENT)" >>sig &&
echo >>sig &&
echo "our test tag" >>sig &&
- tag=`git mktag <sig` &&
+ tag=$(git mktag <sig) &&
rm d sig &&
git update-ref refs/tags/mytag $tag && {
echo $tree &&
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 3a9b775..e5f83bf 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -14,7 +14,7 @@ test_description='Testing multi_ack pack fetching'
add () {
name=$1 &&
text="$@" &&
- branch=`echo $name | sed -e 's/^\(.\).*$/\1/'` &&
+ branch=$(echo $name | sed -e 's/^\(.\).*$/\1/') &&
parents="" &&
shift &&
@@ -50,18 +50,18 @@ pull_to_client () {
case "$heads" in *B*)
echo $BTIP > .git/refs/heads/B;;
esac &&
- git symbolic-ref HEAD refs/heads/`echo $heads \
- | sed -e "s/^\(.\).*$/\1/"` &&
+ git symbolic-ref HEAD refs/heads/$(echo $heads \
+ | sed -e "s/^\(.\).*$/\1/") &&
git fsck --full &&
mv .git/objects/pack/pack-* . &&
- p=`ls -1 pack-*.pack` &&
+ p=$(ls -1 pack-*.pack) &&
git unpack-objects <$p &&
git fsck --full &&
- idx=`echo pack-*.idx` &&
- pack_count=`git show-index <$idx | wc -l` &&
+ idx=$(echo pack-*.idx) &&
+ pack_count=$(git show-index <$idx | wc -l) &&
test $pack_count = $count &&
rm -f pack-*
)
@@ -132,13 +132,13 @@ test_expect_success 'single given branch clone' '
test_expect_success 'clone shallow depth 1' '
git clone --no-single-branch --depth 1 "file://$(pwd)/." shallow0 &&
- test "`git --git-dir=shallow0/.git rev-list --count HEAD`" = 1
+ test "$(git --git-dir=shallow0/.git rev-list --count HEAD)" = 1
'
test_expect_success 'clone shallow depth 1 with fsck' '
git config --global fetch.fsckobjects true &&
git clone --no-single-branch --depth 1 "file://$(pwd)/." shallow0fsck &&
- test "`git --git-dir=shallow0fsck/.git rev-list --count HEAD`" = 1 &&
+ test "$(git --git-dir=shallow0fsck/.git rev-list --count HEAD)" = 1 &&
git config --global --unset fetch.fsckobjects
'
@@ -147,7 +147,7 @@ test_expect_success 'clone shallow' '
'
test_expect_success 'clone shallow depth count' '
- test "`git --git-dir=shallow/.git rev-list --count HEAD`" = 2
+ test "$(git --git-dir=shallow/.git rev-list --count HEAD)" = 2
'
test_expect_success 'clone shallow object count' '
@@ -273,7 +273,7 @@ test_expect_success 'additional simple shallow deepenings' '
'
test_expect_success 'clone shallow depth count' '
- test "`git --git-dir=shallow/.git rev-list --count HEAD`" = 11
+ test "$(git --git-dir=shallow/.git rev-list --count HEAD)" = 11
'
test_expect_success 'clone shallow object count' '
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index dfaf9d9..1a8e3b8 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -85,7 +85,7 @@ test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '
test_expect_success 'remote forces tracking branches' '
(
cd test &&
- case `git config remote.second.fetch` in
+ case $(git config remote.second.fetch) in
+*) true ;;
*) false ;;
esac
diff --git a/t/t5506-remote-groups.sh b/t/t5506-remote-groups.sh
index 530b016..83d5558 100755
--- a/t/t5506-remote-groups.sh
+++ b/t/t5506-remote-groups.sh
@@ -20,7 +20,7 @@ update_repos() {
}
repo_fetched() {
- if test "`git log -1 --pretty=format:%s $1 --`" = "`cat mark`"; then
+ if test "$(git log -1 --pretty=format:%s $1 --)" = "$(cat mark)"; then
echo >&2 "repo was fetched: $1"
return 0
fi
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 0ba9db0..9203a65 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -7,7 +7,7 @@ test_description='Per branch config variables affects "git fetch".
. ./test-lib.sh
-D=`pwd`
+D=$(pwd)
test_bundle_object_count () {
git verify-pack -v "$1" >verify.out &&
@@ -64,8 +64,8 @@ test_expect_success "fetch test" '
cd two &&
git fetch &&
test -f .git/refs/heads/one &&
- mine=`git rev-parse refs/heads/one` &&
- his=`cd ../one && git rev-parse refs/heads/master` &&
+ mine=$(git rev-parse refs/heads/one) &&
+ his=$(cd ../one && git rev-parse refs/heads/master) &&
test "z$mine" = "z$his"
'
@@ -75,8 +75,8 @@ test_expect_success "fetch test for-merge" '
git fetch &&
test -f .git/refs/heads/two &&
test -f .git/refs/heads/one &&
- master_in_two=`cd ../two && git rev-parse master` &&
- one_in_two=`cd ../two && git rev-parse one` &&
+ master_in_two=$(cd ../two && git rev-parse master) &&
+ one_in_two=$(cd ../two && git rev-parse one) &&
{
echo "$one_in_two "
echo "$master_in_two not-for-merge"
@@ -708,4 +708,17 @@ test_expect_success 'fetching a one-level ref works' '
)
'
+test_expect_success 'fetching with auto-gc does not lock up' '
+ write_script askyesno <<-\EOF &&
+ echo "$*" &&
+ false
+ EOF
+ git clone "file://$D" auto-gc &&
+ test_commit test2 &&
+ cd auto-gc &&
+ git config gc.autoPackLimit 1 &&
+ GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
+ ! grep "Should I try again" fetch.out
+'
+
test_done
diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index aadaac5..819b9dd 100755
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -163,4 +163,49 @@ test_expect_success 'overrides work between mixed transfer/upload-pack hideRefs'
grep refs/tags/magic actual
'
+test_expect_success 'ls-remote --symref' '
+ cat >expect <<-\EOF &&
+ ref: refs/heads/master HEAD
+ 1bd44cb9d13204b0fe1958db0082f5028a16eb3a HEAD
+ 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/master
+ 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/remotes/origin/HEAD
+ 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/remotes/origin/master
+ 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark
+ EOF
+ git ls-remote --symref >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'ls-remote with filtered symref (refname)' '
+ cat >expect <<-\EOF &&
+ ref: refs/heads/master HEAD
+ 1bd44cb9d13204b0fe1958db0082f5028a16eb3a HEAD
+ EOF
+ git ls-remote --symref . HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'ls-remote with filtered symref (--heads)' '
+ git symbolic-ref refs/heads/foo refs/tags/mark &&
+ cat >expect <<-\EOF &&
+ ref: refs/tags/mark refs/heads/foo
+ 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/foo
+ 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/master
+ EOF
+ git ls-remote --symref --heads . >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'ls-remote --symref omits filtered-out matches' '
+ cat >expect <<-\EOF &&
+ 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/foo
+ 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/master
+ EOF
+ git ls-remote --symref --heads . >actual &&
+ test_cmp expect actual &&
+ git ls-remote --symref . "refs/heads/*" >actual &&
+ test_cmp expect actual
+'
+
+
test_done
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index dbb927d..36b0dbc 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -128,8 +128,8 @@ do
case "$cmd" in
'' | '#'*) continue ;;
esac
- test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
- pfx=`printf "%04d" $test_count`
+ test=$(echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g')
+ pfx=$(printf "%04d" $test_count)
expect_f="$TEST_DIRECTORY/t5515/fetch.$test"
actual_f="$pfx-fetch.$test"
expect_r="$TEST_DIRECTORY/t5515/refs.$test"
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 0a87e19..26b2caf 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -16,7 +16,7 @@ This test checks the following functionality:
. ./test-lib.sh
-D=`pwd`
+D=$(pwd)
mk_empty () {
repo_name="$1"
@@ -422,7 +422,7 @@ test_expect_success 'push tag with non-existent, incomplete dest' '
test_expect_success 'push sha1 with non-existent, incomplete dest' '
mk_test testrepo &&
- test_must_fail git push testrepo `git rev-parse master`:foo
+ test_must_fail git push testrepo $(git rev-parse master):foo
'
diff --git a/t/t5517-push-mirror.sh b/t/t5517-push-mirror.sh
index 12a5dfb..02f160a 100755
--- a/t/t5517-push-mirror.sh
+++ b/t/t5517-push-mirror.sh
@@ -4,7 +4,7 @@ test_description='pushing to a mirror repository'
. ./test-lib.sh
-D=`pwd`
+D=$(pwd)
invert () {
if "$@"; then
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index a0013ee..c952d5e 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -326,6 +326,16 @@ test_expect_success 'pull.rebase=preserve rebases and merges keep-merge' '
test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
'
+test_expect_success 'pull.rebase=interactive' '
+ write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
+ echo I was here >fake.out &&
+ false
+ EOF
+ test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
+ test_must_fail git pull --rebase=interactive . copy &&
+ test "I was here" = "$(cat fake.out)"
+'
+
test_expect_success 'pull.rebase=invalid fails' '
git reset --hard before-preserve-rebase &&
test_config pull.rebase invalid &&
diff --git a/t/t5522-pull-symlink.sh b/t/t5522-pull-symlink.sh
index 8e9b204..bcff460 100755
--- a/t/t5522-pull-symlink.sh
+++ b/t/t5522-pull-symlink.sh
@@ -54,7 +54,7 @@ test_expect_success SYMLINKS 'pulling from real subdir' '
# git rev-parse --show-cdup printed a path relative to
# clone-repo/subdir/, not subdir-link/. Git rev-parse --show-cdup
# used the correct .git, but when the git pull shell script did
-# "cd `git rev-parse --show-cdup`", it ended up in the wrong
+# "cd $(git rev-parse --show-cdup)", it ended up in the wrong
# directory. A POSIX shell's "cd" works a little differently
# than chdir() in C; "cd -P" is much closer to chdir().
#
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index a4532b0..1241146 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -16,7 +16,8 @@ add_upstream_commit() {
git add subfile &&
git commit -m new subfile &&
head2=$(git rev-parse --short HEAD) &&
- echo "From $pwd/submodule" > ../expect.err &&
+ echo "Fetching submodule submodule" > ../expect.err &&
+ echo "From $pwd/submodule" >> ../expect.err &&
echo " $head1..$head2 master -> origin/master" >> ../expect.err
) &&
(
@@ -27,6 +28,7 @@ add_upstream_commit() {
git add deepsubfile &&
git commit -m new deepsubfile &&
head2=$(git rev-parse --short HEAD) &&
+ echo "Fetching submodule submodule/subdir/deepsubmodule" >> ../expect.err
echo "From $pwd/deepsubmodule" >> ../expect.err &&
echo " $head1..$head2 master -> origin/master" >> ../expect.err
)
@@ -56,9 +58,7 @@ test_expect_success setup '
(
cd downstream &&
git submodule update --init --recursive
- ) &&
- echo "Fetching submodule submodule" > expect.out &&
- echo "Fetching submodule submodule/subdir/deepsubmodule" >> expect.out
+ )
'
test_expect_success "fetch --recurse-submodules recurses into submodules" '
@@ -67,10 +67,21 @@ test_expect_success "fetch --recurse-submodules recurses into submodules" '
cd downstream &&
git fetch --recurse-submodules >../actual.out 2>../actual.err
) &&
- test_i18ncmp expect.out actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err actual.err
'
+test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" '
+ add_upstream_commit &&
+ (
+ cd downstream &&
+ GIT_TRACE=$(pwd)/../trace.out git fetch --recurse-submodules -j2 2>../actual.err
+ ) &&
+ test_must_be_empty actual.out &&
+ test_i18ncmp expect.err actual.err &&
+ grep "2 tasks" trace.out
+'
+
test_expect_success "fetch alone only fetches superproject" '
add_upstream_commit &&
(
@@ -96,7 +107,7 @@ test_expect_success "using fetchRecurseSubmodules=true in .gitmodules recurses i
git config -f .gitmodules submodule.submodule.fetchRecurseSubmodules true &&
git fetch >../actual.out 2>../actual.err
) &&
- test_i18ncmp expect.out actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err actual.err
'
@@ -127,7 +138,7 @@ test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setti
git config --unset -f .gitmodules submodule.submodule.fetchRecurseSubmodules &&
git config --unset submodule.submodule.fetchRecurseSubmodules
) &&
- test_i18ncmp expect.out actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err actual.err
'
@@ -140,13 +151,22 @@ test_expect_success "--quiet propagates to submodules" '
! test -s actual.err
'
+test_expect_success "--quiet propagates to parallel submodules" '
+ (
+ cd downstream &&
+ git fetch --recurse-submodules -j 2 --quiet >../actual.out 2>../actual.err
+ ) &&
+ ! test -s actual.out &&
+ ! test -s actual.err
+'
+
test_expect_success "--dry-run propagates to submodules" '
add_upstream_commit &&
(
cd downstream &&
git fetch --recurse-submodules --dry-run >../actual.out 2>../actual.err
) &&
- test_i18ncmp expect.out actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err actual.err
'
@@ -155,7 +175,7 @@ test_expect_success "Without --dry-run propagates to submodules" '
cd downstream &&
git fetch --recurse-submodules >../actual.out 2>../actual.err
) &&
- test_i18ncmp expect.out actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err actual.err
'
@@ -166,7 +186,7 @@ test_expect_success "recurseSubmodules=true propagates into submodules" '
git config fetch.recurseSubmodules true
git fetch >../actual.out 2>../actual.err
) &&
- test_i18ncmp expect.out actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err actual.err
'
@@ -180,7 +200,7 @@ test_expect_success "--recurse-submodules overrides config in submodule" '
) &&
git fetch --recurse-submodules >../actual.out 2>../actual.err
) &&
- test_i18ncmp expect.out actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err actual.err
'
@@ -214,16 +234,15 @@ test_expect_success "Recursion stops when no new submodule commits are fetched"
git add submodule &&
git commit -m "new submodule" &&
head2=$(git rev-parse --short HEAD) &&
- echo "Fetching submodule submodule" > expect.out.sub &&
echo "From $pwd/." > expect.err.sub &&
echo " $head1..$head2 master -> origin/master" >>expect.err.sub &&
- head -2 expect.err >> expect.err.sub &&
+ head -3 expect.err >> expect.err.sub &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
test_i18ncmp expect.err.sub actual.err &&
- test_i18ncmp expect.out.sub actual.out
+ test_must_be_empty actual.out
'
test_expect_success "Recursion doesn't happen when new superproject commits don't change any submodules" '
@@ -269,7 +288,7 @@ test_expect_success "Recursion picks up config in submodule" '
)
) &&
test_i18ncmp expect.err.sub actual.err &&
- test_i18ncmp expect.out actual.out
+ test_must_be_empty actual.out
'
test_expect_success "Recursion picks up all submodules when necessary" '
@@ -285,7 +304,8 @@ test_expect_success "Recursion picks up all submodules when necessary" '
git add subdir/deepsubmodule &&
git commit -m "new deepsubmodule"
head2=$(git rev-parse --short HEAD) &&
- echo "From $pwd/submodule" > ../expect.err.sub &&
+ echo "Fetching submodule submodule" > ../expect.err.sub &&
+ echo "From $pwd/submodule" >> ../expect.err.sub &&
echo " $head1..$head2 master -> origin/master" >> ../expect.err.sub
) &&
head1=$(git rev-parse --short HEAD) &&
@@ -295,13 +315,13 @@ test_expect_success "Recursion picks up all submodules when necessary" '
echo "From $pwd/." > expect.err.2 &&
echo " $head1..$head2 master -> origin/master" >> expect.err.2 &&
cat expect.err.sub >> expect.err.2 &&
- tail -2 expect.err >> expect.err.2 &&
+ tail -3 expect.err >> expect.err.2 &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
test_i18ncmp expect.err.2 actual.err &&
- test_i18ncmp expect.out actual.out
+ test_must_be_empty actual.out
'
test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)" '
@@ -317,7 +337,8 @@ test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no ne
git add subdir/deepsubmodule &&
git commit -m "new deepsubmodule" &&
head2=$(git rev-parse --short HEAD) &&
- echo "From $pwd/submodule" > ../expect.err.sub &&
+ echo Fetching submodule submodule > ../expect.err.sub &&
+ echo "From $pwd/submodule" >> ../expect.err.sub &&
echo " $head1..$head2 master -> origin/master" >> ../expect.err.sub
) &&
(
@@ -335,7 +356,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess
git add submodule &&
git commit -m "new submodule" &&
head2=$(git rev-parse --short HEAD) &&
- tail -2 expect.err > expect.err.deepsub &&
+ tail -3 expect.err > expect.err.deepsub &&
echo "From $pwd/." > expect.err &&
echo " $head1..$head2 master -> origin/master" >>expect.err &&
cat expect.err.sub >> expect.err &&
@@ -354,7 +375,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess
git config --unset -f .gitmodules submodule.subdir/deepsubmodule.fetchRecursive
)
) &&
- test_i18ncmp expect.out actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err actual.err
'
@@ -388,7 +409,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config
head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.2 &&
echo " $head1..$head2 master -> origin/master" >>expect.err.2 &&
- head -2 expect.err >> expect.err.2 &&
+ head -3 expect.err >> expect.err.2 &&
(
cd downstream &&
git config fetch.recurseSubmodules on-demand &&
@@ -399,7 +420,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config
cd downstream &&
git config --unset fetch.recurseSubmodules
) &&
- test_i18ncmp expect.out.sub actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err.2 actual.err
'
@@ -416,7 +437,7 @@ test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' override
head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.2 &&
echo " $head1..$head2 master -> origin/master" >>expect.err.2 &&
- head -2 expect.err >> expect.err.2 &&
+ head -3 expect.err >> expect.err.2 &&
(
cd downstream &&
git config submodule.submodule.fetchRecurseSubmodules on-demand &&
@@ -427,7 +448,7 @@ test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' override
cd downstream &&
git config --unset submodule.submodule.fetchRecurseSubmodules
) &&
- test_i18ncmp expect.out.sub actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err.2 actual.err
'
diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh
index 3932e79..4f6e32b 100755
--- a/t/t5530-upload-pack-error.sh
+++ b/t/t5530-upload-pack-error.sh
@@ -4,7 +4,7 @@ test_description='errors in upload-pack'
. ./test-lib.sh
-D=`pwd`
+D=$(pwd)
corrupt_repo () {
object_sha1=$(git rev-parse "$1") &&
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index 6507487..198ce84 100755
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -64,7 +64,12 @@ test_expect_success 'push fails if submodule commit not on remote' '
cd work &&
git add gar/bage &&
git commit -m "Third commit for gar/bage" &&
- test_must_fail git push --recurse-submodules=check ../pub.git master
+ # the push should fail with --recurse-submodules=check
+ # on the command line...
+ test_must_fail git push --recurse-submodules=check ../pub.git master &&
+
+ # ...or if specified in the configuration..
+ test_must_fail git -c push.recurseSubmodules=check push ../pub.git master
)
'
@@ -79,6 +84,216 @@ test_expect_success 'push succeeds after commit was pushed to remote' '
)
'
+test_expect_success 'push succeeds if submodule commit not on remote but using on-demand on command line' '
+ (
+ cd work/gar/bage &&
+ >recurse-on-demand-on-command-line &&
+ git add recurse-on-demand-on-command-line &&
+ git commit -m "Recurse on-demand on command line junk"
+ ) &&
+ (
+ cd work &&
+ git add gar/bage &&
+ git commit -m "Recurse on-demand on command line for gar/bage" &&
+ git push --recurse-submodules=on-demand ../pub.git master &&
+ # Check that the supermodule commit got there
+ git fetch ../pub.git &&
+ git diff --quiet FETCH_HEAD master &&
+ # Check that the submodule commit got there too
+ cd gar/bage &&
+ git diff --quiet origin/master master
+ )
+'
+
+test_expect_success 'push succeeds if submodule commit not on remote but using on-demand from config' '
+ (
+ cd work/gar/bage &&
+ >recurse-on-demand-from-config &&
+ git add recurse-on-demand-from-config &&
+ git commit -m "Recurse on-demand from config junk"
+ ) &&
+ (
+ cd work &&
+ git add gar/bage &&
+ git commit -m "Recurse on-demand from config for gar/bage" &&
+ git -c push.recurseSubmodules=on-demand push ../pub.git master &&
+ # Check that the supermodule commit got there
+ git fetch ../pub.git &&
+ git diff --quiet FETCH_HEAD master &&
+ # Check that the submodule commit got there too
+ cd gar/bage &&
+ git diff --quiet origin/master master
+ )
+'
+
+test_expect_success 'push recurse-submodules on command line overrides config' '
+ (
+ cd work/gar/bage &&
+ >recurse-check-on-command-line-overriding-config &&
+ git add recurse-check-on-command-line-overriding-config &&
+ git commit -m "Recurse on command-line overriding config junk"
+ ) &&
+ (
+ cd work &&
+ git add gar/bage &&
+ git commit -m "Recurse on command-line overriding config for gar/bage" &&
+
+ # Ensure that we can override on-demand in the config
+ # to just check submodules
+ test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git master &&
+ # Check that the supermodule commit did not get there
+ git fetch ../pub.git &&
+ git diff --quiet FETCH_HEAD master^ &&
+ # Check that the submodule commit did not get there
+ (cd gar/bage && git diff --quiet origin/master master^) &&
+
+ # Ensure that we can override check in the config to
+ # disable submodule recursion entirely
+ (cd gar/bage && git diff --quiet origin/master master^) &&
+ git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git master &&
+ git fetch ../pub.git &&
+ git diff --quiet FETCH_HEAD master &&
+ (cd gar/bage && git diff --quiet origin/master master^) &&
+
+ # Ensure that we can override check in the config to
+ # disable submodule recursion entirely (alternative form)
+ git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git master &&
+ git fetch ../pub.git &&
+ git diff --quiet FETCH_HEAD master &&
+ (cd gar/bage && git diff --quiet origin/master master^) &&
+
+ # Ensure that we can override check in the config to
+ # push the submodule too
+ git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master &&
+ git fetch ../pub.git &&
+ git diff --quiet FETCH_HEAD master &&
+ (cd gar/bage && git diff --quiet origin/master master)
+ )
+'
+
+test_expect_success 'push recurse-submodules last one wins on command line' '
+ (
+ cd work/gar/bage &&
+ >recurse-check-on-command-line-overriding-earlier-command-line &&
+ git add recurse-check-on-command-line-overriding-earlier-command-line &&
+ git commit -m "Recurse on command-line overridiing earlier command-line junk"
+ ) &&
+ (
+ cd work &&
+ git add gar/bage &&
+ git commit -m "Recurse on command-line overriding earlier command-line for gar/bage" &&
+
+ # should result in "check"
+ test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git master &&
+ # Check that the supermodule commit did not get there
+ git fetch ../pub.git &&
+ git diff --quiet FETCH_HEAD master^ &&
+ # Check that the submodule commit did not get there
+ (cd gar/bage && git diff --quiet origin/master master^) &&
+
+ # should result in "no"
+ git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git master &&
+ # Check that the supermodule commit did get there
+ git fetch ../pub.git &&
+ git diff --quiet FETCH_HEAD master &&
+ # Check that the submodule commit did not get there
+ (cd gar/bage && git diff --quiet origin/master master^) &&
+
+ # should result in "no"
+ git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git master &&
+ # Check that the submodule commit did not get there
+ (cd gar/bage && git diff --quiet origin/master master^) &&
+
+ # But the options in the other order should push the submodule
+ git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git master &&
+ # Check that the submodule commit did get there
+ git fetch ../pub.git &&
+ (cd gar/bage && git diff --quiet origin/master master)
+ )
+'
+
+test_expect_success 'push succeeds if submodule commit not on remote using on-demand from cmdline overriding config' '
+ (
+ cd work/gar/bage &&
+ >recurse-on-demand-on-command-line-overriding-config &&
+ git add recurse-on-demand-on-command-line-overriding-config &&
+ git commit -m "Recurse on-demand on command-line overriding config junk"
+ ) &&
+ (
+ cd work &&
+ git add gar/bage &&
+ git commit -m "Recurse on-demand on command-line overriding config for gar/bage" &&
+ git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master &&
+ # Check that the supermodule commit got there
+ git fetch ../pub.git &&
+ git diff --quiet FETCH_HEAD master &&
+ # Check that the submodule commit got there
+ cd gar/bage &&
+ git diff --quiet origin/master master
+ )
+'
+
+test_expect_success 'push succeeds if submodule commit disabling recursion from cmdline overriding config' '
+ (
+ cd work/gar/bage &&
+ >recurse-disable-on-command-line-overriding-config &&
+ git add recurse-disable-on-command-line-overriding-config &&
+ git commit -m "Recurse disable on command-line overriding config junk"
+ ) &&
+ (
+ cd work &&
+ git add gar/bage &&
+ git commit -m "Recurse disable on command-line overriding config for gar/bage" &&
+ git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git master &&
+ # Check that the supermodule commit got there
+ git fetch ../pub.git &&
+ git diff --quiet FETCH_HEAD master &&
+ # But that the submodule commit did not
+ ( cd gar/bage && git diff --quiet origin/master master^ ) &&
+ # Now push it to avoid confusing future tests
+ git push --recurse-submodules=on-demand ../pub.git master
+ )
+'
+
+test_expect_success 'push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config' '
+ (
+ cd work/gar/bage &&
+ >recurse-disable-on-command-line-alt-overriding-config &&
+ git add recurse-disable-on-command-line-alt-overriding-config &&
+ git commit -m "Recurse disable on command-line alternative overriding config junk"
+ ) &&
+ (
+ cd work &&
+ git add gar/bage &&
+ git commit -m "Recurse disable on command-line alternative overriding config for gar/bage" &&
+ git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git master &&
+ # Check that the supermodule commit got there
+ git fetch ../pub.git &&
+ git diff --quiet FETCH_HEAD master &&
+ # But that the submodule commit did not
+ ( cd gar/bage && git diff --quiet origin/master master^ ) &&
+ # Now push it to avoid confusing future tests
+ git push --recurse-submodules=on-demand ../pub.git master
+ )
+'
+
+test_expect_success 'push fails if recurse submodules option passed as yes' '
+ (
+ cd work/gar/bage &&
+ >recurse-push-fails-if-recurse-submodules-passed-as-yes &&
+ git add recurse-push-fails-if-recurse-submodules-passed-as-yes &&
+ git commit -m "Recurse push fails if recurse submodules option passed as yes"
+ ) &&
+ (
+ cd work &&
+ git add gar/bage &&
+ git commit -m "Recurse push fails if recurse submodules option passed as yes for gar/bage" &&
+ test_must_fail git push --recurse-submodules=yes ../pub.git master &&
+ test_must_fail git -c push.recurseSubmodules=yes push ../pub.git master &&
+ git push --recurse-submodules=on-demand ../pub.git master
+ )
+'
+
test_expect_success 'push fails when commit on multiple branches if one branch has no remote' '
(
cd work/gar/bage &&
diff --git a/t/t5532-fetch-proxy.sh b/t/t5532-fetch-proxy.sh
index 5531bd1..d75ef0e 100755
--- a/t/t5532-fetch-proxy.sh
+++ b/t/t5532-fetch-proxy.sh
@@ -15,7 +15,7 @@ test_expect_success 'setup remote repo' '
cat >proxy <<'EOF'
#!/bin/sh
echo >&2 "proxying for $*"
-cmd=`"$PERL_PATH" -e '
+cmd=$("$PERL_PATH" -e '
read(STDIN, $buf, 4);
my $n = hex($buf) - 4;
read(STDIN, $buf, $n);
@@ -23,7 +23,7 @@ cmd=`"$PERL_PATH" -e '
# drop absolute-path on repo name
$cmd =~ s{ /}{ };
print $cmd;
-'`
+')
echo >&2 "Running '$cmd'"
exec $cmd
EOF
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index a980574..df8d2f0 100755
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -98,7 +98,7 @@ EOF
test_expect_success 'fetch something upstream has but hidden by clients shallow boundaries' '
# the blob "1" is available in .git but hidden by the
# shallow2/.git/shallow and it should be resent
- ! git --git-dir=shallow2/.git cat-file blob `echo 1|git hash-object --stdin` >/dev/null &&
+ ! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null &&
echo 1 >1.t &&
git add 1.t &&
git commit -m add-1-back &&
@@ -114,7 +114,7 @@ add-1-back
EOF
test_cmp expect actual
) &&
- git --git-dir=shallow2/.git cat-file blob `echo 1|git hash-object --stdin` >/dev/null
+ git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null
'
diff --git a/t/t5538-push-shallow.sh b/t/t5538-push-shallow.sh
index ceee95b..ecbf84d 100755
--- a/t/t5538-push-shallow.sh
+++ b/t/t5538-push-shallow.sh
@@ -104,7 +104,7 @@ EOF
'
test_expect_success 'push from full to shallow' '
- ! git --git-dir=shallow2/.git cat-file blob `echo 1|git hash-object --stdin` &&
+ ! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) &&
commit 1 &&
git push shallow2/.git +master:refs/remotes/top/master &&
(
@@ -117,7 +117,7 @@ test_expect_success 'push from full to shallow' '
3
EOF
test_cmp expect actual &&
- git cat-file blob `echo 1|git hash-object --stdin` >/dev/null
+ git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null
)
'
test_done
diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
index 87a7aa0..6414635 100755
--- a/t/t5550-http-fetch-dumb.sh
+++ b/t/t5550-http-fetch-dumb.sh
@@ -132,7 +132,7 @@ test_expect_success 'fetch packed objects' '
test_expect_success 'fetch notices corrupt pack' '
cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
- p=`ls objects/pack/pack-*.pack` &&
+ p=$(ls objects/pack/pack-*.pack) &&
chmod u+w $p &&
printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
) &&
@@ -140,14 +140,14 @@ test_expect_success 'fetch notices corrupt pack' '
(cd repo_bad1.git &&
git --bare init &&
test_must_fail git --bare fetch $HTTPD_URL/dumb/repo_bad1.git &&
- test 0 = `ls objects/pack/pack-*.pack | wc -l`
+ test 0 = $(ls objects/pack/pack-*.pack | wc -l)
)
'
test_expect_success 'fetch notices corrupt idx' '
cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
- p=`ls objects/pack/pack-*.idx` &&
+ p=$(ls objects/pack/pack-*.idx) &&
chmod u+w $p &&
printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
) &&
@@ -155,7 +155,7 @@ test_expect_success 'fetch notices corrupt idx' '
(cd repo_bad2.git &&
git --bare init &&
test_must_fail git --bare fetch $HTTPD_URL/dumb/repo_bad2.git &&
- test 0 = `ls objects/pack | wc -l`
+ test 0 = $(ls objects/pack | wc -l)
)
'
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index b7e2832..d76269a 100755
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -57,7 +57,7 @@ test_expect_success 'prepare pack objects' '
test_expect_success 'fetch notices corrupt pack' '
cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
- p=`ls objects/pack/pack-*.pack` &&
+ p=$(ls objects/pack/pack-*.pack) &&
chmod u+w $p &&
printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
) &&
@@ -65,14 +65,14 @@ test_expect_success 'fetch notices corrupt pack' '
(cd repo_bad1.git &&
git --bare init &&
test_must_fail git --bare fetch "$GIT_DAEMON_URL/repo_bad1.git" &&
- test 0 = `ls objects/pack/pack-*.pack | wc -l`
+ test 0 = $(ls objects/pack/pack-*.pack | wc -l)
)
'
test_expect_success 'fetch notices corrupt idx' '
cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
- p=`ls objects/pack/pack-*.idx` &&
+ p=$(ls objects/pack/pack-*.idx) &&
chmod u+w $p &&
printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
) &&
@@ -80,7 +80,7 @@ test_expect_success 'fetch notices corrupt idx' '
(cd repo_bad2.git &&
git --bare init &&
test_must_fail git --bare fetch "$GIT_DAEMON_URL/repo_bad2.git" &&
- test 0 = `ls objects/pack | wc -l`
+ test 0 = $(ls objects/pack | wc -l)
)
'
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 9b34f3c..669ec9b 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -65,6 +65,29 @@ test_expect_success 'clone respects GIT_WORK_TREE' '
'
+test_expect_success 'clone from hooks' '
+
+ test_create_repo r0 &&
+ cd r0 &&
+ test_commit initial &&
+ cd .. &&
+ git init r1 &&
+ cd r1 &&
+ cat >.git/hooks/pre-commit <<-\EOF &&
+ #!/bin/sh
+ git clone ../r0 ../r2
+ exit 1
+ EOF
+ chmod u+x .git/hooks/pre-commit &&
+ : >file &&
+ git add file &&
+ test_must_fail git commit -m invoke-hook &&
+ cd .. &&
+ test_cmp r0/.git/HEAD r2/.git/HEAD &&
+ test_cmp r0/initial.t r2/initial.t
+
+'
+
test_expect_success 'clone creates intermediate directories' '
git clone src long/path/to/dst &&
@@ -221,7 +244,7 @@ test_expect_success 'clone separate gitdir' '
'
test_expect_success 'clone separate gitdir: output' '
- echo "gitdir: `pwd`/realgitdir" >expected &&
+ echo "gitdir: $(pwd)/realgitdir" >expected &&
test_cmp expected dst/.git
'
diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh
index dfa1bf7..4320082 100755
--- a/t/t5700-clone-reference.sh
+++ b/t/t5700-clone-reference.sh
@@ -6,7 +6,7 @@
test_description='test clone --reference'
. ./test-lib.sh
-base_dir=`pwd`
+base_dir=$(pwd)
U=$base_dir/UPLOAD_LOG
diff --git a/t/t5710-info-alternate.sh b/t/t5710-info-alternate.sh
index 5a6e49d..9cd2626 100755
--- a/t/t5710-info-alternate.sh
+++ b/t/t5710-info-alternate.sh
@@ -21,7 +21,7 @@ test_valid_repo() {
test_line_count = 0 fsck.log
}
-base_dir=`pwd`
+base_dir=$(pwd)
test_expect_success 'preparing first repository' \
'test_create_repo A && cd A &&
diff --git a/t/t5900-repo-selection.sh b/t/t5900-repo-selection.sh
index 3d5b418..14e59c5 100755
--- a/t/t5900-repo-selection.sh
+++ b/t/t5900-repo-selection.sh
@@ -15,7 +15,7 @@ make_tree() {
make_bare() {
git init --bare "$1" &&
(cd "$1" &&
- tree=`git hash-object -w -t tree /dev/null` &&
+ tree=$(git hash-object -w -t tree /dev/null) &&
commit=$(echo "$1" | git commit-tree $tree) &&
git update-ref HEAD $commit
)
diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh
index 8efcd13..05ddc69 100755
--- a/t/t6001-rev-list-graft.sh
+++ b/t/t6001-rev-list-graft.sh
@@ -10,15 +10,15 @@ test_expect_success setup '
echo >subdir/fileB fileB &&
git add fileA subdir/fileB &&
git commit -a -m "Initial in one history." &&
- A0=`git rev-parse --verify HEAD` &&
+ A0=$(git rev-parse --verify HEAD) &&
echo >fileA fileA modified &&
git commit -a -m "Second in one history." &&
- A1=`git rev-parse --verify HEAD` &&
+ A1=$(git rev-parse --verify HEAD) &&
echo >subdir/fileB fileB modified &&
git commit -a -m "Third in one history." &&
- A2=`git rev-parse --verify HEAD` &&
+ A2=$(git rev-parse --verify HEAD) &&
rm -f .git/refs/heads/master .git/index &&
@@ -26,15 +26,15 @@ test_expect_success setup '
echo >subdir/fileB fileB again &&
git add fileA subdir/fileB &&
git commit -a -m "Initial in alternate history." &&
- B0=`git rev-parse --verify HEAD` &&
+ B0=$(git rev-parse --verify HEAD) &&
echo >fileA fileA modified in alternate history &&
git commit -a -m "Second in alternate history." &&
- B1=`git rev-parse --verify HEAD` &&
+ B1=$(git rev-parse --verify HEAD) &&
echo >subdir/fileB fileB modified in alternate history &&
git commit -a -m "Third in alternate history." &&
- B2=`git rev-parse --verify HEAD` &&
+ B2=$(git rev-parse --verify HEAD) &&
: done
'
diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh
index 43ad772..3bf2759 100755
--- a/t/t6002-rev-list-bisect.sh
+++ b/t/t6002-rev-list-bisect.sh
@@ -27,9 +27,9 @@ test_bisection_diff()
# Test if bisection size is close to half of list size within
# tolerance.
#
- _bisect_err=`expr $_list_size - $_bisection_size \* 2`
- test "$_bisect_err" -lt 0 && _bisect_err=`expr 0 - $_bisect_err`
- _bisect_err=`expr $_bisect_err / 2` ; # floor
+ _bisect_err=$(expr $_list_size - $_bisection_size \* 2)
+ test "$_bisect_err" -lt 0 && _bisect_err=$(expr 0 - $_bisect_err)
+ _bisect_err=$(expr $_bisect_err / 2) ; # floor
test_expect_success \
"bisection diff $_bisect_option $_head $* <= $_max_diff" \
diff --git a/t/t6015-rev-list-show-all-parents.sh b/t/t6015-rev-list-show-all-parents.sh
index 8b146fb..3c73c93 100755
--- a/t/t6015-rev-list-show-all-parents.sh
+++ b/t/t6015-rev-list-show-all-parents.sh
@@ -6,11 +6,11 @@ test_description='--show-all --parents does not rewrite TREESAME commits'
test_expect_success 'set up --show-all --parents test' '
test_commit one foo.txt &&
- commit1=`git rev-list -1 HEAD` &&
+ commit1=$(git rev-list -1 HEAD) &&
test_commit two bar.txt &&
- commit2=`git rev-list -1 HEAD` &&
+ commit2=$(git rev-list -1 HEAD) &&
test_commit three foo.txt &&
- commit3=`git rev-list -1 HEAD`
+ commit3=$(git rev-list -1 HEAD)
'
test_expect_success '--parents rewrites TREESAME parents correctly' '
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 190ee90..20aee43 100755
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -346,4 +346,17 @@ test_expect_success 'conflict at EOF without LF resolved by --union' \
printf "line1\nline2\nline3x\nline3y" >expect.txt &&
test_cmp expect.txt output.txt'
+test_expect_success 'conflict sections match existing line endings' '
+ printf "1\\r\\n2\\r\\n3" >crlf-orig.txt &&
+ printf "1\\r\\n2\\r\\n4" >crlf-diff1.txt &&
+ printf "1\\r\\n2\\r\\n5" >crlf-diff2.txt &&
+ test_must_fail git -c core.eol=crlf merge-file -p \
+ crlf-diff1.txt crlf-orig.txt crlf-diff2.txt >crlf.txt &&
+ test $(tr "\015" Q <crlf.txt | grep "^[<=>].*Q$" | wc -l) = 3 &&
+ test $(tr "\015" Q <crlf.txt | grep "[345]Q$" | wc -l) = 3 &&
+ test_must_fail git -c core.eol=crlf merge-file -p \
+ nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >nolf.txt &&
+ test $(tr "\015" Q <nolf.txt | grep "^[<=>].*Q$" | wc -l) = 0
+'
+
test_done
diff --git a/t/t6032-merge-large-rename.sh b/t/t6032-merge-large-rename.sh
index 0f79268..8077738 100755
--- a/t/t6032-merge-large-rename.sh
+++ b/t/t6032-merge-large-rename.sh
@@ -20,7 +20,7 @@ test_expect_success 'setup (initial)' '
make_text() {
echo $1: $2
- for i in `count 20`; do
+ for i in $(count 20); do
echo $1: $i
done
echo $1: $3
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 4d5a25e..c630aba 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -351,11 +351,15 @@ test_expect_success 'test --format long' '
test_cmp expected actual
'
-test_expect_success 'setup a fake editor' '
- write_script fakeeditor <<-\EOF
+test_expect_success 'setup fake editors' '
+ write_script fakeeditor <<-\EOF &&
sed -e "s/A U Thor/A fake Thor/" "$1" >"$1.new"
mv "$1.new" "$1"
EOF
+ write_script failingfakeeditor <<-\EOF
+ ./fakeeditor "$@"
+ false
+ EOF
'
test_expect_success '--edit with and without already replaced object' '
@@ -372,7 +376,7 @@ test_expect_success '--edit with and without already replaced object' '
test_expect_success '--edit and change nothing or command failed' '
git replace -d "$PARA3" &&
test_must_fail env GIT_EDITOR=true git replace --edit "$PARA3" &&
- test_must_fail env GIT_EDITOR="./fakeeditor;false" git replace --edit "$PARA3" &&
+ test_must_fail env GIT_EDITOR="./failingfakeeditor" git replace --edit "$PARA3" &&
GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
git replace -l | grep "$PARA3" &&
git cat-file commit "$PARA3" | grep "A fake Thor"
diff --git a/t/t6132-pathspec-exclude.sh b/t/t6132-pathspec-exclude.sh
index e1e1b1f..d51595c 100755
--- a/t/t6132-pathspec-exclude.sh
+++ b/t/t6132-pathspec-exclude.sh
@@ -7,7 +7,7 @@ test_description='test case exclude pathspec'
test_expect_success 'setup' '
for p in file sub/file sub/sub/file sub/file2 sub/sub/sub/file sub2/file; do
if echo $p | grep /; then
- mkdir -p `dirname $p`
+ mkdir -p $(dirname $p)
fi &&
: >$p &&
git add $p &&
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 03873b0..19a2823 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -49,11 +49,17 @@ test_atom() {
}
test_atom head refname refs/heads/master
+test_atom head refname:short master
+test_atom head refname:strip=1 heads/master
+test_atom head refname:strip=2 master
test_atom head upstream refs/remotes/origin/master
+test_atom head upstream:short origin/master
test_atom head push refs/remotes/myfork/master
+test_atom head push:short myfork/master
test_atom head objecttype commit
test_atom head objectsize 171
test_atom head objectname $(git rev-parse refs/heads/master)
+test_atom head objectname:short $(git rev-parse --short refs/heads/master)
test_atom head tree $(git rev-parse refs/heads/master^{tree})
test_atom head parent ''
test_atom head numparent 0
@@ -86,11 +92,13 @@ test_atom head contents 'Initial
test_atom head HEAD '*'
test_atom tag refname refs/tags/testtag
+test_atom tag refname:short testtag
test_atom tag upstream ''
test_atom tag push ''
test_atom tag objecttype tag
test_atom tag objectsize 154
test_atom tag objectname $(git rev-parse refs/tags/testtag)
+test_atom tag objectname:short $(git rev-parse --short refs/tags/testtag)
test_atom tag tree ''
test_atom tag parent ''
test_atom tag numparent ''
@@ -126,6 +134,16 @@ test_expect_success 'Check invalid atoms names are errors' '
test_must_fail git for-each-ref --format="%(INVALID)" refs/heads
'
+test_expect_success 'arguments to :strip must be positive integers' '
+ test_must_fail git for-each-ref --format="%(refname:strip=0)" &&
+ test_must_fail git for-each-ref --format="%(refname:strip=-1)" &&
+ test_must_fail git for-each-ref --format="%(refname:strip=foo)"
+'
+
+test_expect_success 'stripping refnames too far gives an error' '
+ test_must_fail git for-each-ref --format="%(refname:strip=3)"
+'
+
test_expect_success 'Check format specifiers are ignored in naming date atoms' '
git for-each-ref --format="%(authordate)" refs/heads &&
git for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&
@@ -338,47 +356,14 @@ for i in "--perl --shell" "-s --python" "--python --tcl" "--tcl --perl"; do
"
done
-cat >expected <<\EOF
-master
-testtag
-EOF
-
-test_expect_success 'Check short refname format' '
- (git for-each-ref --format="%(refname:short)" refs/heads &&
- git for-each-ref --format="%(refname:short)" refs/tags) >actual &&
- test_cmp expected actual
-'
-
-cat >expected <<EOF
-origin/master
-EOF
-
-test_expect_success 'Check short upstream format' '
- git for-each-ref --format="%(upstream:short)" refs/heads >actual &&
- test_cmp expected actual
-'
-
test_expect_success 'setup for upstream:track[short]' '
test_commit two
'
-cat >expected <<EOF
-[ahead 1]
-EOF
-
-test_expect_success 'Check upstream:track format' '
- git for-each-ref --format="%(upstream:track)" refs/heads >actual &&
- test_cmp expected actual
-'
-
-cat >expected <<EOF
->
-EOF
-
-test_expect_success 'Check upstream:trackshort format' '
- git for-each-ref --format="%(upstream:trackshort)" refs/heads >actual &&
- test_cmp expected actual
-'
+test_atom head upstream:track '[ahead 1]'
+test_atom head upstream:trackshort '>'
+test_atom head push:track '[ahead 1]'
+test_atom head push:trackshort '>'
test_expect_success 'Check that :track[short] cannot be used with other atoms' '
test_must_fail git for-each-ref --format="%(refname:track)" 2>/dev/null &&
@@ -398,21 +383,6 @@ test_expect_success 'Check that :track[short] works when upstream is invalid' '
test_cmp expected actual
'
-test_expect_success '%(push) supports tracking specifiers, too' '
- echo "[ahead 1]" >expected &&
- git for-each-ref --format="%(push:track)" refs/heads >actual &&
- test_cmp expected actual
-'
-
-cat >expected <<EOF
-$(git rev-parse --short HEAD)
-EOF
-
-test_expect_success 'Check short objectname format' '
- git for-each-ref --format="%(objectname:short)" refs/heads >actual &&
- test_cmp expected actual
-'
-
test_expect_success 'Check for invalid refname format' '
test_must_fail git for-each-ref --format="%(refname:INVALID)"
'
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 7b56081..51dd2b4 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -156,11 +156,11 @@ test_expect_success "Michael Cassar's test case" '
echo b > partA/outline.txt &&
echo c > papers/unsorted/_another &&
git add papers partA &&
- T1=`git write-tree` &&
+ T1=$(git write-tree) &&
git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
- T=`git write-tree` &&
+ T=$(git write-tree) &&
git ls-tree -r $T | verbose grep partA/outline.txt
'
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 869e0bf..cb8fbd8 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -333,6 +333,14 @@ test_expect_success 'prune empty collapsed merges' '
test_cmp expect actual
'
+test_expect_success 'prune empty works even without index/tree filters' '
+ git rev-list HEAD >expect &&
+ git commit --allow-empty -m empty &&
+ git filter-branch -f --prune-empty HEAD &&
+ git rev-list HEAD >actual &&
+ test_cmp expect actual
+'
+
test_expect_success '--remap-to-ancestor with filename filters' '
git checkout master &&
git reset --hard A &&
@@ -387,7 +395,7 @@ test_expect_success 'setup submodule' '
git branch original HEAD
'
-orig_head=`git show-ref --hash --head HEAD`
+orig_head=$(git show-ref --hash --head HEAD)
test_expect_success 'rewrite submodule with another content' '
git filter-branch --tree-filter "test -d submod && {
@@ -396,7 +404,7 @@ test_expect_success 'rewrite submodule with another content' '
mkdir submod &&
: > submod/file
} || :" HEAD &&
- test $orig_head != `git show-ref --hash --head HEAD`
+ test $orig_head != $(git show-ref --hash --head HEAD)
'
test_expect_success 'replace submodule revision' '
@@ -405,7 +413,7 @@ test_expect_success 'replace submodule revision' '
"if git ls-files --error-unmatch -- submod > /dev/null 2>&1
then git update-index --cacheinfo 160000 0123456789012345678901234567890123456789 submod
fi" HEAD &&
- test $orig_head != `git show-ref --hash --head HEAD`
+ test $orig_head != $(git show-ref --hash --head HEAD)
'
test_expect_success 'filter commit message without trailing newline' '
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 3dd2f51..cf3469b 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -23,8 +23,8 @@ test_expect_success 'listing all tags in an empty tree should succeed' '
'
test_expect_success 'listing all tags in an empty tree should output nothing' '
- test `git tag -l | wc -l` -eq 0 &&
- test `git tag | wc -l` -eq 0
+ test $(git tag -l | wc -l) -eq 0 &&
+ test $(git tag | wc -l) -eq 0
'
test_expect_success 'looking for a tag in an empty tree should fail' \
@@ -72,8 +72,8 @@ test_expect_success 'listing all tags if one exists should succeed' '
'
test_expect_success 'listing all tags if one exists should output that tag' '
- test `git tag -l` = mytag &&
- test `git tag` = mytag
+ test $(git tag -l) = mytag &&
+ test $(git tag) = mytag
'
# pattern matching:
@@ -83,7 +83,7 @@ test_expect_success 'listing a tag using a matching pattern should succeed' \
test_expect_success \
'listing a tag using a matching pattern should output that tag' \
- 'test `git tag -l mytag` = mytag'
+ 'test $(git tag -l mytag) = mytag'
# todo: git tag -l now returns always zero, when fixed, change this test
test_expect_success \
@@ -92,7 +92,7 @@ test_expect_success \
test_expect_success \
'listing tags using a non-matching pattern should output nothing' \
- 'test `git tag -l xxx | wc -l` -eq 0'
+ 'test $(git tag -l xxx | wc -l) -eq 0'
# special cases for creating tags:
@@ -102,13 +102,13 @@ test_expect_success \
test_expect_success \
'trying to create a tag with a non-valid name should fail' '
- test `git tag -l | wc -l` -eq 1 &&
+ test $(git tag -l | wc -l) -eq 1 &&
test_must_fail git tag "" &&
test_must_fail git tag .othertag &&
test_must_fail git tag "other tag" &&
test_must_fail git tag "othertag^" &&
test_must_fail git tag "other~tag" &&
- test `git tag -l | wc -l` -eq 1
+ test $(git tag -l | wc -l) -eq 1
'
test_expect_success 'creating a tag using HEAD directly should succeed' '
@@ -1558,4 +1558,12 @@ test_expect_success '--no-merged show unmerged tags' '
test_cmp expect actual
'
+test_expect_success 'ambiguous branch/tags not marked' '
+ git tag ambiguous &&
+ git branch ambiguous &&
+ echo ambiguous >expect &&
+ git tag -l ambiguous >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 6ea7ac4..e4fc5c8 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -424,7 +424,7 @@ test_expect_success TTY 'command-specific pager works for external commands' '
echo "foo:initial" >expect &&
>actual &&
test_config pager.external "sed s/^/foo:/ >actual" &&
- test_terminal git --exec-path="`pwd`" external log --format=%s -1 &&
+ test_terminal git --exec-path="$(pwd)" external log --format=%s -1 &&
test_cmp expect actual
'
diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh
index 1eef93c..afe36a5 100755
--- a/t/t7103-reset-bare.sh
+++ b/t/t7103-reset-bare.sh
@@ -63,7 +63,7 @@ test_expect_success '"mixed" reset is not allowed in bare' '
test_expect_success '"soft" reset is allowed in bare' '
git reset --soft HEAD^ &&
- test "`git show --pretty=format:%s | head -n 1`" = "one"
+ test "$(git show --pretty=format:%s | head -n 1)" = "one"
'
test_done
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index dda3929..68ea31d 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -14,8 +14,8 @@ submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
compare_head()
{
- sha_master=`git rev-list --max-count=1 master`
- sha_head=`git rev-list --max-count=1 HEAD`
+ sha_master=$(git rev-list --max-count=1 master)
+ sha_head=$(git rev-list --max-count=1 HEAD)
test "$sha_master" = "$sha_head"
}
diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh
index b770b2f..eaea19b 100755
--- a/t/t7408-submodule-reference.sh
+++ b/t/t7408-submodule-reference.sh
@@ -6,7 +6,7 @@
test_description='test clone --reference'
. ./test-lib.sh
-base_dir=`pwd`
+base_dir=$(pwd)
U=$base_dir/UPLOAD_LOG
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 1f53ea8..8728db6 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -179,7 +179,7 @@ EOF
chmod +x "$HOOK"
commit_msg_is () {
- test "`git log --pretty=format:%s%b -1`" = "$1"
+ test "$(git log --pretty=format:%s%b -1)" = "$1"
}
test_expect_success 'hook edits commit message' '
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index 03dce09..b13f729 100755
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -53,7 +53,7 @@ test_expect_success 'with hook (-m)' '
echo "more" >> file &&
git add file &&
git commit -m "more" &&
- test "`git log -1 --pretty=format:%s`" = "message (no editor)"
+ test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
'
@@ -62,7 +62,7 @@ test_expect_success 'with hook (-m editor)' '
echo "more" >> file &&
git add file &&
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -e -m "more more" &&
- test "`git log -1 --pretty=format:%s`" = message
+ test "$(git log -1 --pretty=format:%s)" = message
'
@@ -71,7 +71,7 @@ test_expect_success 'with hook (-t)' '
echo "more" >> file &&
git add file &&
git commit -t "$(git rev-parse --git-dir)/template" &&
- test "`git log -1 --pretty=format:%s`" = template
+ test "$(git log -1 --pretty=format:%s)" = template
'
@@ -80,7 +80,7 @@ test_expect_success 'with hook (-F)' '
echo "more" >> file &&
git add file &&
(echo more | git commit -F -) &&
- test "`git log -1 --pretty=format:%s`" = "message (no editor)"
+ test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
'
@@ -89,17 +89,17 @@ test_expect_success 'with hook (-F editor)' '
echo "more" >> file &&
git add file &&
(echo more more | GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -e -F -) &&
- test "`git log -1 --pretty=format:%s`" = message
+ test "$(git log -1 --pretty=format:%s)" = message
'
test_expect_success 'with hook (-C)' '
- head=`git rev-parse HEAD` &&
+ head=$(git rev-parse HEAD) &&
echo "more" >> file &&
git add file &&
git commit -C $head &&
- test "`git log -1 --pretty=format:%s`" = "$head (no editor)"
+ test "$(git log -1 --pretty=format:%s)" = "$head (no editor)"
'
@@ -108,27 +108,27 @@ test_expect_success 'with hook (editor)' '
echo "more more" >> file &&
git add file &&
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit &&
- test "`git log -1 --pretty=format:%s`" = default
+ test "$(git log -1 --pretty=format:%s)" = default
'
test_expect_success 'with hook (--amend)' '
- head=`git rev-parse HEAD` &&
+ head=$(git rev-parse HEAD) &&
echo "more" >> file &&
git add file &&
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --amend &&
- test "`git log -1 --pretty=format:%s`" = "$head"
+ test "$(git log -1 --pretty=format:%s)" = "$head"
'
test_expect_success 'with hook (-c)' '
- head=`git rev-parse HEAD` &&
+ head=$(git rev-parse HEAD) &&
echo "more" >> file &&
git add file &&
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head &&
- test "`git log -1 --pretty=format:%s`" = "$head"
+ test "$(git log -1 --pretty=format:%s)" = "$head"
'
@@ -141,7 +141,7 @@ test_expect_success 'with hook (merge)' '
git commit -m other &&
git checkout - &&
git merge --no-ff other &&
- test "`git log -1 --pretty=format:%s`" = "merge (no editor)"
+ test "$(git log -1 --pretty=format:%s)" = "merge (no editor)"
'
test_expect_success 'with hook and editor (merge)' '
@@ -153,7 +153,7 @@ test_expect_success 'with hook and editor (merge)' '
git commit -m other &&
git checkout - &&
env GIT_EDITOR="\"\$FAKE_EDITOR\"" git merge --no-ff -e other &&
- test "`git log -1 --pretty=format:%s`" = "merge"
+ test "$(git log -1 --pretty=format:%s)" = "merge"
'
cat > "$HOOK" <<'EOF'
@@ -164,7 +164,7 @@ EOF
test_expect_success 'with failing hook' '
test_when_finished "git checkout -f master" &&
- head=`git rev-parse HEAD` &&
+ head=$(git rev-parse HEAD) &&
echo "more" >> file &&
git add file &&
test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head
@@ -174,7 +174,7 @@ test_expect_success 'with failing hook' '
test_expect_success 'with failing hook (--no-verify)' '
test_when_finished "git checkout -f master" &&
- head=`git rev-parse HEAD` &&
+ head=$(git rev-parse HEAD) &&
echo "more" >> file &&
git add file &&
test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify -c $head
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index 322c436..aee785c 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpret-trailers.sh
@@ -326,6 +326,46 @@ test_expect_success 'with complex patch, args and --trim-empty' '
test_cmp expected actual
'
+test_expect_success 'in-place editing with basic patch' '
+ cat basic_message >message &&
+ cat basic_patch >>message &&
+ cat basic_message >expected &&
+ echo >>expected &&
+ cat basic_patch >>expected &&
+ git interpret-trailers --in-place message &&
+ test_cmp expected message
+'
+
+test_expect_success 'in-place editing with additional trailer' '
+ cat basic_message >message &&
+ cat basic_patch >>message &&
+ cat basic_message >expected &&
+ echo >>expected &&
+ cat >>expected <<-\EOF &&
+ Reviewed-by: Alice
+ EOF
+ cat basic_patch >>expected &&
+ git interpret-trailers --trailer "Reviewed-by: Alice" --in-place message &&
+ test_cmp expected message
+'
+
+test_expect_success 'in-place editing on stdin disallowed' '
+ test_must_fail git interpret-trailers --trailer "Reviewed-by: Alice" --in-place < basic_message
+'
+
+test_expect_success 'in-place editing on non-existing file' '
+ test_must_fail git interpret-trailers --trailer "Reviewed-by: Alice" --in-place nonexisting &&
+ test_path_is_missing nonexisting
+'
+
+test_expect_success POSIXPERM,SANITY "in-place editing doesn't clobber original file on error" '
+ cat basic_message >message &&
+ chmod -r message &&
+ test_must_fail git interpret-trailers --trailer "Reviewed-by: Alice" --in-place message &&
+ chmod +r message &&
+ test_cmp message basic_message
+'
+
test_expect_success 'using "where = before"' '
git config trailer.bug.where "before" &&
cat complex_message_body >expected &&
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 955f09f..6abe441 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -19,7 +19,7 @@ test_expect_success 'setup' '
git add c$i.c &&
git commit -m c$i &&
git tag c$i &&
- i=`expr $i + 1` || return 1
+ i=$(expr $i + 1) || return 1
done
'
@@ -30,7 +30,7 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '
while test $i -le 30
do
refs="$refs c$i"
- i=`expr $i + 1`
+ i=$(expr $i + 1)
done &&
git merge $refs &&
test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
@@ -38,14 +38,14 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '
while test $i -le 30
do
test "$(git rev-parse c$i)" = "$(git rev-parse HEAD^$i)" &&
- i=`expr $i + 1` || return 1
+ i=$(expr $i + 1) || return 1
done &&
git diff --exit-code &&
i=1 &&
while test $i -le 30
do
test -f c$i.c &&
- i=`expr $i + 1` || return 1
+ i=$(expr $i + 1) || return 1
done
'
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 021c547..6061a04 100755
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -69,7 +69,7 @@ test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
test_expect_success 'loose objects in alternate ODB are not repacked' '
mkdir alt_objects &&
- echo `pwd`/alt_objects > .git/objects/info/alternates &&
+ echo $(pwd)/alt_objects > .git/objects/info/alternates &&
echo content3 > file3 &&
objsha1=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) &&
git add file3 &&
@@ -168,7 +168,7 @@ test_expect_success 'packed unreachable obs in alternate ODB are not loosened' '
'
test_expect_success 'local packed unreachable obs that exist in alternate ODB are not loosened' '
- echo `pwd`/alt_objects > .git/objects/info/alternates &&
+ echo $(pwd)/alt_objects > .git/objects/info/alternates &&
echo "$csha1" | git pack-objects --non-empty --all --reflog pack &&
rm -f .git/objects/pack/* &&
mv pack-* .git/objects/pack/ &&
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 028ffe4..b540944 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -791,12 +791,12 @@ test_expect_success 'outside of git repository' '
} >non/expect.full &&
echo file2:world >non/expect.sub &&
(
- GIT_CEILING_DIRECTORIES="$(pwd)/non/git" &&
+ GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
export GIT_CEILING_DIRECTORIES &&
cd non/git &&
test_must_fail git grep o &&
git grep --no-index o >../actual.full &&
- test_cmp ../expect.full ../actual.full
+ test_cmp ../expect.full ../actual.full &&
cd sub &&
test_must_fail git grep o &&
git grep --no-index o >../../actual.sub &&
@@ -805,7 +805,7 @@ test_expect_success 'outside of git repository' '
echo ".*o*" >non/git/.gitignore &&
(
- GIT_CEILING_DIRECTORIES="$(pwd)/non/git" &&
+ GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
export GIT_CEILING_DIRECTORIES &&
cd non/git &&
test_must_fail git grep o &&
@@ -813,7 +813,7 @@ test_expect_success 'outside of git repository' '
test_cmp ../expect.full ../actual.full &&
{
- echo ".gitignore:.*o*"
+ echo ".gitignore:.*o*" &&
cat ../expect.full
} >../expect.with.ignored &&
git grep --no-index --no-exclude o >../actual.full &&
@@ -821,6 +821,47 @@ test_expect_success 'outside of git repository' '
)
'
+test_expect_success 'outside of git repository with fallbackToNoIndex' '
+ rm -fr non &&
+ mkdir -p non/git/sub &&
+ echo hello >non/git/file1 &&
+ echo world >non/git/sub/file2 &&
+ cat <<-\EOF >non/expect.full &&
+ file1:hello
+ sub/file2:world
+ EOF
+ echo file2:world >non/expect.sub &&
+ (
+ GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
+ export GIT_CEILING_DIRECTORIES &&
+ cd non/git &&
+ test_must_fail git -c grep.fallbackToNoIndex=false grep o &&
+ git -c grep.fallbackToNoIndex=true grep o >../actual.full &&
+ test_cmp ../expect.full ../actual.full &&
+ cd sub &&
+ test_must_fail git -c grep.fallbackToNoIndex=false grep o &&
+ git -c grep.fallbackToNoIndex=true grep o >../../actual.sub &&
+ test_cmp ../../expect.sub ../../actual.sub
+ ) &&
+
+ echo ".*o*" >non/git/.gitignore &&
+ (
+ GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
+ export GIT_CEILING_DIRECTORIES &&
+ cd non/git &&
+ test_must_fail git -c grep.fallbackToNoIndex=false grep o &&
+ git -c grep.fallbackToNoIndex=true grep --exclude-standard o >../actual.full &&
+ test_cmp ../expect.full ../actual.full &&
+
+ {
+ echo ".gitignore:.*o*" &&
+ cat ../expect.full
+ } >../expect.with.ignored &&
+ git -c grep.fallbackToNoIndex grep --no-exclude o >../actual.full &&
+ test_cmp ../expect.with.ignored ../actual.full
+ )
+'
+
test_expect_success 'inside git repository but with --no-index' '
rm -fr is &&
mkdir -p is/git/sub &&
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index 16f1442..6568429 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -153,7 +153,7 @@ test_expect_success 'blame path that used to be a directory' '
'
test_expect_success 'blame to a commit with no author name' '
- TREE=`git rev-parse HEAD:` &&
+ TREE=$(git rev-parse HEAD:) &&
cat >badcommit <<EOF &&
tree $TREE
author <noname> 1234567890 +0000
@@ -161,7 +161,7 @@ committer David Reiss <dreiss@facebook.com> 1234567890 +0000
some message
EOF
- COMMIT=`git hash-object -t commit -w badcommit` &&
+ COMMIT=$(git hash-object -t commit -w badcommit) &&
git --no-pager blame $COMMIT -- uno >/dev/null
'
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 3c49536..b3355d2 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -36,7 +36,7 @@ clean_fake_sendmail () {
}
test_expect_success $PREREQ 'Extract patches' '
- patches=`git format-patch -s --cc="One <one@example.com>" --cc=two@example.com -n HEAD^1`
+ patches=$(git format-patch -s --cc="One <one@example.com>" --cc=two@example.com -n HEAD^1)
'
# Test no confirm early to ensure remaining tests will not hang
@@ -1151,7 +1151,7 @@ test_expect_success $PREREQ '--no-bcc overrides sendemail.bcc' '
'
test_expect_success $PREREQ 'patches To headers are used by default' '
- patch=`git format-patch -1 --to="bodies@example.com"` &&
+ patch=$(git format-patch -1 --to="bodies@example.com") &&
test_when_finished "rm $patch" &&
git send-email \
--dry-run \
@@ -1162,7 +1162,7 @@ test_expect_success $PREREQ 'patches To headers are used by default' '
'
test_expect_success $PREREQ 'patches To headers are appended to' '
- patch=`git format-patch -1 --to="bodies@example.com"` &&
+ patch=$(git format-patch -1 --to="bodies@example.com") &&
test_when_finished "rm $patch" &&
git send-email \
--dry-run \
@@ -1175,8 +1175,8 @@ test_expect_success $PREREQ 'patches To headers are appended to' '
'
test_expect_success $PREREQ 'To headers from files reset each patch' '
- patch1=`git format-patch -1 --to="bodies@example.com"` &&
- patch2=`git format-patch -1 --to="other@example.com" HEAD~` &&
+ patch1=$(git format-patch -1 --to="bodies@example.com") &&
+ patch2=$(git format-patch -1 --to="other@example.com" HEAD~) &&
test_when_finished "rm $patch1 && rm $patch2" &&
git send-email \
--dry-run \
@@ -1488,7 +1488,7 @@ test_cover_addresses () {
clean_fake_sendmail &&
rm -fr outdir &&
git format-patch --cover-letter -2 -o outdir &&
- cover=`echo outdir/0000-*.patch` &&
+ cover=$(echo outdir/0000-*.patch) &&
mv $cover cover-to-edit.patch &&
perl -pe "s/^From:/$header: extra\@address.com\nFrom:/" cover-to-edit.patch >"$cover" &&
git send-email \
@@ -1527,6 +1527,21 @@ test_expect_success $PREREQ 'cccover adds Cc to all mail' '
test_cover_addresses "Cc"
'
+test_expect_success $PREREQ 'escaped quotes in sendemail.aliasfiletype=mutt' '
+ clean_fake_sendmail &&
+ echo "alias sbd \\\"Dot U. Sir\\\" <somebody@example.org>" >.mutt &&
+ git config --replace-all sendemail.aliasesfile "$(pwd)/.mutt" &&
+ git config sendemail.aliasfiletype mutt &&
+ git send-email \
+ --from="Example <nobody@example.com>" \
+ --to=sbd \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ outdir/0001-*.patch \
+ 2>errors >out &&
+ grep "^!somebody@example\.org!$" commandline1 &&
+ grep -F "To: \"Dot U. Sir\" <somebody@example.org>" out
+'
+
test_expect_success $PREREQ 'sendemail.aliasfiletype=mailrc' '
clean_fake_sendmail &&
echo "alias sbd somebody@example.org" >.mailrc &&
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 4fea8d9..258d9b8 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -265,18 +265,18 @@ test_expect_success 'able to dcommit to a subdirectory' "
git update-index --add d &&
git commit -m '/bar/d should be in the log' &&
git svn dcommit -i bar &&
- test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
+ test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
mkdir newdir &&
echo new > newdir/dir &&
git update-index --add newdir/dir &&
git commit -m 'add a new directory' &&
git svn dcommit -i bar &&
- test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
+ test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
echo foo >> newdir/dir &&
git update-index newdir/dir &&
git commit -m 'modify a file in new directory' &&
git svn dcommit -i bar &&
- test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
+ test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
"
test_expect_success 'dcommit should not fail with a touched file' '
@@ -295,7 +295,7 @@ test_expect_success 'able to set-tree to a subdirectory' "
git update-index d &&
git commit -m 'update /bar/d' &&
git svn set-tree -i bar HEAD &&
- test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
+ test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
"
test_expect_success 'git-svn works in a bare repository' '
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index 8869f50..e8173d5 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -26,27 +26,27 @@ cd import
EOF
printf "Hello\r\nWorld\r\n" > crlf
- a_crlf=`git hash-object -w crlf`
+ a_crlf=$(git hash-object -w crlf)
printf "Hello\rWorld\r" > cr
- a_cr=`git hash-object -w cr`
+ a_cr=$(git hash-object -w cr)
printf "Hello\nWorld\n" > lf
- a_lf=`git hash-object -w lf`
+ a_lf=$(git hash-object -w lf)
printf "Hello\r\nWorld" > ne_crlf
- a_ne_crlf=`git hash-object -w ne_crlf`
+ a_ne_crlf=$(git hash-object -w ne_crlf)
printf "Hello\nWorld" > ne_lf
- a_ne_lf=`git hash-object -w ne_lf`
+ a_ne_lf=$(git hash-object -w ne_lf)
printf "Hello\rWorld" > ne_cr
- a_ne_cr=`git hash-object -w ne_cr`
+ a_ne_cr=$(git hash-object -w ne_cr)
touch empty
- a_empty=`git hash-object -w empty`
+ a_empty=$(git hash-object -w empty)
printf "\n" > empty_lf
- a_empty_lf=`git hash-object -w empty_lf`
+ a_empty_lf=$(git hash-object -w empty_lf)
printf "\r" > empty_cr
- a_empty_cr=`git hash-object -w empty_cr`
+ a_empty_cr=$(git hash-object -w empty_cr)
printf "\r\n" > empty_crlf
- a_empty_crlf=`git hash-object -w empty_crlf`
+ a_empty_crlf=$(git hash-object -w empty_crlf)
svn_cmd import --no-auto-props -m 'import for git svn' . "$svnrepo" >/dev/null
cd ..
@@ -80,7 +80,7 @@ test_expect_success "$name" \
git pull . ${remotes_git_svn}'
expect='/* $Id$ */'
-got="`sed -ne 2p kw.c`"
+got="$(sed -ne 2p kw.c)"
test_expect_success 'raw $Id$ found in kw.c' "test '$expect' = '$got'"
test_expect_success "propset CR on crlf files" '
@@ -107,8 +107,8 @@ done
cd test_wc
printf '$Id$\rHello\rWorld\r' > cr
printf '$Id$\rHello\rWorld' > ne_cr
- a_cr=`printf '$Id$\r\nHello\r\nWorld\r\n' | git hash-object --stdin`
- a_ne_cr=`printf '$Id$\r\nHello\r\nWorld' | git hash-object --stdin`
+ a_cr=$(printf '$Id$\r\nHello\r\nWorld\r\n' | git hash-object --stdin)
+ a_ne_cr=$(printf '$Id$\r\nHello\r\nWorld' | git hash-object --stdin)
test_expect_success 'Set CRLF on cr files' \
'svn_cmd propset svn:eol-style CRLF cr &&
svn_cmd propset svn:eol-style CRLF ne_cr &&
@@ -119,8 +119,8 @@ cd ..
test_expect_success 'fetch and pull latest from svn' \
'git svn fetch && git pull . ${remotes_git_svn}'
-b_cr="`git hash-object cr`"
-b_ne_cr="`git hash-object ne_cr`"
+b_cr="$(git hash-object cr)"
+b_ne_cr="$(git hash-object ne_cr)"
test_expect_success 'CRLF + $Id$' "test '$a_cr' = '$b_cr'"
test_expect_success 'CRLF + $Id$ (no newline)' "test '$a_ne_cr' = '$b_ne_cr'"
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 83f17e1..cd480ed 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -31,12 +31,12 @@ test_expect_success 'initialize repo' '
test_expect_success 'init and fetch a moved directory' '
git svn init --minimize-url -i thunk "$svnrepo"/thunk &&
git svn fetch -i thunk &&
- test "`git rev-parse --verify refs/remotes/thunk@2`" \
- = "`git rev-parse --verify refs/remotes/thunk~1`" &&
- test "`git cat-file blob refs/remotes/thunk:readme |\
- sed -n -e "3p"`" = goodbye &&
- test -z "`git config --get svn-remote.svn.fetch \
- "^trunk:refs/remotes/thunk@2$"`"
+ test "$(git rev-parse --verify refs/remotes/thunk@2)" \
+ = "$(git rev-parse --verify refs/remotes/thunk~1)" &&
+ test "$(git cat-file blob refs/remotes/thunk:readme |\
+ sed -n -e "3p")" = goodbye &&
+ test -z "$(git config --get svn-remote.svn.fetch \
+ "^trunk:refs/remotes/thunk@2$")"
'
test_expect_success 'init and fetch from one svn-remote' '
@@ -46,10 +46,10 @@ test_expect_success 'init and fetch from one svn-remote' '
git config --add svn-remote.svn.fetch \
thunk:refs/remotes/svn/thunk &&
git svn fetch -i svn/thunk &&
- test "`git rev-parse --verify refs/remotes/svn/trunk`" \
- = "`git rev-parse --verify refs/remotes/svn/thunk~1`" &&
- test "`git cat-file blob refs/remotes/svn/thunk:readme |\
- sed -n -e "3p"`" = goodbye
+ test "$(git rev-parse --verify refs/remotes/svn/trunk)" \
+ = "$(git rev-parse --verify refs/remotes/svn/thunk~1)" &&
+ test "$(git cat-file blob refs/remotes/svn/thunk:readme |\
+ sed -n -e "3p")" = goodbye
'
test_expect_success 'follow deleted parent' '
@@ -61,9 +61,9 @@ test_expect_success 'follow deleted parent' '
junk:refs/remotes/svn/junk &&
git svn fetch -i svn/thunk &&
git svn fetch -i svn/junk &&
- test -z "`git diff svn/junk svn/trunk`" &&
- test "`git merge-base svn/junk svn/trunk`" \
- = "`git rev-parse svn/trunk`"
+ test -z "$(git diff svn/junk svn/trunk)" &&
+ test "$(git merge-base svn/junk svn/trunk)" \
+ = "$(git rev-parse svn/trunk)"
'
test_expect_success 'follow larger parent' '
@@ -80,10 +80,10 @@ test_expect_success 'follow larger parent' '
git rev-parse --verify refs/remotes/larger &&
git rev-parse --verify \
refs/remotes/larger-parent &&
- test "`git merge-base \
+ test "$(git merge-base \
refs/remotes/larger-parent \
- refs/remotes/larger`" = \
- "`git rev-parse refs/remotes/larger`"
+ refs/remotes/larger)" = \
+ "$(git rev-parse refs/remotes/larger)"
'
test_expect_success 'follow higher-level parent' '
@@ -106,8 +106,8 @@ test_expect_success 'follow deleted directory' '
svn_cmd rm -m "remove glob" "$svnrepo"/glob &&
git svn init --minimize-url -i glob "$svnrepo"/glob &&
git svn fetch -i glob &&
- test "`git cat-file blob refs/remotes/glob:blob/bye`" = hi &&
- test "`git ls-tree refs/remotes/glob | wc -l `" -eq 1
+ test "$(git cat-file blob refs/remotes/glob:blob/bye)" = hi &&
+ test "$(git ls-tree refs/remotes/glob | wc -l )" -eq 1
'
# ref: r9270 of the Subversion repository: (http://svn.collab.net/repos/svn)
@@ -142,9 +142,9 @@ test_expect_success 'follow-parent avoids deleting relevant info' '
git svn init --minimize-url -i r9270-t \
"$svnrepo"/r9270/trunk/subversion/bindings/swig/perl/native/t &&
git svn fetch -i r9270-t &&
- test `git rev-list r9270-t | wc -l` -eq 2 &&
- test "`git ls-tree --name-only r9270-t~1`" = \
- "`git ls-tree --name-only r9270-t`"
+ test $(git rev-list r9270-t | wc -l) -eq 2 &&
+ test "$(git ls-tree --name-only r9270-t~1)" = \
+ "$(git ls-tree --name-only r9270-t)"
'
test_expect_success "track initial change if it was only made to parent" '
@@ -152,11 +152,11 @@ test_expect_success "track initial change if it was only made to parent" '
git svn init --minimize-url -i r9270-d \
"$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t &&
git svn fetch -i r9270-d &&
- test `git rev-list r9270-d | wc -l` -eq 3 &&
- test "`git ls-tree --name-only r9270-t`" = \
- "`git ls-tree --name-only r9270-d`" &&
- test "`git rev-parse r9270-t`" = \
- "`git rev-parse r9270-d~1`"
+ test $(git rev-list r9270-d | wc -l) -eq 3 &&
+ test "$(git ls-tree --name-only r9270-t)" = \
+ "$(git ls-tree --name-only r9270-d)" &&
+ test "$(git rev-parse r9270-t)" = \
+ "$(git rev-parse r9270-d~1)"
'
test_expect_success "follow-parent is atomic" '
@@ -193,19 +193,19 @@ test_expect_success "follow-parent is atomic" '
git svn fetch -i stunk &&
git svn init --minimize-url -i flunked "$svnrepo"/flunked &&
git svn fetch -i flunked &&
- test "`git rev-parse --verify refs/remotes/flunk@18`" \
- = "`git rev-parse --verify refs/remotes/stunk`" &&
- test "`git rev-parse --verify refs/remotes/flunk~1`" \
- = "`git rev-parse --verify refs/remotes/stunk`" &&
- test "`git rev-parse --verify refs/remotes/flunked~1`" \
- = "`git rev-parse --verify refs/remotes/stunk~1`"
+ test "$(git rev-parse --verify refs/remotes/flunk@18)" \
+ = "$(git rev-parse --verify refs/remotes/stunk)" &&
+ test "$(git rev-parse --verify refs/remotes/flunk~1)" \
+ = "$(git rev-parse --verify refs/remotes/stunk)" &&
+ test "$(git rev-parse --verify refs/remotes/flunked~1)" \
+ = "$(git rev-parse --verify refs/remotes/stunk~1)"
'
test_expect_success "track multi-parent paths" '
svn_cmd cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob &&
git svn multi-fetch &&
- test `git cat-file commit refs/remotes/glob | \
- grep "^parent " | wc -l` -eq 2
+ test $(git cat-file commit refs/remotes/glob | \
+ grep "^parent " | wc -l) -eq 2
'
test_expect_success "multi-fetch continues to work" "
diff --git a/t/t9105-git-svn-commit-diff.sh b/t/t9105-git-svn-commit-diff.sh
index 5d0afea..6ed5f74 100755
--- a/t/t9105-git-svn-commit-diff.sh
+++ b/t/t9105-git-svn-commit-diff.sh
@@ -18,8 +18,8 @@ test_expect_success 'initialize repo' '
git commit -a -m "another"
'
-head=`git rev-parse --verify HEAD^0`
-prev=`git rev-parse --verify HEAD^1`
+head=$(git rev-parse --verify HEAD^0)
+prev=$(git rev-parse --verify HEAD^1)
# the internals of the commit-diff command are the same as the regular
# commit, so only a basic test of functionality is needed since we've
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index 6e69fc4..9060198 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -24,10 +24,10 @@ test_expect_success 'setup old-looking metadata' '
git update-ref -d refs/${remotes_git_svn} refs/${remotes_git_svn}
'
-head=`git rev-parse --verify refs/heads/git-svn-HEAD^0`
+head=$(git rev-parse --verify refs/heads/git-svn-HEAD^0)
test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'"
-svnrepo_escaped=`echo $svnrepo | sed 's/ /%20/'`
+svnrepo_escaped=$(echo $svnrepo | sed 's/ /%20/')
test_expect_success 'initialize old-style (v0) git svn layout' '
mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
@@ -38,7 +38,7 @@ test_expect_success 'initialize old-style (v0) git svn layout' '
git rev-parse --verify refs/${remotes_git_svn}^0 &&
git rev-parse --verify refs/remotes/svn^0 &&
test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" &&
- test `git config --get svn-remote.svn.fetch` = \
+ test $(git config --get svn-remote.svn.fetch) = \
":refs/${remotes_git_svn}"
'
@@ -46,10 +46,10 @@ test_expect_success 'initialize a multi-repository repo' '
git svn init "$svnrepo" -T trunk -t tags -b branches &&
git config --get-all svn-remote.svn.fetch > fetch.out &&
grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
- test -n "`git config --get svn-remote.svn.branches \
- "^branches/\*:refs/remotes/origin/\*$"`" &&
- test -n "`git config --get svn-remote.svn.tags \
- "^tags/\*:refs/remotes/origin/tags/\*$"`" &&
+ test -n "$(git config --get svn-remote.svn.branches \
+ "^branches/\*:refs/remotes/origin/\*$")" &&
+ test -n "$(git config --get svn-remote.svn.tags \
+ "^tags/\*:refs/remotes/origin/tags/\*$")" &&
git config --unset svn-remote.svn.branches \
"^branches/\*:refs/remotes/origin/\*$" &&
git config --unset svn-remote.svn.tags \
@@ -75,28 +75,28 @@ test_expect_success 'multi-fetch works on partial urls + paths' "
for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
git rev-parse --verify refs/remotes/origin/\$i^0 >> refs.out || exit 1;
done &&
- test -z \"\`sort < refs.out | uniq -d\`\" &&
+ test -z \"\$(sort < refs.out | uniq -d)\" &&
for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
for j in trunk a b tags/0.1 tags/0.2 tags/0.3; do
if test \$j != \$i; then continue; fi
- test -z \"\`git diff refs/remotes/origin/\$i \
- refs/remotes/origin/\$j\`\" ||exit 1; done; done
+ test -z \"\$(git diff refs/remotes/origin/\$i \
+ refs/remotes/origin/\$j)\" ||exit 1; done; done
"
test_expect_success 'migrate --minimize on old inited layout' '
git config --unset-all svn-remote.svn.fetch &&
git config --unset-all svn-remote.svn.url &&
rm -rf "$GIT_DIR"/svn &&
- for i in `cat fetch.out`; do
- path=`expr $i : "\([^:]*\):.*$"`
- ref=`expr $i : "[^:]*:\(refs/remotes/.*\)$"`
+ for i in $(cat fetch.out); do
+ path=$(expr $i : "\([^:]*\):.*$")
+ ref=$(expr $i : "[^:]*:\(refs/remotes/.*\)$")
if test -z "$ref"; then continue; fi
if test -n "$path"; then path="/$path"; fi
( mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
echo "$svnrepo"$path > "$GIT_DIR"/svn/$ref/info/url ) || exit 1;
done &&
git svn migrate --minimize &&
- test -z "`git config -l | grep "^svn-remote\.git-svn\."`" &&
+ test -z "$(git config -l | grep "^svn-remote\.git-svn\.")" &&
git config --get-all svn-remote.svn.fetch > fetch.out &&
grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
diff --git a/t/t9108-git-svn-glob.sh b/t/t9108-git-svn-glob.sh
index d732d31..a526d60 100755
--- a/t/t9108-git-svn-glob.sh
+++ b/t/t9108-git-svn-glob.sh
@@ -50,10 +50,10 @@ test_expect_success 'test refspec globbing' '
git log --pretty=oneline refs/remotes/tags/end | \
sed -e "s/^.\{41\}//" > output.end &&
test_cmp expect.end output.end &&
- test "`git rev-parse refs/remotes/tags/end~1`" = \
- "`git rev-parse refs/remotes/branches/start`" &&
- test "`git rev-parse refs/remotes/branches/start~2`" = \
- "`git rev-parse refs/remotes/trunk`" &&
+ test "$(git rev-parse refs/remotes/tags/end~1)" = \
+ "$(git rev-parse refs/remotes/branches/start)" &&
+ test "$(git rev-parse refs/remotes/branches/start~2)" = \
+ "$(git rev-parse refs/remotes/trunk)" &&
test_must_fail git rev-parse refs/remotes/tags/end@3
'
@@ -75,12 +75,12 @@ test_expect_success 'test left-hand-side only globbing' '
svn_cmd commit -m "try to try"
) &&
git svn fetch two &&
- test `git rev-list refs/remotes/two/tags/end | wc -l` -eq 6 &&
- test `git rev-list refs/remotes/two/branches/start | wc -l` -eq 3 &&
- test `git rev-parse refs/remotes/two/branches/start~2` = \
- `git rev-parse refs/remotes/two/trunk` &&
- test `git rev-parse refs/remotes/two/tags/end~3` = \
- `git rev-parse refs/remotes/two/branches/start` &&
+ test $(git rev-list refs/remotes/two/tags/end | wc -l) -eq 6 &&
+ test $(git rev-list refs/remotes/two/branches/start | wc -l) -eq 3 &&
+ test $(git rev-parse refs/remotes/two/branches/start~2) = \
+ $(git rev-parse refs/remotes/two/trunk) &&
+ test $(git rev-parse refs/remotes/two/tags/end~3) = \
+ $(git rev-parse refs/remotes/two/branches/start) &&
git log --pretty=oneline refs/remotes/two/tags/end | \
sed -e "s/^.\{41\}//" > output.two &&
test_cmp expect.two output.two
diff --git a/t/t9109-git-svn-multi-glob.sh b/t/t9109-git-svn-multi-glob.sh
index c318f9f..f36b749 100755
--- a/t/t9109-git-svn-multi-glob.sh
+++ b/t/t9109-git-svn-multi-glob.sh
@@ -50,10 +50,10 @@ test_expect_success 'test refspec globbing' '
git log --pretty=oneline refs/remotes/tags/end | \
sed -e "s/^.\{41\}//" > output.end &&
test_cmp expect.end output.end &&
- test "`git rev-parse refs/remotes/tags/end~1`" = \
- "`git rev-parse refs/remotes/branches/v1/start`" &&
- test "`git rev-parse refs/remotes/branches/v1/start~2`" = \
- "`git rev-parse refs/remotes/trunk`" &&
+ test "$(git rev-parse refs/remotes/tags/end~1)" = \
+ "$(git rev-parse refs/remotes/branches/v1/start)" &&
+ test "$(git rev-parse refs/remotes/branches/v1/start~2)" = \
+ "$(git rev-parse refs/remotes/trunk)" &&
test_must_fail git rev-parse refs/remotes/tags/end@3
'
@@ -75,12 +75,12 @@ test_expect_success 'test left-hand-side only globbing' '
svn_cmd commit -m "try to try"
) &&
git svn fetch two &&
- test `git rev-list refs/remotes/two/tags/end | wc -l` -eq 6 &&
- test `git rev-list refs/remotes/two/branches/v1/start | wc -l` -eq 3 &&
- test `git rev-parse refs/remotes/two/branches/v1/start~2` = \
- `git rev-parse refs/remotes/two/trunk` &&
- test `git rev-parse refs/remotes/two/tags/end~3` = \
- `git rev-parse refs/remotes/two/branches/v1/start` &&
+ test $(git rev-list refs/remotes/two/tags/end | wc -l) -eq 6 &&
+ test $(git rev-list refs/remotes/two/branches/v1/start | wc -l) -eq 3 &&
+ test $(git rev-parse refs/remotes/two/branches/v1/start~2) = \
+ $(git rev-parse refs/remotes/two/trunk) &&
+ test $(git rev-parse refs/remotes/two/tags/end~3) = \
+ $(git rev-parse refs/remotes/two/branches/v1/start) &&
git log --pretty=oneline refs/remotes/two/tags/end | \
sed -e "s/^.\{41\}//" > output.two &&
test_cmp expect.two output.two
@@ -124,12 +124,12 @@ test_expect_success 'test another branch' '
git config --add svn-remote.four.tags \
"tags/*:refs/remotes/four/tags/*" &&
git svn fetch four &&
- test `git rev-list refs/remotes/four/tags/next | wc -l` -eq 5 &&
- test `git rev-list refs/remotes/four/branches/v2/start | wc -l` -eq 3 &&
- test `git rev-parse refs/remotes/four/branches/v2/start~2` = \
- `git rev-parse refs/remotes/four/trunk` &&
- test `git rev-parse refs/remotes/four/tags/next~2` = \
- `git rev-parse refs/remotes/four/branches/v2/start` &&
+ test $(git rev-list refs/remotes/four/tags/next | wc -l) -eq 5 &&
+ test $(git rev-list refs/remotes/four/branches/v2/start | wc -l) -eq 3 &&
+ test $(git rev-parse refs/remotes/four/branches/v2/start~2) = \
+ $(git rev-parse refs/remotes/four/trunk) &&
+ test $(git rev-parse refs/remotes/four/tags/next~2) = \
+ $(git rev-parse refs/remotes/four/branches/v2/start) &&
git log --pretty=oneline refs/remotes/four/tags/next | \
sed -e "s/^.\{41\}//" > output.four &&
test_cmp expect.four output.four
diff --git a/t/t9110-git-svn-use-svm-props.sh b/t/t9110-git-svn-use-svm-props.sh
index a06e4c5..29fbdfd 100755
--- a/t/t9110-git-svn-use-svm-props.sh
+++ b/t/t9110-git-svn-use-svm-props.sh
@@ -51,7 +51,7 @@ test_expect_success 'verify metadata for /dir' "
test_expect_success 'find commit based on SVN revision number' "
git svn find-rev r12 |
- grep `git rev-parse HEAD`
+ grep $(git rev-parse HEAD)
"
test_expect_success 'empty rebase' "
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh
index fb41876..a3d3882 100755
--- a/t/t9114-git-svn-dcommit-merge.sh
+++ b/t/t9114-git-svn-dcommit-merge.sh
@@ -68,8 +68,8 @@ test_expect_success 'setup git mirror and merge' '
test_debug 'gitk --all & sleep 1'
test_expect_success 'verify pre-merge ancestry' "
- test x\`git rev-parse --verify refs/heads/svn^2\` = \
- x\`git rev-parse --verify refs/heads/merge\` &&
+ test x\$(git rev-parse --verify refs/heads/svn^2) = \
+ x\$(git rev-parse --verify refs/heads/merge) &&
git cat-file commit refs/heads/svn^ | grep '^friend$'
"
@@ -80,10 +80,10 @@ test_expect_success 'git svn dcommit merges' "
test_debug 'gitk --all & sleep 1'
test_expect_success 'verify post-merge ancestry' "
- test x\`git rev-parse --verify refs/heads/svn\` = \
- x\`git rev-parse --verify refs/remotes/origin/trunk \` &&
- test x\`git rev-parse --verify refs/heads/svn^2\` = \
- x\`git rev-parse --verify refs/heads/merge\` &&
+ test x\$(git rev-parse --verify refs/heads/svn) = \
+ x\$(git rev-parse --verify refs/remotes/origin/trunk) &&
+ test x\$(git rev-parse --verify refs/heads/svn^2) = \
+ x\$(git rev-parse --verify refs/heads/merge) &&
git cat-file commit refs/heads/svn^ | grep '^friend$'
"
diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
index ed4d136..a221915 100755
--- a/t/t9118-git-svn-funky-branch-names.sh
+++ b/t/t9118-git-svn-funky-branch-names.sh
@@ -35,7 +35,7 @@ test_expect_success 'setup svnrepo' '
# SVN 1.7 will truncate "not-a%40{0]" to just "not-a".
# Look at what SVN wound up naming the branch and use that.
# Be sure to escape the @ if it shows up.
-non_reflog=`svn_cmd ls "$svnrepo/pr ject/branches" | grep not-a | sed 's/\///' | sed 's/@/%40/'`
+non_reflog=$(svn_cmd ls "$svnrepo/pr ject/branches" | grep not-a | sed 's/\///' | sed 's/@/%40/')
test_expect_success 'test clone with funky branch names' '
git svn clone -s "$svnrepo/pr ject" project &&
diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh
index f16f323..88241ba 100755
--- a/t/t9119-git-svn-info.sh
+++ b/t/t9119-git-svn-info.sh
@@ -8,7 +8,7 @@ test_description='git svn info'
# Tested with: svn, version 1.4.4 (r25188)
# Tested with: svn, version 1.6.[12345689]
-v=`svn_cmd --version | sed -n -e 's/^svn, version \(1\.[0-9]*\.[0-9]*\).*$/\1/p'`
+v=$(svn_cmd --version | sed -n -e 's/^svn, version \(1\.[0-9]*\.[0-9]*\).*$/\1/p')
case $v in
1.[456].*)
;;
diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
index 8cfdfe7..39b6bcb 100755
--- a/t/t9129-git-svn-i18n-commitencoding.sh
+++ b/t/t9129-git-svn-i18n-commitencoding.sh
@@ -7,7 +7,7 @@ test_description='git svn honors i18n.commitEncoding in config'
. ./lib-git-svn.sh
compare_git_head_with () {
- nr=`wc -l < "$1"`
+ nr=$(wc -l < "$1")
a=7
b=$(($a + $nr - 1))
git cat-file commit HEAD | sed -ne "$a,${b}p" >current &&
@@ -29,7 +29,7 @@ fi
compare_svn_head_with () {
# extract just the log message and strip out committer info.
# don't use --limit here since svn 1.1.x doesn't have it,
- LC_ALL="$a_utf8_locale" svn log `git svn info --url` | perl -w -e '
+ LC_ALL="$a_utf8_locale" svn log $(git svn info --url) | perl -w -e '
use bytes;
$/ = ("-"x72) . "\n";
my @x = <STDIN>;
diff --git a/t/t9130-git-svn-authors-file.sh b/t/t9130-git-svn-authors-file.sh
index c44de26..d306b77 100755
--- a/t/t9130-git-svn-authors-file.sh
+++ b/t/t9130-git-svn-authors-file.sh
@@ -26,7 +26,7 @@ test_expect_success 'start import with incomplete authors file' '
test_expect_success 'imported 2 revisions successfully' '
(
cd x
- test "`git rev-list refs/remotes/git-svn | wc -l`" -eq 2 &&
+ test "$(git rev-list refs/remotes/git-svn | wc -l)" -eq 2 &&
git rev-list -1 --pretty=raw refs/remotes/git-svn | \
grep "^author BBBBBBB BBBBBBB <bb@example\.com> " &&
git rev-list -1 --pretty=raw refs/remotes/git-svn~1 | \
@@ -43,7 +43,7 @@ test_expect_success 'continues to import once authors have been added' '
(
cd x
git svn fetch --authors-file=../svn-authors &&
- test "`git rev-list refs/remotes/git-svn | wc -l`" -eq 4 &&
+ test "$(git rev-list refs/remotes/git-svn | wc -l)" -eq 4 &&
git rev-list -1 --pretty=raw refs/remotes/git-svn | \
grep "^author DDDDDDD DDDDDDD <dd@example\.com> " &&
git rev-list -1 --pretty=raw refs/remotes/git-svn~1 | \
@@ -73,8 +73,8 @@ tmp_config_get () {
test_expect_success 'failure happened without negative side effects' '
(
cd aa-work &&
- test 6 -eq "`tmp_config_get svn-remote.svn.branches-maxRev`" &&
- test 6 -eq "`tmp_config_get svn-remote.svn.tags-maxRev`"
+ test 6 -eq "$(tmp_config_get svn-remote.svn.branches-maxRev)" &&
+ test 6 -eq "$(tmp_config_get svn-remote.svn.tags-maxRev)"
)
'
@@ -86,8 +86,8 @@ test_expect_success 'fetch continues after authors-file is fixed' '
(
cd aa-work &&
git svn fetch --authors-file=../svn-authors &&
- test 8 -eq "`tmp_config_get svn-remote.svn.branches-maxRev`" &&
- test 8 -eq "`tmp_config_get svn-remote.svn.tags-maxRev`"
+ test 8 -eq "$(tmp_config_get svn-remote.svn.branches-maxRev)" &&
+ test 8 -eq "$(tmp_config_get svn-remote.svn.tags-maxRev)"
)
'
diff --git a/t/t9132-git-svn-broken-symlink.sh b/t/t9132-git-svn-broken-symlink.sh
index 6c4c90b..aeceffa 100755
--- a/t/t9132-git-svn-broken-symlink.sh
+++ b/t/t9132-git-svn-broken-symlink.sh
@@ -87,7 +87,7 @@ test_expect_success 'clone using git svn' 'git svn clone -r1 "$svnrepo" x'
test_expect_success SYMLINKS '"bar" is a symlink that points to "asdf"' '
test -L x/bar &&
- (cd x && test xasdf = x"`git cat-file blob HEAD:bar`")
+ (cd x && test xasdf = x"$(git cat-file blob HEAD:bar)")
'
test_expect_success 'get "bar" => symlink fix from svn' '
@@ -96,7 +96,7 @@ test_expect_success 'get "bar" => symlink fix from svn' '
test_expect_success SYMLINKS '"bar" remains a proper symlink' '
test -L x/bar &&
- (cd x && test xdoink = x"`git cat-file blob HEAD:bar`")
+ (cd x && test xdoink = x"$(git cat-file blob HEAD:bar)")
'
test_done
diff --git a/t/t9137-git-svn-dcommit-clobber-series.sh b/t/t9137-git-svn-dcommit-clobber-series.sh
index d60da63..5fa07a3 100755
--- a/t/t9137-git-svn-dcommit-clobber-series.sh
+++ b/t/t9137-git-svn-dcommit-clobber-series.sh
@@ -16,15 +16,15 @@ test_expect_success 'initialize repo' '
'
test_expect_success '(supposedly) non-conflicting change from SVN' '
- test x"`sed -n -e 58p < file`" = x58 &&
- test x"`sed -n -e 61p < file`" = x61 &&
+ test x"$(sed -n -e 58p < file)" = x58 &&
+ test x"$(sed -n -e 61p < file)" = x61 &&
svn_cmd co "$svnrepo" tmp &&
(cd tmp &&
perl -i.bak -p -e "s/^58$/5588/" file &&
perl -i.bak -p -e "s/^61$/6611/" file &&
poke file &&
- test x"`sed -n -e 58p < file`" = x5588 &&
- test x"`sed -n -e 61p < file`" = x6611 &&
+ test x"$(sed -n -e 58p < file)" = x5588 &&
+ test x"$(sed -n -e 61p < file)" = x6611 &&
svn_cmd commit -m "58 => 5588, 61 => 6611"
)
'
@@ -38,20 +38,20 @@ test_expect_success 'some unrelated changes to git' "
"
test_expect_success 'change file but in unrelated area' "
- test x\"\`sed -n -e 4p < file\`\" = x4 &&
- test x\"\`sed -n -e 7p < file\`\" = x7 &&
+ test x\"\$(sed -n -e 4p < file)\" = x4 &&
+ test x\"\$(sed -n -e 7p < file)\" = x7 &&
perl -i.bak -p -e 's/^4\$/4444/' file &&
perl -i.bak -p -e 's/^7\$/7777/' file &&
- test x\"\`sed -n -e 4p < file\`\" = x4444 &&
- test x\"\`sed -n -e 7p < file\`\" = x7777 &&
+ test x\"\$(sed -n -e 4p < file)\" = x4444 &&
+ test x\"\$(sed -n -e 7p < file)\" = x7777 &&
git commit -m '4 => 4444, 7 => 7777' file &&
git svn dcommit &&
svn_cmd up tmp &&
cd tmp &&
- test x\"\`sed -n -e 4p < file\`\" = x4444 &&
- test x\"\`sed -n -e 7p < file\`\" = x7777 &&
- test x\"\`sed -n -e 58p < file\`\" = x5588 &&
- test x\"\`sed -n -e 61p < file\`\" = x6611
+ test x\"\$(sed -n -e 4p < file)\" = x4444 &&
+ test x\"\$(sed -n -e 7p < file)\" = x7777 &&
+ test x\"\$(sed -n -e 58p < file)\" = x5588 &&
+ test x\"\$(sed -n -e 61p < file)\" = x6611
"
test_expect_success 'attempt to dcommit with a dirty index' '
diff --git a/t/t9138-git-svn-authors-prog.sh b/t/t9138-git-svn-authors-prog.sh
index 2937f4c..7d7e9d4 100755
--- a/t/t9138-git-svn-authors-prog.sh
+++ b/t/t9138-git-svn-authors-prog.sh
@@ -37,7 +37,7 @@ test_expect_success 'import authors with prog and file' '
test_expect_success 'imported 6 revisions successfully' '
(
cd x
- test "`git rev-list refs/remotes/git-svn | wc -l`" -eq 6
+ test "$(git rev-list refs/remotes/git-svn | wc -l)" -eq 6
)
'
diff --git a/t/t9145-git-svn-master-branch.sh b/t/t9145-git-svn-master-branch.sh
index 6559137..3bbf341 100755
--- a/t/t9145-git-svn-master-branch.sh
+++ b/t/t9145-git-svn-master-branch.sh
@@ -17,8 +17,8 @@ test_expect_success 'git svn clone --stdlayout sets up trunk as master' '
git svn clone -s "$svnrepo" g &&
(
cd g &&
- test x`git rev-parse --verify refs/remotes/origin/trunk^0` = \
- x`git rev-parse --verify refs/heads/master^0`
+ test x$(git rev-parse --verify refs/remotes/origin/trunk^0) = \
+ x$(git rev-parse --verify refs/heads/master^0)
)
'
diff --git a/t/t9150-svk-mergetickets.sh b/t/t9150-svk-mergetickets.sh
index 24c2421..1bb676b 100755
--- a/t/t9150-svk-mergetickets.sh
+++ b/t/t9150-svk-mergetickets.sh
@@ -19,7 +19,7 @@ test_expect_success 'load svk depot' "
uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
test_expect_success 'svk merges were represented coming in' "
- [ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
+ [ $(git cat-file commit HEAD | grep parent | wc -l) -eq 2 ]
"
test_done
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 14a9384..4c5f3c9 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -171,10 +171,10 @@ test_expect_success 'A: verify tag/series-A-blob' '
test_expect_success 'A: verify marks output' '
cat >expect <<-EOF &&
- :2 `git rev-parse --verify master:file2`
- :3 `git rev-parse --verify master:file3`
- :4 `git rev-parse --verify master:file4`
- :5 `git rev-parse --verify master^0`
+ :2 $(git rev-parse --verify master:file2)
+ :3 $(git rev-parse --verify master:file3)
+ :4 $(git rev-parse --verify master:file4)
+ :5 $(git rev-parse --verify master^0)
EOF
test_cmp expect marks.out
'
@@ -264,8 +264,8 @@ test_expect_success 'A: verify diff' '
EOF
git diff-tree -M -r master verify--import-marks >actual &&
compare_diff_raw expect actual &&
- test `git rev-parse --verify master:file2` \
- = `git rev-parse --verify verify--import-marks:copy-of-file2`
+ test $(git rev-parse --verify master:file2) \
+ = $(git rev-parse --verify verify--import-marks:copy-of-file2)
'
test_expect_success 'A: export marks with large values' '
@@ -364,7 +364,7 @@ test_expect_success 'B: accept branch name "TEMP_TAG"' '
git prune" &&
git fast-import <input &&
test -f .git/TEMP_TAG &&
- test `git rev-parse master` = `git rev-parse TEMP_TAG^`
+ test $(git rev-parse master) = $(git rev-parse TEMP_TAG^)
'
test_expect_success 'B: accept empty committer' '
@@ -473,8 +473,8 @@ test_expect_success 'B: fail on invalid committer (5)' '
###
test_expect_success 'C: incremental import create pack from stdin' '
- newf=`echo hi newf | git hash-object -w --stdin` &&
- oldf=`git rev-parse --verify master:file2` &&
+ newf=$(echo hi newf | git hash-object -w --stdin) &&
+ oldf=$(git rev-parse --verify master:file2) &&
test_tick &&
cat >input <<-INPUT_END &&
commit refs/heads/branch
@@ -499,13 +499,13 @@ test_expect_success 'C: verify pack' '
'
test_expect_success 'C: validate reuse existing blob' '
- test $newf = `git rev-parse --verify branch:file2/newf` &&
- test $oldf = `git rev-parse --verify branch:file2/oldf`
+ test $newf = $(git rev-parse --verify branch:file2/newf) &&
+ test $oldf = $(git rev-parse --verify branch:file2/oldf)
'
test_expect_success 'C: verify commit' '
cat >expect <<-EOF &&
- parent `git rev-parse --verify master^0`
+ parent $(git rev-parse --verify master^0)
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
@@ -624,7 +624,7 @@ test_expect_success 'E: verify commit' '
###
test_expect_success 'F: non-fast-forward update skips' '
- old_branch=`git rev-parse --verify branch^0` &&
+ old_branch=$(git rev-parse --verify branch^0) &&
test_tick &&
cat >input <<-INPUT_END &&
commit refs/heads/branch
@@ -642,7 +642,7 @@ test_expect_success 'F: non-fast-forward update skips' '
test_must_fail git fast-import <input &&
# branch must remain unaffected
- test $old_branch = `git rev-parse --verify branch^0`
+ test $old_branch = $(git rev-parse --verify branch^0)
'
test_expect_success 'F: verify pack' '
@@ -651,8 +651,8 @@ test_expect_success 'F: verify pack' '
test_expect_success 'F: verify other commit' '
cat >expect <<-EOF &&
- tree `git rev-parse branch~1^{tree}`
- parent `git rev-parse branch~1`
+ tree $(git rev-parse branch~1^{tree})
+ parent $(git rev-parse branch~1)
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
@@ -667,7 +667,7 @@ test_expect_success 'F: verify other commit' '
###
test_expect_success 'G: non-fast-forward update forced' '
- old_branch=`git rev-parse --verify branch^0` &&
+ old_branch=$(git rev-parse --verify branch^0) &&
test_tick &&
cat >input <<-INPUT_END &&
commit refs/heads/branch
@@ -687,8 +687,8 @@ test_expect_success 'G: verify pack' '
'
test_expect_success 'G: branch changed, but logged' '
- test $old_branch != `git rev-parse --verify branch^0` &&
- test $old_branch = `git rev-parse --verify branch@{1}`
+ test $old_branch != $(git rev-parse --verify branch^0) &&
+ test $old_branch = $(git rev-parse --verify branch@{1})
'
###
@@ -763,7 +763,7 @@ test_expect_success 'I: export-pack-edges' '
test_expect_success 'I: verify edge list' '
cat >expect <<-EOF &&
- .git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary`
+ .git/objects/pack/pack-.pack: $(git rev-parse --verify export-boundary)
EOF
sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
test_cmp expect actual
@@ -795,8 +795,8 @@ test_expect_success 'J: reset existing branch creates empty commit' '
git fast-import <input
'
test_expect_success 'J: branch has 1 commit, empty tree' '
- test 1 = `git rev-list J | wc -l` &&
- test 0 = `git ls-tree J | wc -l`
+ test 1 = $(git rev-list J | wc -l) &&
+ test 0 = $(git ls-tree J | wc -l)
'
test_expect_success 'J: tag must fail on empty branch' '
@@ -838,8 +838,8 @@ test_expect_success 'K: reinit branch with from' '
git fast-import <input
'
test_expect_success 'K: verify K^1 = branch^1' '
- test `git rev-parse --verify branch^1` \
- = `git rev-parse --verify K^1`
+ test $(git rev-parse --verify branch^1) \
+ = $(git rev-parse --verify K^1)
'
###
@@ -929,7 +929,7 @@ test_expect_success 'L: nested tree copy does not corrupt deltas' '
git ls-tree L2 g/b/ >tmp &&
cat tmp | cut -f 2 >actual &&
test_cmp expect actual &&
- git fsck `git rev-parse L2`
+ git fsck $(git rev-parse L2)
'
###
@@ -1106,7 +1106,7 @@ test_expect_success 'N: copy dirty subdirectory' '
INPUT_END
git fast-import <input &&
- test `git rev-parse N2^{tree}` = `git rev-parse N3^{tree}`
+ test $(git rev-parse N2^{tree}) = $(git rev-parse N3^{tree})
'
test_expect_success 'N: copy directory by id' '
@@ -1503,7 +1503,7 @@ test_expect_success 'O: comments are all skipped' '
INPUT_END
git fast-import <input &&
- test `git rev-parse N3` = `git rev-parse O1`
+ test $(git rev-parse N3) = $(git rev-parse O1)
'
test_expect_success 'O: blank lines not necessary after data commands' '
@@ -1524,7 +1524,7 @@ test_expect_success 'O: blank lines not necessary after data commands' '
INPUT_END
git fast-import <input &&
- test `git rev-parse N3` = `git rev-parse O2`
+ test $(git rev-parse N3) = $(git rev-parse O2)
'
test_expect_success 'O: repack before next test' '
@@ -1570,8 +1570,8 @@ test_expect_success 'O: blank lines not necessary after other commands' '
INPUT_END
git fast-import <input &&
- test 8 = `find .git/objects/pack -type f | wc -l` &&
- test `git rev-parse refs/tags/O3-2nd` = `git rev-parse O3^` &&
+ test 8 = $(find .git/objects/pack -type f | wc -l) &&
+ test $(git rev-parse refs/tags/O3-2nd) = $(git rev-parse O3^) &&
git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
test_cmp expect actual
'
@@ -1631,7 +1631,7 @@ test_expect_success 'P: superproject & submodule mix' '
data <<DATAEND
[submodule "sub"]
path = sub
- url = "`pwd`/sub"
+ url = "$(pwd)/sub"
DATAEND
commit refs/heads/subuse1
@@ -1691,7 +1691,7 @@ test_expect_success 'P: verbatim SHA gitlinks' '
data <<DATAEND
[submodule "sub"]
path = sub
- url = "`pwd`/sub"
+ url = "$(pwd)/sub"
DATAEND
commit refs/heads/subuse2
@@ -1978,7 +1978,7 @@ test_expect_success 'Q: verify first note for third commit' '
test_expect_success 'Q: verify second notes commit' '
cat >expect <<-EOF &&
- parent `git rev-parse --verify refs/notes/foobar~2`
+ parent $(git rev-parse --verify refs/notes/foobar~2)
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
@@ -2045,7 +2045,7 @@ test_expect_success 'Q: verify third note for first commit' '
test_expect_success 'Q: verify fourth notes commit' '
cat >expect <<-EOF &&
- parent `git rev-parse --verify refs/notes/foobar^`
+ parent $(git rev-parse --verify refs/notes/foobar^)
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 66c8b0a..b5149fd 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -163,7 +163,7 @@ test_expect_success 'setup submodule' '
git add file &&
git commit -m sub_initial
) &&
- git submodule add "`pwd`/sub" sub &&
+ git submodule add "$(pwd)/sub" sub &&
git commit -m initial &&
test_tick &&
(
@@ -377,7 +377,7 @@ test_expect_success 'full-tree re-shows unmodified files' '
test_expect_success 'set-up a few more tags for tag export tests' '
git checkout -f master &&
- HEAD_TREE=`git show -s --pretty=raw HEAD | grep tree | sed "s/tree //"` &&
+ HEAD_TREE=$(git show -s --pretty=raw HEAD | grep tree | sed "s/tree //") &&
git tag tree_tag -m "tagging a tree" $HEAD_TREE &&
git tag -a tree_tag-obj -m "tagging a tree" $HEAD_TREE &&
git tag tag-obj_tag -m "tagging a tag" tree_tag-obj &&
@@ -422,7 +422,7 @@ test_expect_success 'directory becomes symlink' '
test_expect_success 'fast-export quotes pathnames' '
git init crazy-paths &&
(cd crazy-paths &&
- blob=`echo foo | git hash-object -w --stdin` &&
+ blob=$(echo foo | git hash-object -w --stdin) &&
git update-index --add \
--cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
--cacheinfo 100644 $blob "path with \"quote\"" \
diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh
index d3a5bac..2a0ffed 100755
--- a/t/t9501-gitweb-standalone-http-status.sh
+++ b/t/t9501-gitweb-standalone-http-status.sh
@@ -100,14 +100,14 @@ test_expect_success 'snapshots: bad tree-ish id (tagged object)' '
echo object > tag-object &&
git add tag-object &&
test_tick && git commit -m "Object to be tagged" &&
- git tag tagged-object `git hash-object tag-object` &&
+ git tag tagged-object $(git hash-object tag-object) &&
gitweb_run "p=.git;a=snapshot;h=tagged-object;sf=tgz" &&
grep "400 - Object is not a tree-ish" gitweb.output
'
test_debug 'cat gitweb.output'
test_expect_success 'snapshots: good object id' '
- ID=`git rev-parse --verify HEAD` &&
+ ID=$(git rev-parse --verify HEAD) &&
gitweb_run "p=.git;a=snapshot;h=$ID;sf=tgz" &&
grep "Status: 200 OK" gitweb.output
'
@@ -173,7 +173,7 @@ test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (unmod
test_debug 'cat gitweb.headers'
test_expect_success DATE_PARSER 'modification: tree snapshot' '
- ID=`git rev-parse --verify HEAD^{tree}` &&
+ ID=$(git rev-parse --verify HEAD^{tree}) &&
HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
export HTTP_IF_MODIFIED_SINCE &&
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh
index 3b3ae1f..8840a18 100755
--- a/t/t9818-git-p4-block.sh
+++ b/t/t9818-git-p4-block.sh
@@ -84,7 +84,7 @@ p4_add_file() {
(cd "$cli" &&
>$1 &&
p4 add $1 &&
- p4 submit -d "Added a file" $1
+ p4 submit -d "Added file $1" $1
)
}
@@ -112,6 +112,32 @@ test_expect_success 'Syncing files' '
)
'
+# Handling of multiple depot paths:
+# git p4 clone //depot/pathA //depot/pathB
+#
+test_expect_success 'Create a repo with multiple depot paths' '
+ client_view "//depot/pathA/... //client/pathA/..." \
+ "//depot/pathB/... //client/pathB/..." &&
+ mkdir -p "$cli/pathA" "$cli/pathB" &&
+ for p in pathA pathB
+ do
+ for i in $(test_seq 1 10)
+ do
+ p4_add_file "$p/file$p$i"
+ done
+ done
+'
+
+test_expect_success 'Clone repo with multiple depot paths' '
+ (
+ cd "$git" &&
+ git p4 clone --changes-block-size=4 //depot/pathA@all //depot/pathB@all \
+ --destination=dest &&
+ ls -1 dest >log &&
+ test_line_count = 20 log
+ )
+'
+
test_expect_success 'kill p4d' '
kill_p4d
'
diff --git a/t/t9827-git-p4-change-filetype.sh b/t/t9827-git-p4-change-filetype.sh
new file mode 100755
index 0000000..7433998
--- /dev/null
+++ b/t/t9827-git-p4-change-filetype.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+test_description='git p4 support for file type change'
+
+. ./lib-git-p4.sh
+
+test_expect_success 'start p4d' '
+ start_p4d
+'
+
+test_expect_success 'create files' '
+ (
+ cd "$cli" &&
+ p4 client -o | sed "/LineEnd/s/:.*/:unix/" | p4 client -i &&
+ cat >file1 <<-EOF &&
+ text without any funny substitution business
+ EOF
+ cat >file2 <<-EOF &&
+ second file whose type will change
+ EOF
+ p4 add file1 file2 &&
+ p4 submit -d "add files"
+ )
+'
+
+test_expect_success SYMLINKS 'change file to symbolic link' '
+ git p4 clone --dest="$git" //depot@all &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ git config git-p4.skipSubmitEdit true &&
+
+ rm file2 &&
+ ln -s file1 file2 &&
+ git add file2 &&
+ git commit -m "symlink file1 to file2" &&
+ git p4 submit &&
+ p4 filelog -m 1 //depot/file2 >filelog &&
+ grep "(symlink)" filelog
+ )
+'
+
+test_expect_success SYMLINKS 'change symbolic link to file' '
+ git p4 clone --dest="$git" //depot@all &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ git config git-p4.skipSubmitEdit true &&
+
+ rm file2 &&
+ cat >file2 <<-EOF &&
+ This is another content for the second file.
+ EOF
+ git add file2 &&
+ git commit -m "re-write file2" &&
+ git p4 submit &&
+ p4 filelog -m 1 //depot/file2 >filelog &&
+ grep "(text)" filelog
+ )
+'
+
+test_expect_success 'kill p4d' '
+ kill_p4d
+'
+
+test_done
diff --git a/t/t9901-git-web--browse.sh b/t/t9901-git-web--browse.sh
index b0a6bad..de7152f 100755
--- a/t/t9901-git-web--browse.sh
+++ b/t/t9901-git-web--browse.sh
@@ -43,7 +43,7 @@ test_expect_success \
echo fake: "$@"
EOF
chmod +x "fake browser" &&
- git config browser.w3m.path "`pwd`/fake browser" &&
+ git config browser.w3m.path "$(pwd)/fake browser" &&
test_web_browse w3m http://example.com/foo
'
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 16c4d7b..bd4b02e 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1054,20 +1054,28 @@ test_lazy_prereq NOT_ROOT '
test "$uid" != 0
'
-# On a filesystem that lacks SANITY, a file can be deleted even if
-# the containing directory doesn't have write permissions, or a file
-# can be accessed even if the containing directory doesn't have read
-# or execute permissions, causing our tests that validate that Git
-# works sensibly in such situations.
+# SANITY is about "can you correctly predict what the filesystem would
+# do by only looking at the permission bits of the files and
+# directories?" A typical example of !SANITY is running the test
+# suite as root, where a test may expect "chmod -r file && cat file"
+# to fail because file is supposed to be unreadable after a successful
+# chmod. In an environment (i.e. combination of what filesystem is
+# being used and who is running the tests) that lacks SANITY, you may
+# be able to delete or create a file when the containing directory
+# doesn't have write permissions, or access a file even if the
+# containing directory doesn't have read or execute permissions.
+
test_lazy_prereq SANITY '
mkdir SANETESTD.1 SANETESTD.2 &&
chmod +w SANETESTD.1 SANETESTD.2 &&
>SANETESTD.1/x 2>SANETESTD.2/x &&
chmod -w SANETESTD.1 &&
+ chmod -r SANETESTD.1/x &&
chmod -rx SANETESTD.2 ||
error "bug in test sript: cannot prepare SANETESTD"
+ ! test -r SANETESTD.1/x &&
! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
status=$?
diff --git a/test-path-utils.c b/test-path-utils.c
index c67bf65..c3adcd8 100644
--- a/test-path-utils.c
+++ b/test-path-utils.c
@@ -39,6 +39,130 @@ static void normalize_argv_string(const char **var, const char *input)
die("Bad value: %s\n", input);
}
+struct test_data {
+ const char *from; /* input: transform from this ... */
+ const char *to; /* output: ... to this. */
+ const char *alternative; /* output: ... or this. */
+};
+
+static int test_function(struct test_data *data, char *(*func)(char *input),
+ const char *funcname)
+{
+ int failed = 0, i;
+ char buffer[1024];
+ char *to;
+
+ for (i = 0; data[i].to; i++) {
+ if (!data[i].from)
+ to = func(NULL);
+ else {
+ strcpy(buffer, data[i].from);
+ to = func(buffer);
+ }
+ if (!strcmp(to, data[i].to))
+ continue;
+ if (!data[i].alternative)
+ error("FAIL: %s(%s) => '%s' != '%s'\n",
+ funcname, data[i].from, to, data[i].to);
+ else if (!strcmp(to, data[i].alternative))
+ continue;
+ else
+ error("FAIL: %s(%s) => '%s' != '%s', '%s'\n",
+ funcname, data[i].from, to, data[i].to,
+ data[i].alternative);
+ failed = 1;
+ }
+ return failed;
+}
+
+static struct test_data basename_data[] = {
+ /* --- POSIX type paths --- */
+ { NULL, "." },
+ { "", "." },
+ { ".", "." },
+ { "..", ".." },
+ { "/", "/" },
+ { "//", "/", "//" },
+ { "///", "/", "//" },
+ { "////", "/", "//" },
+ { "usr", "usr" },
+ { "/usr", "usr" },
+ { "/usr/", "usr" },
+ { "/usr//", "usr" },
+ { "/usr/lib", "lib" },
+ { "usr/lib", "lib" },
+ { "usr/lib///", "lib" },
+
+#if defined(__MINGW32__) || defined(_MSC_VER)
+ /* --- win32 type paths --- */
+ { "\\usr", "usr" },
+ { "\\usr\\", "usr" },
+ { "\\usr\\\\", "usr" },
+ { "\\usr\\lib", "lib" },
+ { "usr\\lib", "lib" },
+ { "usr\\lib\\\\\\", "lib" },
+ { "C:/usr", "usr" },
+ { "C:/usr", "usr" },
+ { "C:/usr/", "usr" },
+ { "C:/usr//", "usr" },
+ { "C:/usr/lib", "lib" },
+ { "C:usr/lib", "lib" },
+ { "C:usr/lib///", "lib" },
+ { "C:", "." },
+ { "C:a", "a" },
+ { "C:/", "/" },
+ { "C:///", "/" },
+ { "\\", "\\", "/" },
+ { "\\\\", "\\", "/" },
+ { "\\\\\\", "\\", "/" },
+#endif
+ { NULL, NULL }
+};
+
+static struct test_data dirname_data[] = {
+ /* --- POSIX type paths --- */
+ { NULL, "." },
+ { "", "." },
+ { ".", "." },
+ { "..", "." },
+ { "/", "/" },
+ { "//", "/", "//" },
+ { "///", "/", "//" },
+ { "////", "/", "//" },
+ { "usr", "." },
+ { "/usr", "/" },
+ { "/usr/", "/" },
+ { "/usr//", "/" },
+ { "/usr/lib", "/usr" },
+ { "usr/lib", "usr" },
+ { "usr/lib///", "usr" },
+
+#if defined(__MINGW32__) || defined(_MSC_VER)
+ /* --- win32 type paths --- */
+ { "\\", "\\" },
+ { "\\\\", "\\\\" },
+ { "\\usr", "\\" },
+ { "\\usr\\", "\\" },
+ { "\\usr\\\\", "\\" },
+ { "\\usr\\lib", "\\usr" },
+ { "usr\\lib", "usr" },
+ { "usr\\lib\\\\\\", "usr" },
+ { "C:a", "C:." },
+ { "C:/", "C:/" },
+ { "C:///", "C:/" },
+ { "C:/usr", "C:/" },
+ { "C:/usr/", "C:/" },
+ { "C:/usr//", "C:/" },
+ { "C:/usr/lib", "C:/usr" },
+ { "C:usr/lib", "C:usr" },
+ { "C:usr/lib///", "C:usr" },
+ { "\\\\\\", "\\" },
+ { "\\\\\\\\", "\\" },
+ { "C:", "C:.", "." },
+#endif
+ { NULL, NULL }
+};
+
int main(int argc, char **argv)
{
if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) {
@@ -133,6 +257,12 @@ int main(int argc, char **argv)
return 0;
}
+ if (argc == 2 && !strcmp(argv[1], "basename"))
+ return test_function(basename_data, basename, argv[1]);
+
+ if (argc == 2 && !strcmp(argv[1], "dirname"))
+ return test_function(dirname_data, dirname, argv[1]);
+
fprintf(stderr, "%s: unknown function name: %s\n", argv[0],
argv[1] ? argv[1] : "(there was none)");
return 1;
diff --git a/test-run-command.c b/test-run-command.c
index 89c7de2..fbe0a27 100644
--- a/test-run-command.c
+++ b/test-run-command.c
@@ -10,16 +10,54 @@
#include "git-compat-util.h"
#include "run-command.h"
+#include "argv-array.h"
+#include "strbuf.h"
#include <string.h>
#include <errno.h>
+static int number_callbacks;
+static int parallel_next(struct child_process *cp,
+ struct strbuf *err,
+ void *cb,
+ void **task_cb)
+{
+ struct child_process *d = cb;
+ if (number_callbacks >= 4)
+ return 0;
+
+ argv_array_pushv(&cp->args, d->argv);
+ strbuf_addf(err, "preloaded output of a child\n");
+ number_callbacks++;
+ return 1;
+}
+
+static int no_job(struct child_process *cp,
+ struct strbuf *err,
+ void *cb,
+ void **task_cb)
+{
+ strbuf_addf(err, "no further jobs available\n");
+ return 0;
+}
+
+static int task_finished(int result,
+ struct child_process *cp,
+ struct strbuf *err,
+ void *pp_cb,
+ void *pp_task_cb)
+{
+ strbuf_addf(err, "asking for a quick stop\n");
+ return 1;
+}
+
int main(int argc, char **argv)
{
struct child_process proc = CHILD_PROCESS_INIT;
+ int jobs;
if (argc < 3)
return 1;
- proc.argv = (const char **)argv+2;
+ proc.argv = (const char **)argv + 2;
if (!strcmp(argv[1], "start-command-ENOENT")) {
if (start_command(&proc) < 0 && errno == ENOENT)
@@ -30,6 +68,21 @@ int main(int argc, char **argv)
if (!strcmp(argv[1], "run-command"))
exit(run_command(&proc));
+ jobs = atoi(argv[2]);
+ proc.argv = (const char **)argv + 3;
+
+ if (!strcmp(argv[1], "run-command-parallel"))
+ exit(run_processes_parallel(jobs, parallel_next,
+ NULL, NULL, &proc));
+
+ if (!strcmp(argv[1], "run-command-abort"))
+ exit(run_processes_parallel(jobs, parallel_next,
+ NULL, task_finished, &proc));
+
+ if (!strcmp(argv[1], "run-command-no-jobs"))
+ exit(run_processes_parallel(jobs, no_job,
+ NULL, task_finished, &proc));
+
fprintf(stderr, "check usage\n");
return 1;
}
diff --git a/test-sha1-array.c b/test-sha1-array.c
index ddc491e..60ea1d5 100644
--- a/test-sha1-array.c
+++ b/test-sha1-array.c
@@ -11,7 +11,7 @@ int main(int argc, char **argv)
struct sha1_array array = SHA1_ARRAY_INIT;
struct strbuf line = STRBUF_INIT;
- while (strbuf_getline(&line, stdin, '\n') != EOF) {
+ while (strbuf_getline(&line, stdin) != EOF) {
const char *arg;
unsigned char sha1[20];
diff --git a/test-sha1.sh b/test-sha1.sh
index 0f0bc5d..cef4bcc 100755
--- a/test-sha1.sh
+++ b/test-sha1.sh
@@ -6,13 +6,13 @@ dd if=/dev/zero bs=1048576 count=100 2>/dev/null |
while read expect cnt pfx
do
case "$expect" in '#'*) continue ;; esac
- actual=`
+ actual=$(
{
test -z "$pfx" || echo "$pfx"
dd if=/dev/zero bs=1048576 count=$cnt 2>/dev/null |
perl -pe 'y/\000/g/'
} | ./test-sha1 $cnt
- `
+ )
if test "$expect" = "$actual"
then
echo "OK: $expect $cnt $pfx"
@@ -51,14 +51,14 @@ exit
while read cnt pfx
do
- actual=`
+ actual=$(
{
test -z "$pfx" || echo "$pfx"
dd if=/dev/zero bs=1048576 count=$cnt 2>/dev/null |
perl -pe 'y/\000/g/'
} | sha1sum |
sed -e 's/ .*//'
- `
+ )
echo "$actual $cnt $pfx"
done <<EOF
0
diff --git a/trailer.c b/trailer.c
index 6f3416f..94b387b 100644
--- a/trailer.c
+++ b/trailer.c
@@ -2,6 +2,7 @@
#include "string-list.h"
#include "run-command.h"
#include "commit.h"
+#include "tempfile.h"
#include "trailer.h"
/*
* Copyright (c) 2013, 2014 Christian Couder <chriscool@tuxfamily.org>
@@ -108,23 +109,23 @@ static char last_non_space_char(const char *s)
return '\0';
}
-static void print_tok_val(const char *tok, const char *val)
+static void print_tok_val(FILE *outfile, const char *tok, const char *val)
{
char c = last_non_space_char(tok);
if (!c)
return;
if (strchr(separators, c))
- printf("%s%s\n", tok, val);
+ fprintf(outfile, "%s%s\n", tok, val);
else
- printf("%s%c %s\n", tok, separators[0], val);
+ fprintf(outfile, "%s%c %s\n", tok, separators[0], val);
}
-static void print_all(struct trailer_item *first, int trim_empty)
+static void print_all(FILE *outfile, struct trailer_item *first, int trim_empty)
{
struct trailer_item *item;
for (item = first; item; item = item->next) {
if (!trim_empty || strlen(item->value) > 0)
- print_tok_val(item->token, item->value);
+ print_tok_val(outfile, item->token, item->value);
}
}
@@ -795,14 +796,15 @@ static int has_blank_line_before(struct strbuf **lines, int start)
return 0;
}
-static void print_lines(struct strbuf **lines, int start, int end)
+static void print_lines(FILE *outfile, struct strbuf **lines, int start, int end)
{
int i;
for (i = start; lines[i] && i < end; i++)
- printf("%s", lines[i]->buf);
+ fprintf(outfile, "%s", lines[i]->buf);
}
-static int process_input_file(struct strbuf **lines,
+static int process_input_file(FILE *outfile,
+ struct strbuf **lines,
struct trailer_item **in_tok_first,
struct trailer_item **in_tok_last)
{
@@ -818,10 +820,10 @@ static int process_input_file(struct strbuf **lines,
trailer_start = find_trailer_start(lines, trailer_end);
/* Print lines before the trailers as is */
- print_lines(lines, 0, trailer_start);
+ print_lines(outfile, lines, 0, trailer_start);
if (!has_blank_line_before(lines, trailer_start - 1))
- printf("\n");
+ fprintf(outfile, "\n");
/* Parse trailer lines */
for (i = trailer_start; i < trailer_end; i++) {
@@ -842,13 +844,45 @@ static void free_all(struct trailer_item **first)
}
}
-void process_trailers(const char *file, int trim_empty, struct string_list *trailers)
+static struct tempfile trailers_tempfile;
+
+static FILE *create_in_place_tempfile(const char *file)
+{
+ struct stat st;
+ struct strbuf template = STRBUF_INIT;
+ const char *tail;
+ FILE *outfile;
+
+ if (stat(file, &st))
+ die_errno(_("could not stat %s"), file);
+ if (!S_ISREG(st.st_mode))
+ die(_("file %s is not a regular file"), file);
+ if (!(st.st_mode & S_IWUSR))
+ die(_("file %s is not writable by user"), file);
+
+ /* Create temporary file in the same directory as the original */
+ tail = strrchr(file, '/');
+ if (tail != NULL)
+ strbuf_add(&template, file, tail - file + 1);
+ strbuf_addstr(&template, "git-interpret-trailers-XXXXXX");
+
+ xmks_tempfile_m(&trailers_tempfile, template.buf, st.st_mode);
+ strbuf_release(&template);
+ outfile = fdopen_tempfile(&trailers_tempfile, "w");
+ if (!outfile)
+ die_errno(_("could not open temporary file"));
+
+ return outfile;
+}
+
+void process_trailers(const char *file, int in_place, int trim_empty, struct string_list *trailers)
{
struct trailer_item *in_tok_first = NULL;
struct trailer_item *in_tok_last = NULL;
struct trailer_item *arg_tok_first;
struct strbuf **lines;
int trailer_end;
+ FILE *outfile = stdout;
/* Default config must be setup first */
git_config(git_trailer_default_config, NULL);
@@ -856,19 +890,26 @@ void process_trailers(const char *file, int trim_empty, struct string_list *trai
lines = read_input_file(file);
+ if (in_place)
+ outfile = create_in_place_tempfile(file);
+
/* Print the lines before the trailers */
- trailer_end = process_input_file(lines, &in_tok_first, &in_tok_last);
+ trailer_end = process_input_file(outfile, lines, &in_tok_first, &in_tok_last);
arg_tok_first = process_command_line_args(trailers);
process_trailers_lists(&in_tok_first, &in_tok_last, &arg_tok_first);
- print_all(in_tok_first, trim_empty);
+ print_all(outfile, in_tok_first, trim_empty);
free_all(&in_tok_first);
/* Print the lines after the trailers as is */
- print_lines(lines, trailer_end, INT_MAX);
+ print_lines(outfile, lines, trailer_end, INT_MAX);
+
+ if (in_place)
+ if (rename_tempfile(&trailers_tempfile, file))
+ die_errno(_("could not rename temporary file to %s"), file);
strbuf_list_free(lines);
}
diff --git a/trailer.h b/trailer.h
index 8eb25d5..36b40b8 100644
--- a/trailer.h
+++ b/trailer.h
@@ -1,6 +1,7 @@
#ifndef TRAILER_H
#define TRAILER_H
-void process_trailers(const char *file, int trim_empty, struct string_list *trailers);
+void process_trailers(const char *file, int in_place, int trim_empty,
+ struct string_list *trailers);
#endif /* TRAILER_H */
diff --git a/transport-helper.c b/transport-helper.c
index 0eb3cf0..a6bff8b 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -54,7 +54,7 @@ static int recvline_fh(FILE *helper, struct strbuf *buffer, const char *name)
strbuf_reset(buffer);
if (debug)
fprintf(stderr, "Debug: Remote helper: Waiting...\n");
- if (strbuf_getline(buffer, helper, '\n') == EOF) {
+ if (strbuf_getline(buffer, helper) == EOF) {
if (debug)
fprintf(stderr, "Debug: Remote helper quit.\n");
return 1;
@@ -137,7 +137,8 @@ static struct child_process *get_helper(struct transport *transport)
data->no_disconnect_req = 0;
/*
- * Open the output as FILE* so strbuf_getline() can be used.
+ * Open the output as FILE* so strbuf_getline_*() family of
+ * functions can be used.
* Do this with duped fd because fclose() will close the fd,
* and stuff like taking over will require the fd to remain.
*/
diff --git a/tree-walk.c b/tree-walk.c
index 6dccd2d..cd4bb2c 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -320,6 +320,7 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
struct tree_desc_x *tx = xcalloc(n, sizeof(*tx));
struct strbuf base = STRBUF_INIT;
int interesting = 1;
+ char *traverse_path;
for (i = 0; i < n; i++)
tx[i].d = t[i];
@@ -329,7 +330,11 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
make_traverse_path(base.buf, info->prev, &info->name);
base.buf[info->pathlen-1] = '/';
strbuf_setlen(&base, info->pathlen);
+ traverse_path = xstrndup(base.buf, info->pathlen);
+ } else {
+ traverse_path = xstrndup(info->name.path, info->pathlen);
}
+ info->traverse_path = traverse_path;
for (;;) {
int trees_used;
unsigned long mask, dirmask;
@@ -411,6 +416,8 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
for (i = 0; i < n; i++)
free_extended_entry(tx + i);
free(tx);
+ free(traverse_path);
+ info->traverse_path = NULL;
strbuf_release(&base);
return error;
}
diff --git a/tree-walk.h b/tree-walk.h
index 3b2f7bf..174eb61 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -59,6 +59,7 @@ enum follow_symlinks_result {
enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_sha1, const char *name, unsigned char *result, struct strbuf *result_path, unsigned *mode);
struct traverse_info {
+ const char *traverse_path;
struct traverse_info *prev;
struct name_entry name;
int pathlen;
diff --git a/unimplemented.sh b/unimplemented.sh
index 5252de4..fee21d2 100644
--- a/unimplemented.sh
+++ b/unimplemented.sh
@@ -1,4 +1,4 @@
#!/bin/sh
-echo >&2 "fatal: git was built without support for `basename $0` (@@REASON@@)."
+echo >&2 "fatal: git was built without support for $(basename $0) (@@REASON@@)."
exit 128
diff --git a/unpack-trees.c b/unpack-trees.c
index 8e2032f..9f55cc2 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -498,13 +498,14 @@ static int traverse_trees_recursive(int n, unsigned long dirmask,
* itself - the caller needs to do the final check for the cache
* entry having more data at the end!
*/
-static int do_compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
+static int do_compare_entry_piecewise(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
{
int len, pathlen, ce_len;
const char *ce_name;
if (info->prev) {
- int cmp = do_compare_entry(ce, info->prev, &info->name);
+ int cmp = do_compare_entry_piecewise(ce, info->prev,
+ &info->name);
if (cmp)
return cmp;
}
@@ -522,6 +523,39 @@ static int do_compare_entry(const struct cache_entry *ce, const struct traverse_
return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
}
+static int do_compare_entry(const struct cache_entry *ce,
+ const struct traverse_info *info,
+ const struct name_entry *n)
+{
+ int len, pathlen, ce_len;
+ const char *ce_name;
+ int cmp;
+
+ /*
+ * If we have not precomputed the traverse path, it is quicker
+ * to avoid doing so. But if we have precomputed it,
+ * it is quicker to use the precomputed version.
+ */
+ if (!info->traverse_path)
+ return do_compare_entry_piecewise(ce, info, n);
+
+ cmp = strncmp(ce->name, info->traverse_path, info->pathlen);
+ if (cmp)
+ return cmp;
+
+ pathlen = info->pathlen;
+ ce_len = ce_namelen(ce);
+
+ if (ce_len < pathlen)
+ return -1;
+
+ ce_len -= pathlen;
+ ce_name = ce->name + pathlen;
+
+ len = tree_entry_len(n);
+ return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
+}
+
static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
{
int cmp = do_compare_entry(ce, info, n);
@@ -661,8 +695,19 @@ static int find_cache_pos(struct traverse_info *info,
++o->cache_bottom;
continue;
}
- if (!ce_in_traverse_path(ce, info))
+ if (!ce_in_traverse_path(ce, info)) {
+ /*
+ * Check if we can skip future cache checks
+ * (because we're already past all possible
+ * entries in the traverse path).
+ */
+ if (info->traverse_path) {
+ if (strncmp(ce->name, info->traverse_path,
+ info->pathlen) > 0)
+ break;
+ }
continue;
+ }
ce_name = ce->name + pfxlen;
ce_slash = strchr(ce_name, '/');
if (ce_slash)
diff --git a/walker.c b/walker.c
index 7b7e72b..08773d4 100644
--- a/walker.c
+++ b/walker.c
@@ -220,7 +220,7 @@ int walker_targets_stdin(char ***target, const char ***write_ref)
char *rf_one = NULL;
char *tg_one;
- if (strbuf_getline(&buf, stdin, '\n') == EOF)
+ if (strbuf_getline_lf(&buf, stdin) == EOF)
break;
tg_one = buf.buf;
rf_one = strchr(tg_one, '\t');
diff --git a/worktree.c b/worktree.c
index 981f810..6181a66 100644
--- a/worktree.c
+++ b/worktree.c
@@ -176,10 +176,10 @@ struct worktree **get_worktrees(void)
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
continue;
- if ((linked = get_linked_worktree(d->d_name))) {
- ALLOC_GROW(list, counter + 1, alloc);
- list[counter++] = linked;
- }
+ if ((linked = get_linked_worktree(d->d_name))) {
+ ALLOC_GROW(list, counter + 1, alloc);
+ list[counter++] = linked;
+ }
}
closedir(dir);
}
diff --git a/wrapper.c b/wrapper.c
index 6fcaa4d..29a45d2 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -236,8 +236,24 @@ ssize_t xread(int fd, void *buf, size_t len)
len = MAX_IO_SIZE;
while (1) {
nr = read(fd, buf, len);
- if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
- continue;
+ if (nr < 0) {
+ if (errno == EINTR)
+ continue;
+ if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ struct pollfd pfd;
+ pfd.events = POLLIN;
+ pfd.fd = fd;
+ /*
+ * it is OK if this poll() failed; we
+ * want to leave this infinite loop
+ * only when read() returns with
+ * success, or an expected failure,
+ * which would be checked by the next
+ * call to read(2).
+ */
+ poll(&pfd, 1, -1);
+ }
+ }
return nr;
}
}
@@ -375,6 +391,19 @@ FILE *xfdopen(int fd, const char *mode)
return stream;
}
+FILE *fopen_for_writing(const char *path)
+{
+ FILE *ret = fopen(path, "w");
+
+ if (!ret && errno == EPERM) {
+ if (!unlink(path))
+ ret = fopen(path, "w");
+ else
+ errno = EPERM;
+ }
+ return ret;
+}
+
int xmkstemp(char *template)
{
int fd;
@@ -601,18 +630,6 @@ int access_or_die(const char *path, int mode, unsigned flag)
return ret;
}
-struct passwd *xgetpwuid_self(void)
-{
- struct passwd *pw;
-
- errno = 0;
- pw = getpwuid(getuid());
- if (!pw)
- die(_("unable to look up current user in the passwd file: %s"),
- errno ? strerror(errno) : _("no such user"));
- return pw;
-}
-
char *xgetcwd(void)
{
struct strbuf sb = STRBUF_INIT;
diff --git a/wt-status.c b/wt-status.c
index bba2596..ab4f80d 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -988,7 +988,7 @@ static char *read_line_from_git_path(const char *filename)
strbuf_release(&buf);
return NULL;
}
- strbuf_getline(&buf, fp, '\n');
+ strbuf_getline_lf(&buf, fp);
if (!fclose(fp)) {
return strbuf_detach(&buf, NULL);
} else {
@@ -1076,7 +1076,7 @@ static void read_rebase_todolist(const char *fname, struct string_list *lines)
if (!f)
die_errno("Could not open file %s for reading",
git_path("%s", fname));
- while (!strbuf_getline(&line, f, '\n')) {
+ while (!strbuf_getline_lf(&line, f)) {
if (line.len && line.buf[0] == comment_line_char)
continue;
strbuf_trim(&line);
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index 625198e..d98f430 100644
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@ -109,7 +109,7 @@ static int xdl_merge_cmp_lines(xdfenv_t *xe1, int i1, xdfenv_t *xe2, int i2,
return 0;
}
-static int xdl_recs_copy_0(int use_orig, xdfenv_t *xe, int i, int count, int add_nl, char *dest)
+static int xdl_recs_copy_0(int use_orig, xdfenv_t *xe, int i, int count, int needs_cr, int add_nl, char *dest)
{
xrecord_t **recs;
int size = 0;
@@ -125,6 +125,12 @@ static int xdl_recs_copy_0(int use_orig, xdfenv_t *xe, int i, int count, int add
if (add_nl) {
i = recs[count - 1]->size;
if (i == 0 || recs[count - 1]->ptr[i - 1] != '\n') {
+ if (needs_cr) {
+ if (dest)
+ dest[size] = '\r';
+ size++;
+ }
+
if (dest)
dest[size] = '\n';
size++;
@@ -133,14 +139,58 @@ static int xdl_recs_copy_0(int use_orig, xdfenv_t *xe, int i, int count, int add
return size;
}
-static int xdl_recs_copy(xdfenv_t *xe, int i, int count, int add_nl, char *dest)
+static int xdl_recs_copy(xdfenv_t *xe, int i, int count, int needs_cr, int add_nl, char *dest)
+{
+ return xdl_recs_copy_0(0, xe, i, count, needs_cr, add_nl, dest);
+}
+
+static int xdl_orig_copy(xdfenv_t *xe, int i, int count, int needs_cr, int add_nl, char *dest)
+{
+ return xdl_recs_copy_0(1, xe, i, count, needs_cr, add_nl, dest);
+}
+
+/*
+ * Returns 1 if the i'th line ends in CR/LF (if it is the last line and
+ * has no eol, the preceding line, if any), 0 if it ends in LF-only, and
+ * -1 if the line ending cannot be determined.
+ */
+static int is_eol_crlf(xdfile_t *file, int i)
{
- return xdl_recs_copy_0(0, xe, i, count, add_nl, dest);
+ long size;
+
+ if (i < file->nrec - 1)
+ /* All lines before the last *must* end in LF */
+ return (size = file->recs[i]->size) > 1 &&
+ file->recs[i]->ptr[size - 2] == '\r';
+ if (!file->nrec)
+ /* Cannot determine eol style from empty file */
+ return -1;
+ if ((size = file->recs[i]->size) &&
+ file->recs[i]->ptr[size - 1] == '\n')
+ /* Last line; ends in LF; Is it CR/LF? */
+ return size > 1 &&
+ file->recs[i]->ptr[size - 2] == '\r';
+ if (!i)
+ /* The only line has no eol */
+ return -1;
+ /* Determine eol from second-to-last line */
+ return (size = file->recs[i - 1]->size) > 1 &&
+ file->recs[i - 1]->ptr[size - 2] == '\r';
}
-static int xdl_orig_copy(xdfenv_t *xe, int i, int count, int add_nl, char *dest)
+static int is_cr_needed(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m)
{
- return xdl_recs_copy_0(1, xe, i, count, add_nl, dest);
+ int needs_cr;
+
+ /* Match post-images' preceding, or first, lines' end-of-line style */
+ needs_cr = is_eol_crlf(&xe1->xdf2, m->i1 ? m->i1 - 1 : 0);
+ if (needs_cr)
+ needs_cr = is_eol_crlf(&xe2->xdf2, m->i2 ? m->i2 - 1 : 0);
+ /* Look at pre-image's first line, unless we already settled on LF */
+ if (needs_cr)
+ needs_cr = is_eol_crlf(&xe1->xdf1, 0);
+ /* If still undecided, use LF-only */
+ return needs_cr < 0 ? 0 : needs_cr;
}
static int fill_conflict_hunk(xdfenv_t *xe1, const char *name1,
@@ -152,16 +202,17 @@ static int fill_conflict_hunk(xdfenv_t *xe1, const char *name1,
int marker1_size = (name1 ? strlen(name1) + 1 : 0);
int marker2_size = (name2 ? strlen(name2) + 1 : 0);
int marker3_size = (name3 ? strlen(name3) + 1 : 0);
+ int needs_cr = is_cr_needed(xe1, xe2, m);
if (marker_size <= 0)
marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
/* Before conflicting part */
- size += xdl_recs_copy(xe1, i, m->i1 - i, 0,
+ size += xdl_recs_copy(xe1, i, m->i1 - i, 0, 0,
dest ? dest + size : NULL);
if (!dest) {
- size += marker_size + 1 + marker1_size;
+ size += marker_size + 1 + needs_cr + marker1_size;
} else {
memset(dest + size, '<', marker_size);
size += marker_size;
@@ -170,17 +221,19 @@ static int fill_conflict_hunk(xdfenv_t *xe1, const char *name1,
memcpy(dest + size + 1, name1, marker1_size - 1);
size += marker1_size;
}
+ if (needs_cr)
+ dest[size++] = '\r';
dest[size++] = '\n';
}
/* Postimage from side #1 */
- size += xdl_recs_copy(xe1, m->i1, m->chg1, 1,
+ size += xdl_recs_copy(xe1, m->i1, m->chg1, needs_cr, 1,
dest ? dest + size : NULL);
if (style == XDL_MERGE_DIFF3) {
/* Shared preimage */
if (!dest) {
- size += marker_size + 1 + marker3_size;
+ size += marker_size + 1 + needs_cr + marker3_size;
} else {
memset(dest + size, '|', marker_size);
size += marker_size;
@@ -189,25 +242,29 @@ static int fill_conflict_hunk(xdfenv_t *xe1, const char *name1,
memcpy(dest + size + 1, name3, marker3_size - 1);
size += marker3_size;
}
+ if (needs_cr)
+ dest[size++] = '\r';
dest[size++] = '\n';
}
- size += xdl_orig_copy(xe1, m->i0, m->chg0, 1,
+ size += xdl_orig_copy(xe1, m->i0, m->chg0, needs_cr, 1,
dest ? dest + size : NULL);
}
if (!dest) {
- size += marker_size + 1;
+ size += marker_size + 1 + needs_cr;
} else {
memset(dest + size, '=', marker_size);
size += marker_size;
+ if (needs_cr)
+ dest[size++] = '\r';
dest[size++] = '\n';
}
/* Postimage from side #2 */
- size += xdl_recs_copy(xe2, m->i2, m->chg2, 1,
+ size += xdl_recs_copy(xe2, m->i2, m->chg2, needs_cr, 1,
dest ? dest + size : NULL);
if (!dest) {
- size += marker_size + 1 + marker2_size;
+ size += marker_size + 1 + needs_cr + marker2_size;
} else {
memset(dest + size, '>', marker_size);
size += marker_size;
@@ -216,6 +273,8 @@ static int fill_conflict_hunk(xdfenv_t *xe1, const char *name1,
memcpy(dest + size + 1, name2, marker2_size - 1);
size += marker2_size;
}
+ if (needs_cr)
+ dest[size++] = '\r';
dest[size++] = '\n';
}
return size;
@@ -241,21 +300,24 @@ static int xdl_fill_merge_buffer(xdfenv_t *xe1, const char *name1,
marker_size);
else if (m->mode & 3) {
/* Before conflicting part */
- size += xdl_recs_copy(xe1, i, m->i1 - i, 0,
+ size += xdl_recs_copy(xe1, i, m->i1 - i, 0, 0,
dest ? dest + size : NULL);
/* Postimage from side #1 */
- if (m->mode & 1)
- size += xdl_recs_copy(xe1, m->i1, m->chg1, (m->mode & 2),
+ if (m->mode & 1) {
+ int needs_cr = is_cr_needed(xe1, xe2, m);
+
+ size += xdl_recs_copy(xe1, m->i1, m->chg1, needs_cr, (m->mode & 2),
dest ? dest + size : NULL);
+ }
/* Postimage from side #2 */
if (m->mode & 2)
- size += xdl_recs_copy(xe2, m->i2, m->chg2, 0,
+ size += xdl_recs_copy(xe2, m->i2, m->chg2, 0, 0,
dest ? dest + size : NULL);
} else
continue;
i = m->i1 + m->chg1;
}
- size += xdl_recs_copy(xe1, i, xe1->xdf2.nrec - i, 0,
+ size += xdl_recs_copy(xe1, i, xe1->xdf2.nrec - i, 0, 0,
dest ? dest + size : NULL);
return size;
}